[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 3/9] qapi: Eliminate QCO_NO_OPTIONS for a slight simplification
From: |
Markus Armbruster |
Subject: |
[PULL 3/9] qapi: Eliminate QCO_NO_OPTIONS for a slight simplification |
Date: |
Fri, 29 Oct 2021 21:30:09 +0200 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-Id: <20211028102520.747396-4-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
- [PULL 0/9] QAPI patches patches for 2021-10-29, Markus Armbruster, 2021/10/29
- [PULL 7/9] qapi: Generalize enum member policy checking, Markus Armbruster, 2021/10/29
- [PULL 3/9] qapi: Eliminate QCO_NO_OPTIONS for a slight simplification,
Markus Armbruster <=
- [PULL 8/9] qapi: Factor out compat_policy_input_ok(), Markus Armbruster, 2021/10/29
- [PULL 1/9] qapi: New special feature flag "unstable", Markus Armbruster, 2021/10/29
- [PULL 5/9] qapi: Generalize struct member policy checking, Markus Armbruster, 2021/10/29
- [PULL 9/9] qapi: Extend -compat to set policy for unstable interfaces, Markus Armbruster, 2021/10/29
- [PULL 2/9] qapi: Mark unstable QMP parts with feature 'unstable', Markus Armbruster, 2021/10/29
- [PULL 4/9] qapi: Tools for sets of special feature flags in generated code, Markus Armbruster, 2021/10/29
- [PULL 6/9] qapi: Generalize command policy checking, Markus Armbruster, 2021/10/29
- Re: [PULL 0/9] QAPI patches patches for 2021-10-29, Richard Henderson, 2021/10/30