From: Max Reitz <mreitz@redhat.com>
To: Kevin Wolf <kwolf@redhat.com>, qemu-block@nongnu.org
Cc: pkrempa@redhat.com, armbru@redhat.com, qemu-devel@nongnu.org
Subject: Re: [RFC PATCH 18/18] qemu-storage-daemon: Add --monitor option
Date: Wed, 6 Nov 2019 15:32:13 +0100 [thread overview]
Message-ID: <64d79019-711d-8eb1-da72-a9b95f999ff5@redhat.com> (raw)
In-Reply-To: <20191017130204.16131-19-kwolf@redhat.com>
[-- Attachment #1.1: Type: text/plain, Size: 2552 bytes --]
On 17.10.19 15:02, Kevin Wolf wrote:
> 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.
>
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> ---
> storage-daemon/qapi/qapi-schema.json | 15 ++++++++++++
> qemu-storage-daemon.c | 34 ++++++++++++++++++++++++++++
> Makefile | 30 ++++++++++++++++++++++++
> Makefile.objs | 4 ++--
> monitor/Makefile.objs | 2 ++
> qapi/Makefile.objs | 5 ++++
> qom/Makefile.objs | 1 +
> scripts/qapi/gen.py | 5 ++++
> storage-daemon/Makefile.objs | 1 +
> storage-daemon/qapi/Makefile.objs | 1 +
> 10 files changed, 96 insertions(+), 2 deletions(-)
> create mode 100644 storage-daemon/qapi/qapi-schema.json
> create mode 100644 storage-daemon/Makefile.objs
> create mode 100644 storage-daemon/qapi/Makefile.objs
[...]
> diff --git a/qapi/Makefile.objs b/qapi/Makefile.objs
> index 3e04e299ed..03d256f0a4 100644
> --- a/qapi/Makefile.objs
> +++ b/qapi/Makefile.objs
> @@ -30,3 +30,8 @@ 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
> +
> +QAPI_MODULES_STORAGE_DAEMON = block block-core char common crypto introspect
> +QAPI_MODULES_STORAGE_DAEMON += job monitor qom sockets pragma transaction
I took a look into the rest, and I wonder whether query-iothreads from
misc.json would be useful, too.
> diff --git a/scripts/qapi/gen.py b/scripts/qapi/gen.py
> index 796c17c38a..c25634f673 100644
> --- a/scripts/qapi/gen.py
> +++ b/scripts/qapi/gen.py
> @@ -44,6 +44,11 @@ class QAPIGen(object):
> return ''
>
> def write(self, output_dir):
> + # Include paths starting with ../ are used to reuse modules of the main
> + # schema in specialised schemas. Don't overwrite the files that are
> + # already generated for the main schema.
> + if self.fname.startswith('../'):
> + return
Sorry, but I’m about to ask a clueless question: How do we ensure that
the main schema is generated before something else could make sure of
the specialized schemas?
Max
> pathname = os.path.join(output_dir, self.fname)
> dir = os.path.dirname(pathname)
> if dir:
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2019-11-06 14:33 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-17 13:01 [RFC PATCH 00/18] Add qemu-storage-daemon Kevin Wolf
2019-10-17 13:01 ` [RFC PATCH 01/18] qemu-storage-daemon: Add barebone tool Kevin Wolf
2019-10-24 13:50 ` Eric Blake
2019-11-13 14:12 ` Kevin Wolf
2019-11-06 12:11 ` Max Reitz
2019-11-07 16:21 ` Markus Armbruster
2019-10-17 13:01 ` [RFC PATCH 02/18] qemu-storage-daemon: Add --object option Kevin Wolf
2019-11-07 20:36 ` Markus Armbruster
2019-11-14 12:05 ` Kevin Wolf
2019-11-18 9:10 ` Markus Armbruster
2019-10-17 13:01 ` [RFC PATCH 03/18] stubs: Add arch_type Kevin Wolf
2019-10-17 13:01 ` [RFC PATCH 04/18] stubs: Add blk_by_qdev_id() Kevin Wolf
2019-11-08 9:03 ` Markus Armbruster
2019-10-17 13:01 ` [RFC PATCH 05/18] qemu-storage-daemon: Add --blockdev option Kevin Wolf
2019-11-08 13:29 ` Markus Armbruster
2019-10-17 13:01 ` [RFC PATCH 06/18] qemu-storage-daemon: Add --nbd-server option Kevin Wolf
2019-11-06 12:51 ` Max Reitz
2019-11-06 19:25 ` Eric Blake
2019-11-07 8:33 ` Kevin Wolf
2019-11-07 13:45 ` Eric Blake
2019-11-07 15:27 ` Kevin Wolf
2019-11-07 15:36 ` Eric Blake
2019-11-08 15:36 ` Markus Armbruster
2019-10-17 13:01 ` [RFC PATCH 07/18] blockdev-nbd: Boxed argument type for nbd-server-add Kevin Wolf
2019-10-17 13:01 ` [RFC PATCH 08/18] qemu-storage-daemon: Add --export option Kevin Wolf
2019-11-06 13:11 ` Max Reitz
2019-11-06 13:34 ` Kevin Wolf
2019-11-06 13:39 ` Max Reitz
2019-11-08 15:57 ` Markus Armbruster
2019-10-17 13:01 ` [RFC PATCH 09/18] qemu-storage-daemon: Add main loop Kevin Wolf
2019-11-08 16:02 ` Markus Armbruster
2019-10-17 13:01 ` [RFC PATCH 10/18] qemu-storage-daemon: Add --chardev option Kevin Wolf
2019-11-08 16:27 ` Markus Armbruster
2019-10-17 13:01 ` [RFC PATCH 11/18] monitor: Move monitor option parsing to monitor/monitor.c Kevin Wolf
2019-10-17 13:01 ` [RFC PATCH 12/18] stubs: Update monitor stubs for qemu-storage-daemon Kevin Wolf
2019-11-08 16:45 ` Markus Armbruster
2019-10-17 13:01 ` [RFC PATCH 13/18] qapi: Create module 'monitor' Kevin Wolf
2019-11-11 9:36 ` Markus Armbruster
2019-10-17 13:02 ` [RFC PATCH 14/18] monitor: Create monitor/qmp-cmds-monitor.c Kevin Wolf
2019-10-17 13:02 ` [RFC PATCH 15/18] qapi: Support empty modules Kevin Wolf
2019-11-12 8:29 ` Markus Armbruster
2019-10-17 13:02 ` [RFC PATCH 16/18] qapi: Create 'pragma' module Kevin Wolf
2019-11-12 9:41 ` Markus Armbruster
2019-10-17 13:02 ` [RFC PATCH 17/18] monitor: Move qmp_query_qmp_schema to qmp-cmds-monitor.c Kevin Wolf
2019-10-17 13:02 ` [RFC PATCH 18/18] qemu-storage-daemon: Add --monitor option Kevin Wolf
2019-11-06 14:32 ` Max Reitz [this message]
2019-11-07 10:12 ` Kevin Wolf
2019-11-07 10:44 ` Max Reitz
2019-11-08 8:59 ` Markus Armbruster
2019-11-12 14:25 ` Markus Armbruster
2019-11-13 10:58 ` Kevin Wolf
2019-11-13 13:53 ` Markus Armbruster
2019-10-24 11:33 ` [RFC PATCH 00/18] Add qemu-storage-daemon Kevin Wolf
2019-10-24 13:55 ` Vladimir Sementsov-Ogievskiy
2019-11-14 10:44 ` Kevin Wolf
2019-11-05 15:52 ` Stefan Hajnoczi
2019-11-06 14:37 ` Max Reitz
2019-11-06 14:58 ` Kevin Wolf
2019-11-06 15:35 ` Max Reitz
2019-11-06 17:13 ` Eric Blake
2019-11-21 10:32 ` Stefan Hajnoczi
2019-11-21 11:08 ` Kevin Wolf
2019-12-12 11:16 ` Stefan Hajnoczi
2019-11-07 10:33 ` Daniel P. Berrangé
2019-11-07 12:03 ` Kevin Wolf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=64d79019-711d-8eb1-da72-a9b95f999ff5@redhat.com \
--to=mreitz@redhat.com \
--cc=armbru@redhat.com \
--cc=kwolf@redhat.com \
--cc=pkrempa@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).