[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 07/18] build: Deal with all of QAPI's .o in qapi/
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v5 07/18] build: Deal with all of QAPI's .o in qapi/Makefile.objs |
Date: |
Thu, 14 Feb 2019 16:22:40 +0100 |
Adding QAPI's .o to util-obj-y, common-obj-y and obj-y is spread over
three places: Makefile.objs takes care of target-independent generated
code, Makefile.target of target-dependent generated code, and
qapi/Makefile.objs of (target-independent) hand-written code.
Do everything in qapi/Makefile.objs.
Suggested-by: Paolo Bonzini <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
---
Makefile | 1 -
Makefile.objs | 16 +---------------
Makefile.target | 3 +--
qapi/Makefile.objs | 19 +++++++++++++++++++
4 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/Makefile b/Makefile
index 53d161b65f..a6de28677f 100644
--- a/Makefile
+++ b/Makefile
@@ -89,7 +89,6 @@ include $(SRC_PATH)/rules.mak
GENERATED_FILES = qemu-version.h config-host.h qemu-options.def
-#see Makefile.objs for the definition of QAPI_MODULES
GENERATED_QAPI_FILES = qapi/qapi-builtin-types.h qapi/qapi-builtin-types.c
GENERATED_QAPI_FILES += qapi/qapi-types.h qapi/qapi-types.c
GENERATED_QAPI_FILES += $(QAPI_MODULES:%=qapi/qapi-types-%.h)
diff --git a/Makefile.objs b/Makefile.objs
index bc78e26f55..5fb022d7ad 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -1,20 +1,7 @@
-QAPI_MODULES = block-core block char common crypto introspect job migration
-QAPI_MODULES += misc net rdma rocker run-state sockets tpm trace transaction
-QAPI_MODULES += ui
-
#######################################################################
# Common libraries for tools and emulators
stub-obj-y = stubs/ crypto/
util-obj-y = util/ qobject/ qapi/
-util-obj-y += qapi/qapi-builtin-types.o
-util-obj-y += qapi/qapi-types.o
-util-obj-y += $(QAPI_MODULES:%=qapi/qapi-types-%.o)
-util-obj-y += qapi/qapi-builtin-visit.o
-util-obj-y += qapi/qapi-visit.o
-util-obj-y += $(QAPI_MODULES:%=qapi/qapi-visit-%.o)
-util-obj-y += qapi/qapi-emit-events.o
-util-obj-y += qapi/qapi-events.o
-util-obj-y += $(QAPI_MODULES:%=qapi/qapi-events-%.o)
chardev-obj-y = chardev/
slirp-obj-$(CONFIG_SLIRP) = slirp/
@@ -92,9 +79,8 @@ common-obj-$(CONFIG_FDT) += device_tree.o
######################################################################
# qapi
-common-obj-y += qapi/qapi-commands.o
-common-obj-y += $(QAPI_MODULES:%=qapi/qapi-commands-%.o)
common-obj-y += qmp.o hmp.o
+common-obj-y += qapi/
endif
#######################################################################
diff --git a/Makefile.target b/Makefile.target
index d8af835890..d6ce549388 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -148,6 +148,7 @@ ifdef CONFIG_SOFTMMU
obj-y += arch_init.o cpus.o monitor.o gdbstub.o balloon.o ioport.o numa.o
obj-y += qtest.o
obj-y += hw/
+obj-y += qapi/
obj-y += memory.o
obj-y += memory_mapping.o
obj-y += dump.o
@@ -164,8 +165,6 @@ endif
GENERATED_FILES += hmp-commands.h hmp-commands-info.h
-obj-y += qapi/qapi-introspect.o
-
endif # CONFIG_SOFTMMU
dummy := $(call unnest-vars,,obj-y)
diff --git a/qapi/Makefile.objs b/qapi/Makefile.objs
index 33906ff321..05bb0564f2 100644
--- a/qapi/Makefile.objs
+++ b/qapi/Makefile.objs
@@ -4,3 +4,22 @@ util-obj-y += string-input-visitor.o string-output-visitor.o
util-obj-y += opts-visitor.o qapi-clone-visitor.o
util-obj-y += qmp-event.o
util-obj-y += qapi-util.o
+
+QAPI_MODULES = block-core block char common crypto introspect job migration
+QAPI_MODULES += misc net rdma rocker run-state sockets tpm trace transaction
+QAPI_MODULES += ui
+
+util-obj-y += qapi-builtin-types.o
+util-obj-y += qapi-types.o
+util-obj-y += $(QAPI_MODULES:%=qapi-types-%.o)
+util-obj-y += qapi-builtin-visit.o
+util-obj-y += qapi-visit.o
+util-obj-y += $(QAPI_MODULES:%=qapi-visit-%.o)
+util-obj-y += qapi-emit-events.o
+util-obj-y += qapi-events.o
+util-obj-y += $(QAPI_MODULES:%=qapi-events-%.o)
+
+common-obj-y = qapi-commands.o
+common-obj-y += $(QAPI_MODULES:%=qapi-commands-%.o)
+
+obj-y = qapi-introspect.o
--
2.17.2
- [Qemu-devel] [PATCH v5 00/18] qapi: add #if pre-processor conditions to generated code (part 3), Markus Armbruster, 2019/02/14
- [Qemu-devel] [PATCH v5 06/18] build-sys: move qmp-introspect per target, Markus Armbruster, 2019/02/14
- [Qemu-devel] [PATCH v5 09/18] qapi: make rtc-reset-reinjection and SEV depend on TARGET_I386, Markus Armbruster, 2019/02/14
- [Qemu-devel] [PATCH v5 11/18] target.json: add a note about query-cpu* not being s390x-specific, Markus Armbruster, 2019/02/14
- [Qemu-devel] [PATCH v5 08/18] qapi: New module target.json, Markus Armbruster, 2019/02/14
- [Qemu-devel] [PATCH v5 03/18] qapi: Clean up modular built-in code generation a bit, Markus Armbruster, 2019/02/14
- [Qemu-devel] [PATCH v5 16/18] Revert "qapi-events: add 'if' condition to implicit event enum", Markus Armbruster, 2019/02/14
- [Qemu-devel] [PATCH v5 04/18] qapi: Prepare for system modules other than 'builtin', Markus Armbruster, 2019/02/14
- [Qemu-devel] [PATCH v5 15/18] qapi: remove qmp_unregister_command(), Markus Armbruster, 2019/02/14
- [Qemu-devel] [PATCH v5 07/18] build: Deal with all of QAPI's .o in qapi/Makefile.objs,
Markus Armbruster <=
- [Qemu-devel] [PATCH v5 01/18] qapi: Belatedly document modular code generation, Markus Armbruster, 2019/02/14
- [Qemu-devel] [PATCH v5 10/18] qapi: make s390 commands depend on TARGET_S390X, Markus Armbruster, 2019/02/14
- [Qemu-devel] [PATCH v5 13/18] qapi: make query-cpu-model-expansion depend on s390 or x86, Markus Armbruster, 2019/02/14
- [Qemu-devel] [PATCH v5 05/18] qapi: Generate QAPIEvent stuff into separate files, Markus Armbruster, 2019/02/14
- [Qemu-devel] [PATCH v5 12/18] qapi: make query-gic-capabilities depend on TARGET_ARM, Markus Armbruster, 2019/02/14
- [Qemu-devel] [PATCH v5 17/18] qmp: Deprecate query-events in favor of query-qmp-schema, Markus Armbruster, 2019/02/14
- [Qemu-devel] [PATCH v5 14/18] qapi: make query-cpu-definitions depend on specific targets, Markus Armbruster, 2019/02/14
- [Qemu-devel] [PATCH v5 18/18] qapi: move RTC_CHANGE to the target schema, Markus Armbruster, 2019/02/14
- [Qemu-devel] [PATCH v5 02/18] qapi: Fix up documentation for recent commit a95291007b2, Markus Armbruster, 2019/02/14
- Re: [Qemu-devel] [PATCH v5 00/18] qapi: add #if pre-processor conditions to generated code (part 3), Markus Armbruster, 2019/02/14