[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/18] build-sys: move qmp-introspect per target
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 06/18] build-sys: move qmp-introspect per target |
Date: |
Mon, 18 Feb 2019 15:05:55 +0100 |
From: Marc-André Lureau <address@hidden>
The following patches are going to introduce per-target #ifdef in the
schemas.
The introspection data is statically generated once, and must thus be
built per-target to reflect target-specific configuration.
Drop "do_test_visitor_in_qmp_introspect(&qmp_schema_qlit)" since the
schema is no longer in a common object. It is covered by the per-target
query-qmp-schema test instead.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
---
Makefile.objs | 2 --
Makefile.target | 2 ++
tests/test-qobject-input-visitor.c | 1 -
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/Makefile.objs b/Makefile.objs
index ec11a0f55b..bc78e26f55 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -15,7 +15,6 @@ 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)
-util-obj-y += qapi/qapi-introspect.o
chardev-obj-y = chardev/
slirp-obj-$(CONFIG_SLIRP) = slirp/
@@ -95,7 +94,6 @@ common-obj-$(CONFIG_FDT) += device_tree.o
common-obj-y += qapi/qapi-commands.o
common-obj-y += $(QAPI_MODULES:%=qapi/qapi-commands-%.o)
-common-obj-y += qapi/qapi-introspect.o
common-obj-y += qmp.o hmp.o
endif
diff --git a/Makefile.target b/Makefile.target
index 401dc1ea6f..d8af835890 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -164,6 +164,8 @@ 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/tests/test-qobject-input-visitor.c
b/tests/test-qobject-input-visitor.c
index caa90b3d7e..609334adf6 100644
--- a/tests/test-qobject-input-visitor.c
+++ b/tests/test-qobject-input-visitor.c
@@ -1271,7 +1271,6 @@ static void
test_visitor_in_qmp_introspect(TestInputVisitorData *data,
const void *unused)
{
do_test_visitor_in_qmp_introspect(data, &test_qmp_schema_qlit);
- do_test_visitor_in_qmp_introspect(data, &qmp_schema_qlit);
}
int main(int argc, char **argv)
--
2.17.2
- [Qemu-devel] [PULL 00/18] QAPI patches for 2019-02-18, Markus Armbruster, 2019/02/18
- [Qemu-devel] [PULL 17/18] qmp: Deprecate query-events in favor of query-qmp-schema, Markus Armbruster, 2019/02/18
- [Qemu-devel] [PULL 02/18] qapi: Fix up documentation for recent commit a95291007b2, Markus Armbruster, 2019/02/18
- [Qemu-devel] [PULL 16/18] Revert "qapi-events: add 'if' condition to implicit event enum", Markus Armbruster, 2019/02/18
- [Qemu-devel] [PULL 15/18] qapi: remove qmp_unregister_command(), Markus Armbruster, 2019/02/18
- [Qemu-devel] [PULL 06/18] build-sys: move qmp-introspect per target,
Markus Armbruster <=
- [Qemu-devel] [PULL 04/18] qapi: Prepare for system modules other than 'builtin', Markus Armbruster, 2019/02/18
- [Qemu-devel] [PULL 13/18] qapi: make query-cpu-model-expansion depend on s390 or x86, Markus Armbruster, 2019/02/18
- [Qemu-devel] [PULL 11/18] target.json: add a note about query-cpu* not being s390x-specific, Markus Armbruster, 2019/02/18
- [Qemu-devel] [PULL 09/18] qapi: make rtc-reset-reinjection and SEV depend on TARGET_I386, Markus Armbruster, 2019/02/18
- [Qemu-devel] [PULL 07/18] build: Deal with all of QAPI's .o in qapi/Makefile.objs, Markus Armbruster, 2019/02/18
- [Qemu-devel] [PULL 08/18] qapi: New module target.json, Markus Armbruster, 2019/02/18
- [Qemu-devel] [PULL 03/18] qapi: Clean up modular built-in code generation a bit, Markus Armbruster, 2019/02/18
- [Qemu-devel] [PULL 14/18] qapi: make query-cpu-definitions depend on specific targets, Markus Armbruster, 2019/02/18
- [Qemu-devel] [PULL 01/18] qapi: Belatedly document modular code generation, Markus Armbruster, 2019/02/18
- [Qemu-devel] [PULL 10/18] qapi: make s390 commands depend on TARGET_S390X, Markus Armbruster, 2019/02/18