From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, pkrempa@redhat.com, berrange@redhat.com,
ehabkost@redhat.com, qemu-block@nongnu.org, quintela@redhat.com,
libvir-list@redhat.com, eblake@redhat.com,
mdroth@linux.vnet.ibm.com, dgilbert@redhat.com,
pbonzini@redhat.com, marcandre.lureau@redhat.com,
jsnow@redhat.com, libguestfs@redhat.com
Subject: [PATCH 3/9] qapi: Eliminate QCO_NO_OPTIONS for a slight simplification
Date: Mon, 25 Oct 2021 07:25:26 +0200 [thread overview]
Message-ID: <20211025052532.3859634-4-armbru@redhat.com> (raw)
In-Reply-To: <20211025052532.3859634-1-armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
include/qapi/qmp/dispatch.h | 1 -
monitor/misc.c | 3 +--
scripts/qapi/commands.py | 5 +----
3 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/include/qapi/qmp/dispatch.h b/include/qapi/qmp/dispatch.h
index 075203dc67..0ce88200b9 100644
--- a/include/qapi/qmp/dispatch.h
+++ b/include/qapi/qmp/dispatch.h
@@ -21,7 +21,6 @@ typedef void (QmpCommandFunc)(QDict *, QObject **, Error **);
typedef enum QmpCommandOptions
{
- QCO_NO_OPTIONS = 0x0,
QCO_NO_SUCCESS_RESP = (1U << 0),
QCO_ALLOW_OOB = (1U << 1),
QCO_ALLOW_PRECONFIG = (1U << 2),
diff --git a/monitor/misc.c b/monitor/misc.c
index ffe7966870..3556b177f6 100644
--- a/monitor/misc.c
+++ b/monitor/misc.c
@@ -230,8 +230,7 @@ static void monitor_init_qmp_commands(void)
qmp_init_marshal(&qmp_commands);
- qmp_register_command(&qmp_commands, "device_add", qmp_device_add,
- QCO_NO_OPTIONS);
+ qmp_register_command(&qmp_commands, "device_add", qmp_device_add, 0);
QTAILQ_INIT(&qmp_cap_negotiation_commands);
qmp_register_command(&qmp_cap_negotiation_commands, "qmp_capabilities",
diff --git a/scripts/qapi/commands.py b/scripts/qapi/commands.py
index 3654825968..c8a975528f 100644
--- a/scripts/qapi/commands.py
+++ b/scripts/qapi/commands.py
@@ -229,15 +229,12 @@ def gen_register_command(name: str,
if coroutine:
options += ['QCO_COROUTINE']
- if not options:
- options = ['QCO_NO_OPTIONS']
-
ret = mcgen('''
qmp_register_command(cmds, "%(name)s",
qmp_marshal_%(c_name)s, %(opts)s);
''',
name=name, c_name=c_name(name),
- opts=" | ".join(options))
+ opts=' | '.join(options) or 0)
return ret
--
2.31.1
next prev parent reply other threads:[~2021-10-25 5:27 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-25 5:25 [PATCH 0/9] Configurable policy for handling unstable interfaces Markus Armbruster
2021-10-25 5:25 ` [PATCH 1/9] qapi: New special feature flag "unstable" Markus Armbruster
2021-10-25 7:15 ` Juan Quintela
2021-10-25 12:05 ` Kashyap Chamarthy
2021-10-25 12:18 ` Philippe Mathieu-Daudé
2021-10-26 7:15 ` Markus Armbruster
2021-10-26 8:14 ` Kashyap Chamarthy
2021-10-25 19:01 ` John Snow
2021-10-26 5:35 ` Markus Armbruster
2021-10-26 7:37 ` Kevin Wolf
2021-10-26 8:36 ` [Libguestfs] " Kashyap Chamarthy
2021-10-26 9:22 ` Dr. David Alan Gilbert
2021-10-26 9:28 ` Daniel P. Berrangé
2021-10-26 9:37 ` Markus Armbruster
2021-10-26 11:34 ` Kevin Wolf
2021-10-28 8:36 ` Markus Armbruster
2021-10-26 14:56 ` Daniel P. Berrangé
2021-10-26 15:15 ` Markus Armbruster
2021-10-26 15:22 ` Daniel P. Berrangé
2021-10-27 5:29 ` Markus Armbruster
2021-10-25 5:25 ` [PATCH 2/9] qapi: Mark unstable QMP parts with feature 'unstable' Markus Armbruster
2021-10-25 7:16 ` Juan Quintela
2021-10-25 19:05 ` John Snow
2021-10-26 7:56 ` Markus Armbruster
2021-10-26 16:34 ` John Snow
2021-10-27 5:44 ` Markus Armbruster
2021-10-29 13:07 ` Eric Blake
2021-11-02 9:15 ` Kevin Wolf
2021-10-25 5:25 ` Markus Armbruster [this message]
2021-10-25 7:17 ` [PATCH 3/9] qapi: Eliminate QCO_NO_OPTIONS for a slight simplification Juan Quintela
2021-10-25 19:08 ` John Snow
2021-10-26 7:58 ` Markus Armbruster
2021-10-25 5:25 ` [PATCH 4/9] qapi: Tools for sets of special feature flags in generated code Markus Armbruster
2021-10-25 19:21 ` John Snow
2021-10-26 8:48 ` Markus Armbruster
2021-10-25 5:25 ` [PATCH 5/9] qapi: Generalize struct member policy checking Markus Armbruster
2021-10-25 19:28 ` John Snow
2021-10-26 9:14 ` Markus Armbruster
2021-10-26 15:43 ` Philippe Mathieu-Daudé
2021-10-27 5:56 ` Markus Armbruster
2021-10-25 5:25 ` [PATCH 6/9] qapi: Generalize command " Markus Armbruster
2021-10-25 12:04 ` Philippe Mathieu-Daudé
2021-10-26 9:40 ` Markus Armbruster
2021-10-25 19:30 ` John Snow
2021-10-25 5:25 ` [PATCH 7/9] qapi: Generalize enum member " Markus Armbruster
2021-10-25 19:36 ` John Snow
2021-10-26 9:43 ` Markus Armbruster
2021-10-26 16:14 ` John Snow
2021-10-25 5:25 ` [PATCH 8/9] qapi: Factor out compat_policy_input_ok() Markus Armbruster
2021-10-25 12:13 ` Philippe Mathieu-Daudé
2021-10-26 9:46 ` Markus Armbruster
2021-10-26 10:39 ` Philippe Mathieu-Daudé
2021-10-29 14:08 ` Markus Armbruster
2021-10-25 19:38 ` John Snow
2021-10-25 5:25 ` [PATCH 9/9] qapi: Extend -compat to set policy for unstable interfaces Markus Armbruster
2021-10-25 19:40 ` John Snow
2021-10-26 18:45 ` Dr. David Alan Gilbert
2021-10-27 5:59 ` Markus Armbruster
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=20211025052532.3859634-4-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=dgilbert@redhat.com \
--cc=eblake@redhat.com \
--cc=ehabkost@redhat.com \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=libguestfs@redhat.com \
--cc=libvir-list@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=mdroth@linux.vnet.ibm.com \
--cc=pbonzini@redhat.com \
--cc=pkrempa@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
/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).