[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 16/32] qemu-ga: move qemu-ga files to qga/
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 16/32] qemu-ga: move qemu-ga files to qga/ |
Date: |
Wed, 24 Oct 2012 14:58:46 +0200 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
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
- [Qemu-devel] [PATCH 14/32] net: move net.c to net/, (continued)
- [Qemu-devel] [PATCH 14/32] net: move net.c to net/, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 18/32] audio: move public header file to include/audio/, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 31/32] hw: move executable format header files to hw/, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 30/32] fpu: move public header file to include/fpu, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 09/32] janitor: move iovector functions out of cutils.c, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 19/32] slirp: move public header file to include/slirp/, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 32/32] janitor: move remaining public headers to include/, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 26/32] qom: move include files to include/qom/, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 08/32] build: kill libuser, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 25/32] migration: move include files to include/migration/, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 16/32] qemu-ga: move qemu-ga files to qga/,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 17/32] ui: move files to ui/ and include/ui/, Paolo Bonzini, 2012/10/24
- Re: [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup, Andreas Färber, 2012/10/24
- Re: [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup, Stefan Hajnoczi, 2012/10/25
- Re: [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup, Zhi Yong Wu, 2012/10/25