[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 21/27] build: move QAPI definitions for QEMU out of
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 21/27] build: move QAPI definitions for QEMU out of qapi-obj-y |
Date: |
Sat, 12 Jan 2013 18:35:32 +0100 |
There is no reason why for example qemu-ga should include all the
definitions for the QEMU monitor. However, there are a few
that are needed (qapi_free_SocketAddress, qapi_free_InetSocketAddress,
ErrorClass_lookup). These should be moved to a separate "core"
.json schema that goes into libqemuutil.a.
For now, make this clearer by moving the qapi-*.o definitions out
of libqemuutil.a. Once the above refactoring is done, qga-obj-y
should not include anymore qapi-types.o and qapi-visit.o.
Signed-off-by: Paolo Bonzini <address@hidden>
---
Makefile.objs | 6 ++++--
tests/Makefile | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Makefile.objs b/Makefile.objs
index f2f43b2..48a7173 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -103,7 +103,6 @@ common-obj-$(CONFIG_SMARTCARD_NSS) += $(libcacard-y)
# qapi
qapi-obj-y = qapi/
-qapi-obj-y += qapi-types.o qapi-visit.o
common-obj-y += qmp-marshal.o qapi-visit.o qapi-types.o
common-obj-y += qmp.o hmp.o
@@ -118,11 +117,14 @@ universal-obj-y += qom/
universal-obj-y += disas/
universal-obj-y += $(trace-obj-y)
universal-obj-y += $(qapi-obj-y)
+universal-obj-y += qapi-types.o qapi-visit.o
######################################################################
# guest agent
-qga-obj-y = qga/
+# FIXME: a few definitions from qapi-types.o/qapi-visit.o are needed
+# by libqemuutil.a. These should be moved to a separate .json schema.
+qga-obj-y = qga/ qapi-types.o qapi-visit.o
vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS)
diff --git a/tests/Makefile b/tests/Makefile
index 837f769..9017fea 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -102,7 +102,7 @@ tests/test-string-input-visitor$(EXESUF):
tests/test-string-input-visitor.o $(te
tests/test-qmp-output-visitor$(EXESUF): tests/test-qmp-output-visitor.o
$(test-qapi-obj-y) libqemuutil.a libqemustub.a
tests/test-qmp-input-visitor$(EXESUF): tests/test-qmp-input-visitor.o
$(test-qapi-obj-y) libqemuutil.a libqemustub.a
tests/test-qmp-input-strict$(EXESUF): tests/test-qmp-input-strict.o
$(test-qapi-obj-y) libqemuutil.a libqemustub.a
-tests/test-qmp-commands$(EXESUF): tests/test-qmp-commands.o
tests/test-qmp-marshal.o $(test-qapi-obj-y) libqemuutil.a libqemustub.a
+tests/test-qmp-commands$(EXESUF): tests/test-qmp-commands.o
tests/test-qmp-marshal.o $(test-qapi-obj-y) qapi-types.o qapi-visit.o
libqemuutil.a libqemustub.a
tests/test-visitor-serialization$(EXESUF): tests/test-visitor-serialization.o
$(test-qapi-obj-y) libqemuutil.a libqemustub.a
tests/rtc-test$(EXESUF): tests/rtc-test.o $(trace-obj-y)
--
1.8.1
- [Qemu-devel] [PATCH 11/27] libcacard: add list of exported symbols, (continued)
- [Qemu-devel] [PATCH 11/27] libcacard: add list of exported symbols, Paolo Bonzini, 2013/01/12
- [Qemu-devel] [PATCH 09/27] libcacard: prepare to use -y trick in the Makefile, Paolo Bonzini, 2013/01/12
- [Qemu-devel] [PATCH 16/27] build: move util-obj-y to libqemuutil.a, Paolo Bonzini, 2013/01/12
- [Qemu-devel] [PATCH 12/27] libcacard: rewrite Makefile in non-recursive style, Paolo Bonzini, 2013/01/12
- [Qemu-devel] [PATCH 13/27] libcacard: link vscclient to dynamic library, Paolo Bonzini, 2013/01/12
- [Qemu-devel] [PATCH 15/27] build: rename oslib-obj-y to util-obj-y, Paolo Bonzini, 2013/01/12
- [Qemu-devel] [PATCH 14/27] libcacard: list oslib-obj-y file explicitly, Paolo Bonzini, 2013/01/12
- [Qemu-devel] [PATCH 17/27] build: move files away from tools-obj-y, common-obj-y, user-obj-y, Paolo Bonzini, 2013/01/12
- [Qemu-devel] [PATCH 20/27] build: consolidate multiple variables into universal-obj-y, Paolo Bonzini, 2013/01/12
- [Qemu-devel] [PATCH 19/27] build: move qobject files to qobject/ and libqemuutil.a, Paolo Bonzini, 2013/01/12
- [Qemu-devel] [PATCH 21/27] build: move QAPI definitions for QEMU out of qapi-obj-y,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 18/27] build: move libqemuutil.a components to util/, Paolo Bonzini, 2013/01/12
- [Qemu-devel] [PATCH 25/27] build: some simplifications for "trace/Makefile.objs", Paolo Bonzini, 2013/01/12
- [Qemu-devel] [PATCH 26/27] build: fold trace-obj-y into libqemuutil.a, Paolo Bonzini, 2013/01/12
- [Qemu-devel] [PATCH 22/27] build: move base QAPI files to libqemuutil.a, Paolo Bonzini, 2013/01/12
- [Qemu-devel] [PATCH 23/27] build: move version-obj-y to the generic LINK rule, Paolo Bonzini, 2013/01/12
- [Qemu-devel] [PATCH 27/27] build: improve quiet output for .stp rules, Paolo Bonzini, 2013/01/12
- [Qemu-devel] [PATCH 24/27] build: remove coroutine-obj-y, Paolo Bonzini, 2013/01/12
- Re: [Qemu-devel] [PULL 00/27] More source reorganization and build system TLC, Stefan Hajnoczi, 2013/01/14