From patchwork Thu Dec 6 13:06:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 204229 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 520222C0106 for ; Fri, 7 Dec 2012 00:42:51 +1100 (EST) Received: from localhost ([::1]:44980 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TgbBo-0004Y1-Nu for incoming@patchwork.ozlabs.org; Thu, 06 Dec 2012 08:08:32 -0500 Received: from eggs.gnu.org ([208.118.235.92]:38885) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TgbBc-0004Gu-30 for qemu-devel@nongnu.org; Thu, 06 Dec 2012 08:08:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TgbBZ-00055n-Sy for qemu-devel@nongnu.org; Thu, 06 Dec 2012 08:08:19 -0500 Received: from mail-ia0-f179.google.com ([209.85.210.179]:40093) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TgbBZ-00055T-Ou for qemu-devel@nongnu.org; Thu, 06 Dec 2012 08:08:17 -0500 Received: by mail-ia0-f179.google.com with SMTP id o25so4615131iad.10 for ; Thu, 06 Dec 2012 05:08:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=HJyvbZujfSAxJmEeu9euHvNtk93Yr0zM3hXKF3XMef4=; b=KOIpX5J58qEWE2WxwdRGeSxF3Zgjx49Ya5vlyT0VBv393A/7SDcH3e5nwnkWgljhPj xahefYUL25Joaz0sRR/cec0IDIYVJ25OpLO2ULdX2p8a3H+AW411hja/ivbZt+f/pfaV QOgAOz3V99vIRNj0Cxr5K7KyC1UjENCLuuJNqgdQxij8pXop+NEghlsJRESdyAREowY9 f5UQDlDr0Gj0UCIjP9SsPjC78yBD4jdsNQxTdpttj025c9DKqugN/8zAsDo+n98yLEkJ mcfZLqL8SmPZlXrV3B5TWIP8+xZWaxgNPGlPPb0ujskGeZr8zNoS+pSXLKF3ghJOWDkZ UZvQ== Received: by 10.50.178.10 with SMTP id cu10mr1299775igc.17.1354799297166; Thu, 06 Dec 2012 05:08:17 -0800 (PST) Received: from yakj.usersys.redhat.com (93-34-219-150.ip51.fastwebnet.it. [93.34.219.150]) by mx.google.com with ESMTPS id wm10sm15431723igc.2.2012.12.06.05.08.14 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 06 Dec 2012 05:08:16 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 6 Dec 2012 14:06:53 +0100 Message-Id: <1354799230-30904-16-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.0.1 In-Reply-To: <1354799230-30904-1-git-send-email-pbonzini@redhat.com> References: <1354799230-30904-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.210.179 Cc: aliguori@us.ibm.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH 15/32] qemu-ga: move qemu-ga files to qga/ X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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/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 diff --git a/Makefile b/Makefile index 0c6ad1e..a0321dd 100644 --- a/Makefile +++ b/Makefile @@ -200,13 +200,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 :\ @@ -222,7 +222,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) $(oslib-obj-y) $(trace-obj-y) $(qapi-obj-y) $(qobject-obj-y) $(version-obj-y) libqemustub.a +qemu-ga$(EXESUF): $(qga-obj-y) $(oslib-obj-y) $(trace-obj-y) $(qapi-obj-y) $(qobject-obj-y) $(version-obj-y) libqemustub.a + $(call LINK, $^) clean: # avoid old build problems by removing potentially incorrect old files diff --git a/Makefile.objs b/Makefile.objs index 569d834..d3d0592 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -220,7 +220,7 @@ universal-obj-y += $(qapi-obj-y) ###################################################################### # guest agent -qga-obj-y = qga/ qemu-ga.o module.o qemu-tool.o +qga-obj-y = qga/ module.o qemu-tool.o qga-obj-$(CONFIG_POSIX) += qemu-sockets.o qemu-option.o vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS) 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