From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:36700) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TR0Zc-0003CA-Vy for qemu-devel@nongnu.org; Wed, 24 Oct 2012 09:00:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TR0ZW-0003Jq-Qk for qemu-devel@nongnu.org; Wed, 24 Oct 2012 09:00:40 -0400 Received: from mail-da0-f45.google.com ([209.85.210.45]:46181) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TR0ZV-0002s4-JK for qemu-devel@nongnu.org; Wed, 24 Oct 2012 09:00:34 -0400 Received: by mail-da0-f45.google.com with SMTP id n15so234236dad.4 for ; Wed, 24 Oct 2012 06:00:32 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 24 Oct 2012 14:58:46 +0200 Message-Id: <1351083542-15272-17-git-send-email-pbonzini@redhat.com> In-Reply-To: <1351083542-15272-1-git-send-email-pbonzini@redhat.com> References: <1351083542-15272-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 16/32] qemu-ga: move qemu-ga files to qga/ List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, aliguori@us.ibm.com Signed-off-by: Paolo Bonzini --- Makefile | 9 +++++---- Makefile.objs | 2 +- qga/Makefile.objs | 2 +- qemu-ga.c => qga/main.c | 0 qapi-schema-guest.json => qga/qapi-schema.json | 0 5 files changed, 7 insertions(+), 6 deletions(-) rename qemu-ga.c => qga/main.c (100%) rename qapi-schema-guest.json => qga/qapi-schema.json (100%) diff --git a/Makefile b/Makefile index 3361d24..2f0811d 100644 --- a/Makefile +++ b/Makefile @@ -173,13 +173,13 @@ endif qapi-py = $(SRC_PATH)/scripts/qapi.py $(SRC_PATH)/scripts/ordereddict.py qga/qapi-generated/qga-qapi-types.c qga/qapi-generated/qga-qapi-types.h :\ -$(SRC_PATH)/qapi-schema-guest.json $(SRC_PATH)/scripts/qapi-types.py $(qapi-py) +$(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-types.py $(qapi-py) $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py $(gen-out-type) -o qga/qapi-generated -p "qga-" < $<, " GEN $@") qga/qapi-generated/qga-qapi-visit.c qga/qapi-generated/qga-qapi-visit.h :\ -$(SRC_PATH)/qapi-schema-guest.json $(SRC_PATH)/scripts/qapi-visit.py $(qapi-py) +$(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-visit.py $(qapi-py) $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py $(gen-out-type) -o qga/qapi-generated -p "qga-" < $<, " GEN $@") qga/qapi-generated/qga-qmp-commands.h qga/qapi-generated/qga-qmp-marshal.c :\ -$(SRC_PATH)/qapi-schema-guest.json $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py) +$(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py) $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py $(gen-out-type) -o qga/qapi-generated -p "qga-" < $<, " GEN $@") qapi-types.c qapi-types.h :\ @@ -195,7 +195,8 @@ $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py) QGALIB_GEN=$(addprefix qga/qapi-generated/, qga-qapi-types.h qga-qapi-visit.h qga-qmp-commands.h) $(qga-obj-y) qemu-ga.o: $(QGALIB_GEN) -qemu-ga$(EXESUF): qemu-ga.o $(qga-obj-y) $(tools-obj-y) $(qapi-obj-y) $(qobject-obj-y) $(version-obj-y) +qemu-ga$(EXESUF): $(qga-obj-y) $(tools-obj-y) $(qapi-obj-y) $(qobject-obj-y) $(version-obj-y) + $(call LINK, $^) clean: # avoid old build problems by removing potentially incorrect old files diff --git a/Makefile.objs b/Makefile.objs index 7bbe646..545b822 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -215,7 +215,7 @@ universal-obj-y += $(qapi-obj-y) ###################################################################### # guest agent -qga-obj-y = qga/ qemu-ga.o module.o +qga-obj-y = qga/ module.o qga-obj-$(CONFIG_WIN32) += oslib-win32.o qga-obj-$(CONFIG_POSIX) += oslib-posix.o qemu-sockets.o qemu-option.o diff --git a/qga/Makefile.objs b/qga/Makefile.objs index cd3e135..b8d7cd0 100644 --- a/qga/Makefile.objs +++ b/qga/Makefile.objs @@ -1,4 +1,4 @@ -qga-obj-y = commands.o guest-agent-command-state.o +qga-obj-y = commands.o guest-agent-command-state.o main.o qga-obj-$(CONFIG_POSIX) += commands-posix.o channel-posix.o qga-obj-$(CONFIG_WIN32) += commands-win32.o channel-win32.o service-win32.o qga-obj-y += qapi-generated/qga-qapi-types.o qapi-generated/qga-qapi-visit.o diff --git a/qemu-ga.c b/qga/main.c similarity index 100% rename from qemu-ga.c rename to qga/main.c diff --git a/qapi-schema-guest.json b/qga/qapi-schema.json similarity index 100% rename from qapi-schema-guest.json rename to qga/qapi-schema.json -- 1.7.1