From 172d77a239c2cc6547d513c17b38aa8b46ab0c18 Mon Sep 17 00:00:00 2001 Message-Id: <172d77a239c2cc6547d513c17b38aa8b46ab0c18.1342518105.git.minovotn@redhat.com> In-Reply-To: <27a73856ecc481c66c7afac8171f753887f32e31.1342518105.git.minovotn@redhat.com> References: <27a73856ecc481c66c7afac8171f753887f32e31.1342518105.git.minovotn@redhat.com> From: Luiz Capitulino Date: Tue, 5 Jun 2012 14:58:16 +0200 Subject: [PATCH 07/41] Revert "qemu-ga: make guest-suspend-* posix-only" RH-Author: Luiz Capitulino Message-id: <1338908331-15633-2-git-send-email-lcapitulino@redhat.com> Patchwork-id: 39898 O-Subject: [PATCH RHEL6.4 qemu-kvm 01/36] Revert "qemu-ga: make guest-suspend-* posix-only" Bugzilla: 827612 RH-Acked-by: Jeffrey Cody RH-Acked-by: Paolo Bonzini RH-Acked-by: Juan Quintela This reverts commit 61a1c8fa600c1b609e6253066509d11800e97290. The missing win32 guest agent commands that required this commit will be introduced by the next commits. Conflicts: Makefile Signed-off-by: Luiz Capitulino --- Makefile | 19 +++-------- Makefile.objs | 3 +- qapi-schema-guest-suspend.json | 76 ------------------------------------------ qapi-schema-guest.json | 75 +++++++++++++++++++++++++++++++++++++++++ qga/commands-posix.c | 1 - 5 files changed, 80 insertions(+), 94 deletions(-) delete mode 100644 qapi-schema-guest-suspend.json Signed-off-by: Michal Novotny --- Makefile | 19 +++------- Makefile.objs | 3 +- qapi-schema-guest-suspend.json | 76 ---------------------------------------- qapi-schema-guest.json | 75 +++++++++++++++++++++++++++++++++++++++ qga/commands-posix.c | 1 - 5 files changed, 80 insertions(+), 94 deletions(-) delete mode 100644 qapi-schema-guest-suspend.json diff --git a/Makefile b/Makefile index d664a55..e741c6f 100644 --- a/Makefile +++ b/Makefile @@ -213,8 +213,6 @@ qemu-ga$(EXESUF): LIBS = $(LIBS_QGA) gen-out-type = $(subst .,-,$(suffix $@)) -qga-suspend-dep-$(CONFIG_POSIX) = $(qga-nested-api-y .o=.c) qga-suspend-qapi-types.h qga-suspend-qmp-commands.h qga-suspend-qapi-visit.h - $(qapi-dir)/test-qapi-types.c $(qapi-dir)/test-qapi-types.h :\ $(SRC_PATH)/qapi-schema-test.json $(SRC_PATH)/scripts/qapi-types.py $(call quiet-command,python $(SRC_PATH)/scripts/qapi-types.py $(gen-out-type) -o "$(qapi-dir)" -p "test-" < $<, " GEN $@") @@ -235,16 +233,6 @@ $(qapi-dir)/qga-qmp-commands.h $(qapi-dir)/qga-qmp-marshal.c :\ $(SRC_PATH)/qapi-schema-guest.json $(SRC_PATH)/scripts/qapi-commands.py $(call quiet-command,python $(SRC_PATH)/scripts/qapi-commands.py $(gen-out-type) -o "$(qapi-dir)" -p "qga-" < $<, " GEN $@") -$(qapi-dir)/qga-suspend-qapi-types.c $(qapi-dir)/qga-suspend-qapi-types.h :\ -$(SRC_PATH)/qapi-schema-guest-suspend.json $(SRC_PATH)/scripts/qapi-types.py - $(call quiet-command,python $(SRC_PATH)/scripts/qapi-types.py $(gen-out-type) -o "$(qapi-dir)" -p "qga-suspend-" < $<, " GEN $@") -$(qapi-dir)/qga-suspend-qapi-visit.c $(qapi-dir)/qga-suspend-qapi-visit.h :\ -$(SRC_PATH)/qapi-schema-guest-suspend.json $(SRC_PATH)/scripts/qapi-visit.py - $(call quiet-command,python $(SRC_PATH)/scripts/qapi-visit.py $(gen-out-type) -o "$(qapi-dir)" -p "qga-suspend-" < $<, " GEN $@") -$(qapi-dir)/qga-suspend-qmp-commands.h $(qapi-dir)/qga-suspend-qmp-marshal.c :\ -$(SRC_PATH)/qapi-schema-guest-suspend.json $(SRC_PATH)/scripts/qapi-commands.py - $(call quiet-command,python $(SRC_PATH)/scripts/qapi-commands.py $(gen-out-type) -o "$(qapi-dir)" -p "qga-suspend-" < $<, " GEN $@") - rhev-qapi-types.c rhev-qapi-types.h :\ qapi-schema-rhev.json $(SRC_PATH)/scripts/qapi-types.py $(call quiet-command,python $(SRC_PATH)/scripts/qapi-types.py $(gen-out-type) -o "." -p "rhev-" < $<, " GEN $@") @@ -306,11 +294,12 @@ test-visitor: test-visitor.o qfloat.o qint.o qdict.o qstring.o qlist.o qbool.o $ test-qmp-commands.o: $(addprefix $(qapi-dir)/, test-qapi-types.c test-qapi-types.h test-qapi-visit.c test-qapi-visit.h test-qmp-marshal.c test-qmp-commands.h) $(qapi-obj-y) test-qmp-commands: test-qmp-commands.o qfloat.o qint.o qdict.o qstring.o qlist.o qbool.o $(qapi-obj-y) error.o osdep.o qemu-malloc.o $(oslib-obj-y) qjson.o json-streamer.o json-lexer.o json-parser.o qerror.o qemu-error.o qemu-tool.o $(qapi-dir)/test-qapi-visit.o $(qapi-dir)/test-qapi-types.o $(qapi-dir)/test-qmp-marshal.o module.o -QGALIB_GEN=$(addprefix $(qapi-dir)/, qga-qapi-types.c qga-qapi-types.h qga-qapi-visit.c qga-qmp-marshal.c $(qga-suspend-dep-y)) +QGALIB_GEN=$(addprefix $(qapi-dir)/, qga-qapi-types.c qga-qapi-types.h qga-qapi-visit.c qga-qmp-marshal.c) $(QGALIB_GEN): $(GENERATED_HEADERS) -qemu-ga.o: $(QGALIB_GEN) $(qapi-obj-y) +$(QGALIB) qemu-ga.o: $(QGALIB_GEN) $(qapi-obj-y) + -qemu-ga$(EXESUF): qemu-ga.o $(qga-obj-y) $(qapi-obj-y) $(trace-obj-y) $(qobject-obj-y) $(version-obj-y) $(addprefix $(qapi-dir)/, qga-qapi-visit.o qga-qapi-types.o qga-qmp-marshal.o $(qga-suspend-y)) +qemu-ga$(EXESUF): qemu-ga.o $(qga-obj-y) $(qapi-obj-y) $(trace-obj-y) $(qobject-obj-y) $(version-obj-y) $(addprefix $(qapi-dir)/, qga-qapi-visit.o qga-qapi-types.o qga-qmp-marshal.o) QEMULIBS=libhw32 libhw64 libuser diff --git a/Makefile.objs b/Makefile.objs index b830b7f..9afce30 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -211,12 +211,11 @@ common-obj-y += hmp.o qga-nested-y = commands.o guest-agent-command-state.o qga-nested-$(CONFIG_POSIX) += commands-posix.o channel-posix.o -qga-nested-qapi-$(CONFIG_POSIX) = $(addprefix $(qapi-dir)/, qga-suspend-qapi-visit.o qga-suspend-qapi-types.o qga-suspend-qmp-marshal.o) qga-nested-$(CONFIG_WIN32) += commands-win32.o channel-win32.o service-win32.o qga-obj-y = $(addprefix qga/, $(qga-nested-y)) qga-obj-y += qemu-ga.o qemu-tool.o qemu-error.o module.o cutils.o osdep.o qga-obj-$(CONFIG_WIN32) += qemu-malloc.o -qga-obj-$(CONFIG_POSIX) += qemu-malloc.o qemu-sockets.o qemu-option.o $(qga-nested-qapi-y) +qga-obj-$(CONFIG_POSIX) += qemu-malloc.o qemu-sockets.o qemu-option.o vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS) diff --git a/qapi-schema-guest-suspend.json b/qapi-schema-guest-suspend.json deleted file mode 100644 index 638b4a7..0000000 --- a/qapi-schema-guest-suspend.json +++ /dev/null @@ -1,76 +0,0 @@ -# *-*- Mode: Python -*-* - -## -# @guest-suspend-disk -# -# Suspend guest to disk. -# -# This command tries to execute the scripts provided by the pm-utils package. -# If it's not available, the suspend operation will be performed by manually -# writing to a sysfs file. -# -# For the best results it's strongly recommended to have the pm-utils -# package installed in the guest. -# -# Returns: nothing on success -# If suspend to disk is not supported, Unsupported -# -# Notes: o This is an asynchronous request. There's no guarantee a response -# will be sent -# o It's strongly recommended to issue the guest-sync command before -# sending commands when the guest resumes -# -# Since: 1.1 -## -{ 'command': 'guest-suspend-disk' } - -## -# @guest-suspend-ram -# -# Suspend guest to ram. -# -# This command tries to execute the scripts provided by the pm-utils package. -# If it's not available, the suspend operation will be performed by manually -# writing to a sysfs file. -# -# For the best results it's strongly recommended to have the pm-utils -# package installed in the guest. -# -# IMPORTANT: guest-suspend-ram requires QEMU to support the 'system_wakeup' -# command. Thus, it's *required* to query QEMU for the presence of the -# 'system_wakeup' command before issuing guest-suspend-ram. -# -# Returns: nothing on success -# If suspend to ram is not supported, Unsupported -# -# Notes: o This is an asynchronous request. There's no guarantee a response -# will be sent -# o It's strongly recommended to issue the guest-sync command before -# sending commands when the guest resumes -# -# Since: 1.1 -## -{ 'command': 'guest-suspend-ram' } - -## -# @guest-suspend-hybrid -# -# Save guest state to disk and suspend to ram. -# -# This command requires the pm-utils package to be installed in the guest. -# -# IMPORTANT: guest-suspend-hybrid requires QEMU to support the 'system_wakeup' -# command. Thus, it's *required* to query QEMU for the presence of the -# 'system_wakeup' command before issuing guest-suspend-hybrid. -# -# Returns: nothing on success -# If hybrid suspend is not supported, Unsupported -# -# Notes: o This is an asynchronous request. There's no guarantee a response -# will be sent -# o It's strongly recommended to issue the guest-sync command before -# sending commands when the guest resumes -# -# Since: 1.1 -## -{ 'command': 'guest-suspend-hybrid' } diff --git a/qapi-schema-guest.json b/qapi-schema-guest.json index 80f1635..59bb538 100644 --- a/qapi-schema-guest.json +++ b/qapi-schema-guest.json @@ -295,3 +295,78 @@ ## { 'command': 'guest-fsfreeze-thaw', 'returns': 'int' } + +## +# @guest-suspend-disk +# +# Suspend guest to disk. +# +# This command tries to execute the scripts provided by the pm-utils package. +# If it's not available, the suspend operation will be performed by manually +# writing to a sysfs file. +# +# For the best results it's strongly recommended to have the pm-utils +# package installed in the guest. +# +# Returns: nothing on success +# If suspend to disk is not supported, Unsupported +# +# Notes: o This is an asynchronous request. There's no guarantee a response +# will be sent +# o It's strongly recommended to issue the guest-sync command before +# sending commands when the guest resumes +# +# Since: 1.1 +## +{ 'command': 'guest-suspend-disk' } + +## +# @guest-suspend-ram +# +# Suspend guest to ram. +# +# This command tries to execute the scripts provided by the pm-utils package. +# If it's not available, the suspend operation will be performed by manually +# writing to a sysfs file. +# +# For the best results it's strongly recommended to have the pm-utils +# package installed in the guest. +# +# IMPORTANT: guest-suspend-ram requires QEMU to support the 'system_wakeup' +# command. Thus, it's *required* to query QEMU for the presence of the +# 'system_wakeup' command before issuing guest-suspend-ram. +# +# Returns: nothing on success +# If suspend to ram is not supported, Unsupported +# +# Notes: o This is an asynchronous request. There's no guarantee a response +# will be sent +# o It's strongly recommended to issue the guest-sync command before +# sending commands when the guest resumes +# +# Since: 1.1 +## +{ 'command': 'guest-suspend-ram' } + +## +# @guest-suspend-hybrid +# +# Save guest state to disk and suspend to ram. +# +# This command requires the pm-utils package to be installed in the guest. +# +# IMPORTANT: guest-suspend-hybrid requires QEMU to support the 'system_wakeup' +# command. Thus, it's *required* to query QEMU for the presence of the +# 'system_wakeup' command before issuing guest-suspend-hybrid. +# +# Returns: nothing on success +# If hybrid suspend is not supported, Unsupported +# +# Notes: o This is an asynchronous request. There's no guarantee a response +# will be sent +# o It's strongly recommended to issue the guest-sync command before +# sending commands when the guest resumes +# +# Since: 1.1 +## +{ 'command': 'guest-suspend-hybrid' } diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 642f3ae..a9665fe 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -26,7 +26,6 @@ #include #include "qga/guest-agent-core.h" #include "qga-qmp-commands.h" -#include "qga-suspend-qmp-commands.h" #include "qerror.h" #include "qemu-queue.h" -- 1.7.10.4