<div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Mon, Oct 25, 2021 at 1:25 AM Markus Armbruster <<a href="mailto:armbru@redhat.com">armbru@redhat.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Signed-off-by: Markus Armbruster <<a href="mailto:armbru@redhat.com" target="_blank">armbru@redhat.com</a>><br>
---<br>
include/qapi/qmp/dispatch.h | 1 -<br>
monitor/misc.c | 3 +--<br>
scripts/qapi/commands.py | 5 +----<br>
3 files changed, 2 insertions(+), 7 deletions(-)<br>
<br>
diff --git a/include/qapi/qmp/dispatch.h b/include/qapi/qmp/dispatch.h<br>
index 075203dc67..0ce88200b9 100644<br>
--- a/include/qapi/qmp/dispatch.h<br>
+++ b/include/qapi/qmp/dispatch.h<br>
@@ -21,7 +21,6 @@ typedef void (QmpCommandFunc)(QDict *, QObject **, Error **);<br>
<br>
typedef enum QmpCommandOptions<br>
{<br>
- QCO_NO_OPTIONS = 0x0,<br>
QCO_NO_SUCCESS_RESP = (1U << 0),<br>
QCO_ALLOW_OOB = (1U << 1),<br>
QCO_ALLOW_PRECONFIG = (1U << 2),<br>
diff --git a/monitor/misc.c b/monitor/misc.c<br>
index ffe7966870..3556b177f6 100644<br>
--- a/monitor/misc.c<br>
+++ b/monitor/misc.c<br>
@@ -230,8 +230,7 @@ static void monitor_init_qmp_commands(void)<br>
<br>
qmp_init_marshal(&qmp_commands);<br>
<br>
- qmp_register_command(&qmp_commands, "device_add", qmp_device_add,<br>
- QCO_NO_OPTIONS);<br>
+ qmp_register_command(&qmp_commands, "device_add", qmp_device_add, 0);<br>
<br>
QTAILQ_INIT(&qmp_cap_negotiation_commands);<br>
qmp_register_command(&qmp_cap_negotiation_commands, "qmp_capabilities",<br>
diff --git a/scripts/qapi/commands.py b/scripts/qapi/commands.py<br>
index 3654825968..c8a975528f 100644<br>
--- a/scripts/qapi/commands.py<br>
+++ b/scripts/qapi/commands.py<br>
@@ -229,15 +229,12 @@ def gen_register_command(name: str,<br>
if coroutine:<br>
options += ['QCO_COROUTINE']<br>
<br>
- if not options:<br>
- options = ['QCO_NO_OPTIONS']<br>
-<br>
ret = mcgen('''<br>
qmp_register_command(cmds, "%(name)s",<br>
qmp_marshal_%(c_name)s, %(opts)s);<br>
''',<br>
name=name, c_name=c_name(name),<br>
- opts=" | ".join(options))<br>
+ opts=' | '.join(options) or 0)<br>
return ret<br>
<br>
<br></blockquote></div><div class="gmail_quote"><br></div><div class="gmail_quote">I'm not a big fan of naked constants on the C side, but the generator simplification is nice. I suppose it's worth the trade-off if you like it better this way.<br></div><div class="gmail_quote"><br></div><div class="gmail_quote">"eh".</div><div class="gmail_quote"><br></div><div class="gmail_quote">Reviewed-by: John Snow <<a href="mailto:jsnow@redhat.com">jsnow@redhat.com</a>></div><div class="gmail_quote"><br></div></div>