OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qapi: Eliminate QCO_NO_OPTIONS for a slight simplification

Browse Source 
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>
This commit is contained in:
Markus Armbruster 2021-10-28 12:25:14 +02:00
parent 9fb49daabf
commit 9bafe07bc8
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/qapi/qmp/dispatch.h
View File

@ -21,7 +21,6 @@ typedef void (QmpCommandFunc)(QDict *, QObject **, Error **);
typedef enum QmpCommandOptions typedef enum QmpCommandOptions
{ {
QCO_NO_OPTIONS = 0x0,
QCO_NO_SUCCESS_RESP = (1U << 0), QCO_NO_SUCCESS_RESP = (1U << 0),
QCO_ALLOW_OOB = (1U << 1), QCO_ALLOW_OOB = (1U << 1),
QCO_ALLOW_PRECONFIG = (1U << 2), QCO_ALLOW_PRECONFIG = (1U << 2),

3
monitor/misc.c
View File

@ -230,8 +230,7 @@ static void monitor_init_qmp_commands(void)
qmp_init_marshal(&qmp_commands); qmp_init_marshal(&qmp_commands);
qmp_register_command(&qmp_commands, "device_add", qmp_device_add, qmp_register_command(&qmp_commands, "device_add", qmp_device_add, 0);
QCO_NO_OPTIONS);
QTAILQ_INIT(&qmp_cap_negotiation_commands); QTAILQ_INIT(&qmp_cap_negotiation_commands);
qmp_register_command(&qmp_cap_negotiation_commands, "qmp_capabilities", qmp_register_command(&qmp_cap_negotiation_commands, "qmp_capabilities",

5
scripts/qapi/commands.py
View File

@ -229,15 +229,12 @@ def gen_register_command(name: str,
if coroutine: if coroutine:
options += ['QCO_COROUTINE'] options += ['QCO_COROUTINE']
if not options:
options = ['QCO_NO_OPTIONS']
ret = mcgen(''' ret = mcgen('''
qmp_register_command(cmds, "%(name)s", qmp_register_command(cmds, "%(name)s",
qmp_marshal_%(c_name)s, %(opts)s); qmp_marshal_%(c_name)s, %(opts)s);
''', ''',
name=name, c_name=c_name(name), name=name, c_name=c_name(name),
opts=" | ".join(options)) opts=' | '.join(options) or 0)
return ret return ret