diff options
| author | Markus Armbruster <armbru@redhat.com> | 2019-02-14 16:22:41 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2019-02-18 14:44:04 +0100 |
| commit | 61eb9e80d5ac9d51d3bfbe4e6ca234f57e747d2b (patch) | |
| tree | 63b7ca19d7c08a1a07a4511485e33de0d55716d8 | |
| parent | 88554a200590008a5846461d82b8c7967f74139f (diff) | |
| download | qemu-61eb9e80d5ac9d51d3bfbe4e6ca234f57e747d2b.zip qemu-61eb9e80d5ac9d51d3bfbe4e6ca234f57e747d2b.tar.gz qemu-61eb9e80d5ac9d51d3bfbe4e6ca234f57e747d2b.tar.bz2 | |
qapi: New module target.json
We can't add appropriate target-specific conditionals to misc.json,
because that would make all of misc.json unusable in
target-independent code. To keep misc.json target-independent, we
need to split off target-dependent target.json.
This commit doesn't actually split off anything, it merely creates the
empty module. The next few patches will move stuff from misc.json
there.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20190214152251.2073-9-armbru@redhat.com>
| -rw-r--r-- | qapi/Makefile.objs | 28 | ||||
| -rw-r--r-- | qapi/qapi-schema.json | 1 | ||||
| -rw-r--r-- | qapi/target.json | 13 |
3 files changed, 31 insertions, 11 deletions
diff --git a/qapi/Makefile.objs b/qapi/Makefile.objs index 05bb056..87e4df1 100644 --- a/qapi/Makefile.objs +++ b/qapi/Makefile.objs @@ -5,21 +5,27 @@ 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 +QAPI_COMMON_MODULES = block-core block char common crypto introspect +QAPI_COMMON_MODULES += job migration misc net rdma rocker run-state +QAPI_COMMON_MODULES += sockets tpm trace transaction ui +QAPI_TARGET_MODULES = target +QAPI_MODULES = $(QAPI_COMMON_MODULES) $(QAPI_TARGET_MODULES) 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_COMMON_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_COMMON_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) +util-obj-y += $(QAPI_COMMON_MODULES:%=qapi-events-%.o) -common-obj-y = qapi-commands.o -common-obj-y += $(QAPI_MODULES:%=qapi-commands-%.o) +common-obj-y = $(QAPI_COMMON_MODULES:%=qapi-commands-%.o) obj-y = qapi-introspect.o +obj-y += $(QAPI_TARGET_MODULES:%=qapi-types-%.o) +obj-y += qapi-types.o +obj-y += $(QAPI_TARGET_MODULES:%=qapi-visit-%.o) +obj-y += qapi-visit.o +obj-y += $(QAPI_TARGET_MODULES:%=qapi-events-%.o) +obj-y += qapi-events.o +obj-y += $(QAPI_TARGET_MODULES:%=qapi-commands-%.o) +obj-y += qapi-commands.o diff --git a/qapi/qapi-schema.json b/qapi/qapi-schema.json index 1845aa7..db61bfd 100644 --- a/qapi/qapi-schema.json +++ b/qapi/qapi-schema.json @@ -97,3 +97,4 @@ { 'include': 'trace.json' } { 'include': 'introspect.json' } { 'include': 'misc.json' } +{ 'include': 'target.json' } diff --git a/qapi/target.json b/qapi/target.json new file mode 100644 index 0000000..8054926 --- /dev/null +++ b/qapi/target.json @@ -0,0 +1,13 @@ +# -*- Mode: Python -*- +# + +## +# = Target-specific commands & events +## + +## +# @TARGET-TEMPORARY-DUMMY: +# Will go away in the next commit. Needed in this one because empty +# modules don't generate anything, defeating this commit's purpose. +## +{ 'event': 'TARGET-TEMPORARY-DUMMY' } |