diff options
| author | Kevin Wolf | 2020-02-24 15:30:08 +0100 |
|---|---|---|
| committer | Kevin Wolf | 2020-03-06 17:21:28 +0100 |
| commit | 2af282ec51a27116d0402cab237b8970800f870c (patch) | |
| tree | 66a3c1b090cf5e81b8c13596d89aee4a847a2b97 /storage-daemon | |
| parent | monitor: Add allow_hmp parameter to monitor_init() (diff) | |
| download | qemu-2af282ec51a27116d0402cab237b8970800f870c.tar.gz qemu-2af282ec51a27116d0402cab237b8970800f870c.tar.xz qemu-2af282ec51a27116d0402cab237b8970800f870c.zip | |
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 'storage-daemon')
| -rw-r--r-- | storage-daemon/Makefile.objs | 1 | ||||
| -rw-r--r-- | storage-daemon/qapi/Makefile.objs | 1 | ||||
| -rw-r--r-- | storage-daemon/qapi/qapi-schema.json | 26 |
3 files changed, 28 insertions, 0 deletions
diff --git a/storage-daemon/Makefile.objs b/storage-daemon/Makefile.objs new file mode 100644 index 0000000000..cfe6beee52 --- /dev/null +++ b/storage-daemon/Makefile.objs @@ -0,0 +1 @@ +storage-daemon-obj-y += qapi/ diff --git a/storage-daemon/qapi/Makefile.objs b/storage-daemon/qapi/Makefile.objs new file mode 100644 index 0000000000..8a4b220c96 --- /dev/null +++ b/storage-daemon/qapi/Makefile.objs @@ -0,0 +1 @@ +storage-daemon-obj-y += qapi-commands.o qapi-init-commands.o qapi-introspect.o diff --git a/storage-daemon/qapi/qapi-schema.json b/storage-daemon/qapi/qapi-schema.json new file mode 100644 index 0000000000..14f4f8fe61 --- /dev/null +++ b/storage-daemon/qapi/qapi-schema.json @@ -0,0 +1,26 @@ +# -*- Mode: Python -*- + +# Note that modules are shared with the QEMU main schema under the assumption +# that the storage daemon schema is a subset of the main schema. For the shared +# modules, no code is generated here, but we reuse the code files generated +# from the main schema. +# +# If you wish to extend the storage daemon schema to contain things that are +# not in the main schema, be aware that array types of types defined in shared +# modules are only generated if an array of the respective type is already used +# in the main schema. Therefore, if you use such arrays, you may need to define +# the array type in the main schema, even if it is unused outside of the +# storage daemon. + +{ 'include': '../../qapi/pragma.json' } + +{ 'include': '../../qapi/block-core.json' } +{ 'include': '../../qapi/char.json' } +{ 'include': '../../qapi/common.json' } +{ 'include': '../../qapi/control.json' } +{ 'include': '../../qapi/crypto.json' } +{ 'include': '../../qapi/introspect.json' } +{ 'include': '../../qapi/job.json' } +{ 'include': '../../qapi/qom.json' } +{ 'include': '../../qapi/sockets.json' } +{ 'include': '../../qapi/transaction.json' } |