diff options
author | Kevin Wolf <kwolf@redhat.com> | 2020-02-24 15:30:08 +0100 |
---|---|---|
committer | Kevin Wolf <kwolf@redhat.com> | 2020-03-06 17:21:28 +0100 |
commit | 2af282ec51a27116d0402cab237b8970800f870c (patch) | |
tree | 66a3c1b090cf5e81b8c13596d89aee4a847a2b97 /qapi | |
parent | a2f411c4671b0b6cfe5f3b91b65d9bc8456e75ab (diff) | |
download | qemu-2af282ec51a27116d0402cab237b8970800f870c.zip qemu-2af282ec51a27116d0402cab237b8970800f870c.tar.gz qemu-2af282ec51a27116d0402cab237b8970800f870c.tar.bz2 |
qemu-storage-daemon: Add --monitor option
This adds and parses the --monitor option, so that a QMP monitor can be
used in the storage daemon. The monitor offers commands defined in the
QAPI schema at storage-daemon/qapi/qapi-schema.json.
The --monitor options currently allows to create multiple monitors with
the same ID. This part of the interface is considered unstable. We will
reject such configurations as soon as we have a design for the monitor
subsystem to perform these checks. (In the system emulator, we depend on
QemuOpts rejecting duplicate IDs.)
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20200224143008.13362-21-kwolf@redhat.com>
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'qapi')
-rw-r--r-- | qapi/Makefile.objs | 5 | ||||
-rw-r--r-- | qapi/transaction.json | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/qapi/Makefile.objs b/qapi/Makefile.objs index cf33fd9..4673ab7 100644 --- a/qapi/Makefile.objs +++ b/qapi/Makefile.objs @@ -31,3 +31,8 @@ obj-y += qapi-events.o obj-y += $(QAPI_TARGET_MODULES:%=qapi-commands-%.o) obj-y += qapi-commands.o obj-y += qapi-init-commands.o + +QAPI_MODULES_STORAGE_DAEMON = block-core char common control crypto +QAPI_MODULES_STORAGE_DAEMON += introspect job qom sockets pragma transaction + +storage-daemon-obj-y += $(QAPI_MODULES_STORAGE_DAEMON:%=qapi-commands-%.o) diff --git a/qapi/transaction.json b/qapi/transaction.json index 04301f1..b6c1115 100644 --- a/qapi/transaction.json +++ b/qapi/transaction.json @@ -5,7 +5,7 @@ # = Transactions ## -{ 'include': 'block.json' } +{ 'include': 'block-core.json' } ## # @Abort: |