openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

build-sys: move qmp-introspect per target 

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 <marcandre.lureau@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20190214152251.2073-7-armbru@redhat.com>
This commit is contained in:
Marc-André Lureau 2019-02-14 16:22:39 +01:00 committed by Markus Armbruster
parent 5d75648b56
commit c19099f637
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.objs
View File

@ -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-emit-events.o
util-obj-y += qapi/qapi-events.o util-obj-y += qapi/qapi-events.o
util-obj-y += $(QAPI_MODULES:%=qapi/qapi-events-%.o) util-obj-y += $(QAPI_MODULES:%=qapi/qapi-events-%.o)
util-obj-y += qapi/qapi-introspect.o
chardev-obj-y = chardev/ chardev-obj-y = chardev/
slirp-obj-$(CONFIG_SLIRP) = slirp/ 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/qapi-commands.o
common-obj-y += $(QAPI_MODULES:%=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 common-obj-y += qmp.o hmp.o
endif endif

2
Makefile.target
View File

@ -164,6 +164,8 @@ endif
GENERATED_FILES += hmp-commands.h hmp-commands-info.h GENERATED_FILES += hmp-commands.h hmp-commands-info.h
obj-y += qapi/qapi-introspect.o
endif # CONFIG_SOFTMMU endif # CONFIG_SOFTMMU
dummy := $(call unnest-vars,,obj-y) dummy := $(call unnest-vars,,obj-y)

1
tests/test-qobject-input-visitor.c
View File

@ -1271,7 +1271,6 @@ static void test_visitor_in_qmp_introspect(TestInputVisitorData *data,
const void *unused) const void *unused)
{ {
do_test_visitor_in_qmp_introspect(data, &test_qmp_schema_qlit); 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) int main(int argc, char **argv)