* [Qemu-devel] [PATCH v6 00/18] qapi: remove the 'middle' mode
@ 2016-09-12 9:18 Marc-André Lureau
2016-09-12 9:18 ` [Qemu-devel] [PATCH v6 01/18] build-sys: define QEMU_VERSION_{MAJOR, MINOR, MICRO} Marc-André Lureau
` (18 more replies)
0 siblings, 19 replies; 33+ messages in thread
From: Marc-André Lureau @ 2016-09-12 9:18 UTC (permalink / raw)
To: qemu-devel; +Cc: eblake, armbru, Marc-André Lureau
Hi,
Although some QMP commands are still not fully qapi'fied, it is
possible to use more qapi common and generated code by dropping the
'middle' mode and use qmp_dispatch().
v6:
- get back to v4 approach, and unregister commands at run-time. (Markus Armbruster)
- comments and commit messages improvements. (Markus Armbruster)
- remove #ifdef/per-target qapi build. (Markus Armbruster)
v5:
- replace the dynamic unregister commands approach by a few
preliminary patches to make the json schema #ifdef conditional and
per-target
- fix "check invalid arguments" patch based on Markus version
- patch reordering
v4:
- export all marshaller functions (so we can keep calling them after
middle mode is removed), remove 'export-marshal' patch
- get rid of unnecessary lambda in python code (leftover), remove
second mcgen(), and outdated comment
- remove disabled commands at run-time to avoid any regression. It's
now on my TODO list to fix qapi generator in 2.8 to have
conditionals
- move qmp-commands.txt to doc/
- split the last patch, remove trailing ws
- add QEMU_VERSION_{MAJOR,MINOR,MICRO} patch, simplifying
qmp_query_version() (could be applied outside this series)
- update commit title/messages/order
v3:
- add a reference to docs/qmp-spec.txt in qmp_capabilities doc
- remove 'props' from device_add doc, improve example
- replace a g_strcmp0 with more appropriate g_str_equal
- add 'export-marshal' command generator key patch
- call qmp_marshal_query_version() directly (also get rid of the need
to do a make clean, since the qapi json is modified)
- add patch to check invalid arguments on no-args (the old dispatch
code checks that), and a test
- patch reordering to fix intermediate builds
- commit messages improvements
- split some misc doc fixes in last patch
- add some r-b and rebase
v2:
- rebased on master
- add Since: 0.13 to qmp_capabilities and device_add documentation
- fix device_add doc
- add missing spaces after ',' in get_qmp_greeting()
- fix some grammar in monitor.c while touching it
Marc-André Lureau (17):
build-sys: define QEMU_VERSION_{MAJOR, MINOR, MICRO}
qapi-schema: use generated marshaller for 'qmp_capabilities'
qapi-schema: add 'device_add'
monitor: simplify invalid_qmp_mode()
monitor: register gen:false commands manually
qmp: Hack to keep commands configuration-specific
qapi: export the marshallers
monitor: use qmp_find_command() (using generated qapi code)
monitor: implement 'qmp_query_commands' without qmp_cmds
monitor: remove mhandler.cmd_new
qapi: remove the "middle" mode
qapi: check invalid arguments on no-args commands
tests: add a test to check invalid args
monitor: use qmp_dispatch()
build-sys: remove qmp-commands-old.h
qmp-commands.hx: fix some styling
Replace qmp-commands.hx by docs/qmp-commands.txt
Markus Armbruster (1):
qapi: Support unregistering QMP commands
monitor.c | 424 +++-------
qapi/qmp-registry.c | 8 +
qmp.c | 16 +-
tests/test-qga.c | 21 +
tests/test-qmp-commands.c | 15 +
vl.c | 1 +
Makefile | 8 +-
Makefile.target | 7 +-
scripts/create_config | 6 +
scripts/qapi-commands.py | 81 +-
.gitignore | 1 -
MAINTAINERS | 1 -
docs/qapi-code-gen.txt | 6 +-
qmp-commands.hx => docs/qmp-commands.txt | 1297 +-----------------------------
docs/writing-qmp-commands.txt | 46 +-
hmp-commands-info.hx | 118 +--
hmp-commands.hx | 208 ++---
include/qapi/qmp/dispatch.h | 1 +
qapi-schema.json | 61 ++
trace-events | 1 -
20 files changed, 458 insertions(+), 1869 deletions(-)
rename qmp-commands.hx => docs/qmp-commands.txt (81%)
--
2.10.0
^ permalink raw reply [flat|nested] 33+ messages in thread
* [Qemu-devel] [PATCH v6 01/18] build-sys: define QEMU_VERSION_{MAJOR, MINOR, MICRO}
2016-09-12 9:18 [Qemu-devel] [PATCH v6 00/18] qapi: remove the 'middle' mode Marc-André Lureau
@ 2016-09-12 9:18 ` Marc-André Lureau
2016-09-12 20:05 ` Eric Blake
2016-09-12 9:18 ` [Qemu-devel] [PATCH v6 02/18] qapi-schema: use generated marshaller for 'qmp_capabilities' Marc-André Lureau
` (17 subsequent siblings)
18 siblings, 1 reply; 33+ messages in thread
From: Marc-André Lureau @ 2016-09-12 9:18 UTC (permalink / raw)
To: qemu-devel; +Cc: eblake, armbru, Marc-André Lureau
There are better chances to find what went wrong at build time than a
later assert in qmp_query_version
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
qmp.c | 16 +++-------------
scripts/create_config | 6 ++++++
2 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/qmp.c b/qmp.c
index dea8f81..6733463 100644
--- a/qmp.c
+++ b/qmp.c
@@ -51,21 +51,11 @@ NameInfo *qmp_query_name(Error **errp)
VersionInfo *qmp_query_version(Error **errp)
{
VersionInfo *info = g_new0(VersionInfo, 1);
- const char *version = QEMU_VERSION;
- const char *tmp;
- int err;
info->qemu = g_new0(VersionTriple, 1);
- err = qemu_strtoll(version, &tmp, 10, &info->qemu->major);
- assert(err == 0);
- tmp++;
-
- err = qemu_strtoll(tmp, &tmp, 10, &info->qemu->minor);
- assert(err == 0);
- tmp++;
-
- err = qemu_strtoll(tmp, &tmp, 10, &info->qemu->micro);
- assert(err == 0);
+ info->qemu->major = QEMU_VERSION_MAJOR;
+ info->qemu->minor = QEMU_VERSION_MINOR;
+ info->qemu->micro = QEMU_VERSION_MICRO;
info->package = g_strdup(QEMU_PKGVERSION);
return info;
diff --git a/scripts/create_config b/scripts/create_config
index 1dd6a35..e6929dd 100755
--- a/scripts/create_config
+++ b/scripts/create_config
@@ -7,7 +7,13 @@ while read line; do
case $line in
VERSION=*) # configuration
version=${line#*=}
+ major=$(echo "$version" | cut -d. -f1)
+ minor=$(echo "$version" | cut -d. -f2)
+ micro=$(echo "$version" | cut -d. -f3)
echo "#define QEMU_VERSION \"$version\""
+ echo "#define QEMU_VERSION_MAJOR $major"
+ echo "#define QEMU_VERSION_MINOR $minor"
+ echo "#define QEMU_VERSION_MICRO $micro"
;;
qemu_*dir=*) # qemu-specific directory configuration
name=${line%=*}
--
2.10.0
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [Qemu-devel] [PATCH v6 02/18] qapi-schema: use generated marshaller for 'qmp_capabilities'
2016-09-12 9:18 [Qemu-devel] [PATCH v6 00/18] qapi: remove the 'middle' mode Marc-André Lureau
2016-09-12 9:18 ` [Qemu-devel] [PATCH v6 01/18] build-sys: define QEMU_VERSION_{MAJOR, MINOR, MICRO} Marc-André Lureau
@ 2016-09-12 9:18 ` Marc-André Lureau
2016-09-12 9:18 ` [Qemu-devel] [PATCH v6 03/18] qapi-schema: add 'device_add' Marc-André Lureau
` (16 subsequent siblings)
18 siblings, 0 replies; 33+ messages in thread
From: Marc-André Lureau @ 2016-09-12 9:18 UTC (permalink / raw)
To: qemu-devel; +Cc: eblake, armbru, Marc-André Lureau
qapi'fy the 'qmp_capabilities' command, makes the command visible in
query-qmp-schema.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
---
monitor.c | 4 ++--
qapi-schema.json | 21 +++++++++++++++++++++
qmp-commands.hx | 2 +-
3 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/monitor.c b/monitor.c
index 5c00373..991eaf7 100644
--- a/monitor.c
+++ b/monitor.c
@@ -617,7 +617,7 @@ static void monitor_qapi_event_init(void)
qmp_event_set_func_emit(monitor_qapi_event_queue);
}
-static void qmp_capabilities(QDict *params, QObject **ret_data, Error **errp)
+void qmp_qmp_capabilities(Error **errp)
{
cur_mon->qmp.in_command_mode = true;
}
@@ -3656,7 +3656,7 @@ static int monitor_can_read(void *opaque)
static bool invalid_qmp_mode(const Monitor *mon, const mon_cmd_t *cmd,
Error **errp)
{
- bool is_cap = cmd->mhandler.cmd_new == qmp_capabilities;
+ bool is_cap = cmd->mhandler.cmd_new == qmp_marshal_qmp_capabilities;
if (is_cap && mon->qmp.in_command_mode) {
error_set(errp, ERROR_CLASS_COMMAND_NOT_FOUND,
diff --git a/qapi-schema.json b/qapi-schema.json
index c4f3674..5e15d28 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -20,6 +20,27 @@
# QAPI introspection
{ 'include': 'qapi/introspect.json' }
+##
+# @qmp_capabilities:
+#
+# Enable QMP capabilities.
+#
+# Arguments: None.
+#
+# Example:
+#
+# -> { "execute": "qmp_capabilities" }
+# <- { "return": {} }
+#
+# Notes: This command is valid exactly when first connecting: it must be
+# issued before any other command will be accepted, and will fail once the
+# monitor is accepting other commands. (see qemu docs/qmp-spec.txt)
+#
+# Since: 0.13
+#
+##
+{ 'command': 'qmp_capabilities' }
+
##
# @LostTickPolicy:
#
diff --git a/qmp-commands.hx b/qmp-commands.hx
index e6c9193..8a13550 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -2219,7 +2219,7 @@ EQMP
.args_type = "",
.params = "",
.help = "enable QMP capabilities",
- .mhandler.cmd_new = qmp_capabilities,
+ .mhandler.cmd_new = qmp_marshal_qmp_capabilities,
},
SQMP
--
2.10.0
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [Qemu-devel] [PATCH v6 03/18] qapi-schema: add 'device_add'
2016-09-12 9:18 [Qemu-devel] [PATCH v6 00/18] qapi: remove the 'middle' mode Marc-André Lureau
2016-09-12 9:18 ` [Qemu-devel] [PATCH v6 01/18] build-sys: define QEMU_VERSION_{MAJOR, MINOR, MICRO} Marc-André Lureau
2016-09-12 9:18 ` [Qemu-devel] [PATCH v6 02/18] qapi-schema: use generated marshaller for 'qmp_capabilities' Marc-André Lureau
@ 2016-09-12 9:18 ` Marc-André Lureau
2016-09-12 9:18 ` [Qemu-devel] [PATCH v6 04/18] monitor: simplify invalid_qmp_mode() Marc-André Lureau
` (15 subsequent siblings)
18 siblings, 0 replies; 33+ messages in thread
From: Marc-André Lureau @ 2016-09-12 9:18 UTC (permalink / raw)
To: qemu-devel; +Cc: eblake, armbru, Marc-André Lureau
Even though device_add is not fully qapi'fied, we may add it to the json
schema with 'gen': false, so registration and documentation can be
generated.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
qapi-schema.json | 40 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
diff --git a/qapi-schema.json b/qapi-schema.json
index 5e15d28..55f825d 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -2200,6 +2200,46 @@
##
{ 'command': 'xen-set-global-dirty-log', 'data': { 'enable': 'bool' } }
+##
+# @device_add:
+#
+# @driver: the name of the new device's driver
+#
+# @bus: #optional the device's parent bus (device tree path)
+#
+# @id: the device's ID, must be unique
+#
+# Additional arguments depend on the type.
+#
+# Add a device.
+#
+# Notes:
+# 1. For detailed information about this command, please refer to the
+# 'docs/qdev-device-use.txt' file.
+#
+# 2. It's possible to list device properties by running QEMU with the
+# "-device DEVICE,help" command-line argument, where DEVICE is the
+# device's name
+#
+# Example:
+#
+# -> { "execute": "device_add",
+# "arguments": { "driver": "e1000", "id": "net1",
+# "bus": "pci.0",
+# "mac": "52:54:00:12:34:56" } }
+# <- { "return": {} }
+#
+# TODO This command effectively bypasses QAPI completely due to its
+# "additional arguments" business. It shouldn't have been added to
+# the schema in this form. It should be qapified properly, or
+# replaced by a properly qapified command.
+#
+# Since: 0.13
+##
+{ 'command': 'device_add',
+ 'data': {'driver': 'str', 'id': 'str'},
+ 'gen': false } # so we can get the additional arguments
+
##
# @device_del:
#
--
2.10.0
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [Qemu-devel] [PATCH v6 04/18] monitor: simplify invalid_qmp_mode()
2016-09-12 9:18 [Qemu-devel] [PATCH v6 00/18] qapi: remove the 'middle' mode Marc-André Lureau
` (2 preceding siblings ...)
2016-09-12 9:18 ` [Qemu-devel] [PATCH v6 03/18] qapi-schema: add 'device_add' Marc-André Lureau
@ 2016-09-12 9:18 ` Marc-André Lureau
2016-09-12 9:19 ` [Qemu-devel] [PATCH v6 05/18] monitor: register gen:false commands manually Marc-André Lureau
` (14 subsequent siblings)
18 siblings, 0 replies; 33+ messages in thread
From: Marc-André Lureau @ 2016-09-12 9:18 UTC (permalink / raw)
To: qemu-devel; +Cc: eblake, armbru, Marc-André Lureau
handle_qmp_command() will switch to use qmp_dispatch(). It won't have a
pointer to the marshaller function anymore, but only the name of the
command to invoke. Simplify invalid_qmp_mode() so it can just be called
with the command name.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
monitor.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/monitor.c b/monitor.c
index 991eaf7..e156026 100644
--- a/monitor.c
+++ b/monitor.c
@@ -3653,21 +3653,21 @@ static int monitor_can_read(void *opaque)
return (mon->suspend_cnt == 0) ? 1 : 0;
}
-static bool invalid_qmp_mode(const Monitor *mon, const mon_cmd_t *cmd,
+static bool invalid_qmp_mode(const Monitor *mon, const char *cmd,
Error **errp)
{
- bool is_cap = cmd->mhandler.cmd_new == qmp_marshal_qmp_capabilities;
+ bool is_cap = g_str_equal(cmd, "qmp_capabilities");
if (is_cap && mon->qmp.in_command_mode) {
error_set(errp, ERROR_CLASS_COMMAND_NOT_FOUND,
"Capabilities negotiation is already complete, command "
- "'%s' ignored", cmd->name);
+ "'%s' ignored", cmd);
return true;
}
if (!is_cap && !mon->qmp.in_command_mode) {
error_set(errp, ERROR_CLASS_COMMAND_NOT_FOUND,
"Expecting capabilities negotiation with "
- "'qmp_capabilities' before command '%s'", cmd->name);
+ "'qmp_capabilities' before command '%s'", cmd);
return true;
}
return false;
@@ -3958,7 +3958,7 @@ static void handle_qmp_command(JSONMessageParser *parser, GQueue *tokens)
"The command %s has not been found", cmd_name);
goto err_out;
}
- if (invalid_qmp_mode(mon, cmd, &local_err)) {
+ if (invalid_qmp_mode(mon, cmd_name, &local_err)) {
goto err_out;
}
--
2.10.0
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [Qemu-devel] [PATCH v6 05/18] monitor: register gen:false commands manually
2016-09-12 9:18 [Qemu-devel] [PATCH v6 00/18] qapi: remove the 'middle' mode Marc-André Lureau
` (3 preceding siblings ...)
2016-09-12 9:18 ` [Qemu-devel] [PATCH v6 04/18] monitor: simplify invalid_qmp_mode() Marc-André Lureau
@ 2016-09-12 9:19 ` Marc-André Lureau
2016-09-12 9:19 ` [Qemu-devel] [PATCH v6 06/18] qapi: Support unregistering QMP commands Marc-André Lureau
` (13 subsequent siblings)
18 siblings, 0 replies; 33+ messages in thread
From: Marc-André Lureau @ 2016-09-12 9:19 UTC (permalink / raw)
To: qemu-devel; +Cc: eblake, armbru, Marc-André Lureau
Since a few commands are using 'gen': false, they are not registered
automatically by the generator. Register manually instead.
This is in preparation for removal of qapi 'middle' mode generation.
Note that qmp_init_marshal() function isn't run yet, so the commands
aren't actually registered, until module_call_init(MODULE_INIT_QAPI) is
added in a later patch.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
monitor.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/monitor.c b/monitor.c
index e156026..b7ae552 100644
--- a/monitor.c
+++ b/monitor.c
@@ -79,6 +79,7 @@
#include "sysemu/block-backend.h"
#include "sysemu/qtest.h"
#include "qemu/cutils.h"
+#include "qapi/qmp/dispatch.h"
/* for hmp_info_irq/pic */
#if defined(TARGET_SPARC)
@@ -1007,6 +1008,18 @@ static void qmp_query_qmp_schema(QDict *qdict, QObject **ret_data,
*ret_data = qobject_from_json(qmp_schema_json);
}
+static void qmp_init_marshal(void)
+{
+ qmp_register_command("query-qmp-schema", qmp_query_qmp_schema,
+ QCO_NO_OPTIONS);
+ qmp_register_command("device_add", qmp_device_add,
+ QCO_NO_OPTIONS);
+ qmp_register_command("netdev_add", qmp_netdev_add,
+ QCO_NO_OPTIONS);
+}
+
+qapi_init(qmp_init_marshal);
+
/* set the current CPU defined by the user */
int monitor_set_cpu(int cpu_index)
{
--
2.10.0
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [Qemu-devel] [PATCH v6 06/18] qapi: Support unregistering QMP commands
2016-09-12 9:18 [Qemu-devel] [PATCH v6 00/18] qapi: remove the 'middle' mode Marc-André Lureau
` (4 preceding siblings ...)
2016-09-12 9:19 ` [Qemu-devel] [PATCH v6 05/18] monitor: register gen:false commands manually Marc-André Lureau
@ 2016-09-12 9:19 ` Marc-André Lureau
2016-09-12 9:19 ` [Qemu-devel] [PATCH v6 07/18] qmp: Hack to keep commands configuration-specific Marc-André Lureau
` (12 subsequent siblings)
18 siblings, 0 replies; 33+ messages in thread
From: Marc-André Lureau @ 2016-09-12 9:19 UTC (permalink / raw)
To: qemu-devel; +Cc: eblake, armbru
From: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
qapi/qmp-registry.c | 8 ++++++++
include/qapi/qmp/dispatch.h | 1 +
2 files changed, 9 insertions(+)
diff --git a/qapi/qmp-registry.c b/qapi/qmp-registry.c
index 68b24c9..e805368 100644
--- a/qapi/qmp-registry.c
+++ b/qapi/qmp-registry.c
@@ -30,6 +30,14 @@ void qmp_register_command(const char *name, QmpCommandFunc *fn,
QTAILQ_INSERT_TAIL(&qmp_commands, cmd, node);
}
+void qmp_unregister_command(const char *name)
+{
+ QmpCommand *cmd = qmp_find_command(name);
+
+ QTAILQ_REMOVE(&qmp_commands, cmd, node);
+ g_free(cmd);
+}
+
QmpCommand *qmp_find_command(const char *name)
{
QmpCommand *cmd;
diff --git a/include/qapi/qmp/dispatch.h b/include/qapi/qmp/dispatch.h
index 48c11b6..57651ea 100644
--- a/include/qapi/qmp/dispatch.h
+++ b/include/qapi/qmp/dispatch.h
@@ -36,6 +36,7 @@ typedef struct QmpCommand
void qmp_register_command(const char *name, QmpCommandFunc *fn,
QmpCommandOptions options);
+void qmp_unregister_command(const char *name);
QmpCommand *qmp_find_command(const char *name);
QObject *qmp_dispatch(QObject *request);
void qmp_disable_command(const char *name);
--
2.10.0
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [Qemu-devel] [PATCH v6 07/18] qmp: Hack to keep commands configuration-specific
2016-09-12 9:18 [Qemu-devel] [PATCH v6 00/18] qapi: remove the 'middle' mode Marc-André Lureau
` (5 preceding siblings ...)
2016-09-12 9:19 ` [Qemu-devel] [PATCH v6 06/18] qapi: Support unregistering QMP commands Marc-André Lureau
@ 2016-09-12 9:19 ` Marc-André Lureau
2016-09-12 9:19 ` [Qemu-devel] [PATCH v6 08/18] qapi: export the marshallers Marc-André Lureau
` (11 subsequent siblings)
18 siblings, 0 replies; 33+ messages in thread
From: Marc-André Lureau @ 2016-09-12 9:19 UTC (permalink / raw)
To: qemu-devel; +Cc: eblake, armbru, Marc-André Lureau
We currently define QMP commands in two places: the QAPI schema and
qmp-commands.hx. The latter is preprocessed, the former is not. We
use the preprocessor to suppress configuration-specific commands. For
instance, query-spice is only available #ifdef CONFIG_SPICE.
QMP command dispatch and query-commands use the qmp-commands.hx
definition, and thus obey the #ifdeffery there. Good, because it lets
QMP clients probe for available features more easily.
query-qmp-schema uses the QAPI schema, and thus lists the
configuration-specific commands even when they're unavailable. Not so
good.
We're about to flip command dispatch and query-commands to the
non-middle-mode command registry, which uses the QAPI schema, so we
can ditch qmp-commands.hx. To avoid regressing query-commands,
arrange for commands that are suppressed with the preprocessor now to
be unregistered with that registry. This will keep them unavailable
and out of query-commands when we flip command dispatch and
query-commands to that registry, exactly as before.
This is a hack. The proper solution is to support
configuration-specific commands in the QAPI schema. Mark it FIXME.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
monitor.c | 35 +++++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
diff --git a/monitor.c b/monitor.c
index b7ae552..18d37f7 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1008,6 +1008,38 @@ static void qmp_query_qmp_schema(QDict *qdict, QObject **ret_data,
*ret_data = qobject_from_json(qmp_schema_json);
}
+/*
+ * Note: right now, this function is never called. It will be called
+ * shortly when we stop using QAPI 'middle mode'. The rest of this
+ * comment is written as if that was the case already.
+ *
+ * We used to define commands in qmp-commands.hx in addition to the
+ * QAPI schema. This permitted defining some of them only in certain
+ * configurations. query-commands has always reflected that (good,
+ * because it lets QMP clients figure out what's actually available),
+ * while query-qmp-schema never did (not so good). This function is a
+ * hack to keep the configuration-specific commands defined exactly as
+ * before, even though qmp-commands.hx is gone.
+ *
+ * FIXME Educate the QAPI schema on configuration-specific commands,
+ * and drop this hack.
+ */
+static void qmp_unregister_commands_hack(void)
+{
+#ifndef CONFIG_SPICE
+ qmp_unregister_command("query-spice");
+#endif
+#ifndef TARGET_I386
+ qmp_unregister_command("rtc-reset-reinjection");
+#endif
+#ifndef TARGET_S390X
+ qmp_unregister_command("dump-skeys");
+#endif
+#ifndef TARGET_ARM
+ qmp_unregister_command("query-gic-capabilities");
+#endif
+}
+
static void qmp_init_marshal(void)
{
qmp_register_command("query-qmp-schema", qmp_query_qmp_schema,
@@ -1016,6 +1048,9 @@ static void qmp_init_marshal(void)
QCO_NO_OPTIONS);
qmp_register_command("netdev_add", qmp_netdev_add,
QCO_NO_OPTIONS);
+
+ /* call it after the rest of qapi_init() */
+ register_module_init(qmp_unregister_commands_hack, MODULE_INIT_QAPI);
}
qapi_init(qmp_init_marshal);
--
2.10.0
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [Qemu-devel] [PATCH v6 08/18] qapi: export the marshallers
2016-09-12 9:18 [Qemu-devel] [PATCH v6 00/18] qapi: remove the 'middle' mode Marc-André Lureau
` (6 preceding siblings ...)
2016-09-12 9:19 ` [Qemu-devel] [PATCH v6 07/18] qmp: Hack to keep commands configuration-specific Marc-André Lureau
@ 2016-09-12 9:19 ` Marc-André Lureau
2016-09-12 9:19 ` [Qemu-devel] [PATCH v6 09/18] monitor: use qmp_find_command() (using generated qapi code) Marc-André Lureau
` (10 subsequent siblings)
18 siblings, 0 replies; 33+ messages in thread
From: Marc-André Lureau @ 2016-09-12 9:19 UTC (permalink / raw)
To: qemu-devel; +Cc: eblake, armbru, Marc-André Lureau
Make it possible to call marshallers manually, without going through
qmp_dispatch(). (this is currently only possible in middle-mode, but
it's also useful in general)
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
scripts/qapi-commands.py | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py
index a06a2c4..b150db9 100644
--- a/scripts/qapi-commands.py
+++ b/scripts/qapi-commands.py
@@ -84,10 +84,7 @@ static void qmp_marshal_output_%(c_name)s(%(c_type)s ret_in, QObject **ret_out,
def gen_marshal_proto(name):
- ret = 'void qmp_marshal_%s(QDict *args, QObject **ret, Error **errp)' % c_name(name)
- if not middle_mode:
- ret = 'static ' + ret
- return ret
+ return 'void qmp_marshal_%s(QDict *args, QObject **ret, Error **errp)' % c_name(name)
def gen_marshal_decl(name):
@@ -222,8 +219,7 @@ class QAPISchemaGenCommandVisitor(QAPISchemaVisitor):
if ret_type and ret_type not in self._visited_ret_types:
self._visited_ret_types.add(ret_type)
self.defn += gen_marshal_output(ret_type)
- if middle_mode:
- self.decl += gen_marshal_decl(name)
+ self.decl += gen_marshal_decl(name)
self.defn += gen_marshal(name, arg_type, boxed, ret_type)
if not middle_mode:
self._regy += gen_register_command(name, success_response)
--
2.10.0
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [Qemu-devel] [PATCH v6 09/18] monitor: use qmp_find_command() (using generated qapi code)
2016-09-12 9:18 [Qemu-devel] [PATCH v6 00/18] qapi: remove the 'middle' mode Marc-André Lureau
` (7 preceding siblings ...)
2016-09-12 9:19 ` [Qemu-devel] [PATCH v6 08/18] qapi: export the marshallers Marc-André Lureau
@ 2016-09-12 9:19 ` Marc-André Lureau
2016-09-12 9:19 ` [Qemu-devel] [PATCH v6 10/18] monitor: implement 'qmp_query_commands' without qmp_cmds Marc-André Lureau
` (9 subsequent siblings)
18 siblings, 0 replies; 33+ messages in thread
From: Marc-André Lureau @ 2016-09-12 9:19 UTC (permalink / raw)
To: qemu-devel; +Cc: eblake, armbru, Marc-André Lureau
Stop using the so-called 'middle' mode. Instead, use qmp_find_command()
from generated qapi commands registry. Update and fix the documentation
too.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
monitor.c | 14 ++--
vl.c | 1 +
Makefile | 2 +-
docs/writing-qmp-commands.txt | 8 +--
qmp-commands.hx | 146 ------------------------------------------
5 files changed, 11 insertions(+), 160 deletions(-)
diff --git a/monitor.c b/monitor.c
index 18d37f7..6e0ae81 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1009,10 +1009,6 @@ static void qmp_query_qmp_schema(QDict *qdict, QObject **ret_data,
}
/*
- * Note: right now, this function is never called. It will be called
- * shortly when we stop using QAPI 'middle mode'. The rest of this
- * comment is written as if that was the case already.
- *
* We used to define commands in qmp-commands.hx in addition to the
* QAPI schema. This permitted defining some of them only in certain
* configurations. query-commands has always reflected that (good,
@@ -3976,6 +3972,7 @@ static void handle_qmp_command(JSONMessageParser *parser, GQueue *tokens)
QObject *obj, *data;
QDict *input, *args;
const mon_cmd_t *cmd;
+ QmpCommand *qcmd;
const char *cmd_name;
Monitor *mon = cur_mon;
@@ -4001,7 +3998,8 @@ static void handle_qmp_command(JSONMessageParser *parser, GQueue *tokens)
cmd_name = qdict_get_str(input, "execute");
trace_handle_qmp_command(mon, cmd_name);
cmd = qmp_find_cmd(cmd_name);
- if (!cmd) {
+ qcmd = qmp_find_command(cmd_name);
+ if (!qcmd || !cmd) {
error_set(&local_err, ERROR_CLASS_COMMAND_NOT_FOUND,
"The command %s has not been found", cmd_name);
goto err_out;
@@ -4023,7 +4021,7 @@ static void handle_qmp_command(JSONMessageParser *parser, GQueue *tokens)
goto err_out;
}
- cmd->mhandler.cmd_new(args, &data, &local_err);
+ qcmd->fn(args, &data, &local_err);
err_out:
monitor_protocol_emitter(mon, data, local_err);
@@ -4095,7 +4093,9 @@ static QObject *get_qmp_greeting(void)
QObject *ver = NULL;
qmp_marshal_query_version(NULL, &ver, NULL);
- return qobject_from_jsonf("{'QMP':{'version': %p,'capabilities': []}}",ver);
+
+ return qobject_from_jsonf("{'QMP': {'version': %p, 'capabilities': []}}",
+ ver);
}
static void monitor_qmp_event(void *opaque, int event)
diff --git a/vl.c b/vl.c
index ee557a1..a256a47 100644
--- a/vl.c
+++ b/vl.c
@@ -2986,6 +2986,7 @@ int main(int argc, char **argv, char **envp)
qemu_init_exec_dir(argv[0]);
module_call_init(MODULE_INIT_QOM);
+ module_call_init(MODULE_INIT_QAPI);
qemu_add_opts(&qemu_drive_opts);
qemu_add_drive_opts(&qemu_legacy_drive_opts);
diff --git a/Makefile b/Makefile
index 50b4b3a..d8a2891 100644
--- a/Makefile
+++ b/Makefile
@@ -312,7 +312,7 @@ $(qapi-modules) $(SRC_PATH)/scripts/qapi-event.py $(qapi-py)
qmp-commands.h qmp-marshal.c :\
$(qapi-modules) $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py)
$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py \
- $(gen-out-type) -o "." -m $<, \
+ $(gen-out-type) -o "." $<, \
" GEN $@")
qmp-introspect.h qmp-introspect.c :\
$(qapi-modules) $(SRC_PATH)/scripts/qapi-introspect.py $(qapi-py)
diff --git a/docs/writing-qmp-commands.txt b/docs/writing-qmp-commands.txt
index 59aa77a..0a66e0e 100644
--- a/docs/writing-qmp-commands.txt
+++ b/docs/writing-qmp-commands.txt
@@ -127,7 +127,6 @@ following at the bottom:
{
.name = "hello-world",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_hello_world,
},
You're done. Now build qemu, run it as suggested in the "Testing" section,
@@ -179,7 +178,6 @@ The last step is to update the qmp-commands.hx file:
{
.name = "hello-world",
.args_type = "message:s?",
- .mhandler.cmd_new = qmp_marshal_hello_world,
},
Notice that the "args_type" member got our "message" argument. The character
@@ -454,12 +452,11 @@ There are a number of things to be noticed:
6. You have to include the "qmp-commands.h" header file in qemu-timer.c,
otherwise qemu won't build
-The last step is to add the correspoding entry in the qmp-commands.hx file:
+The last step is to add the corresponding entry in the qmp-commands.hx file:
{
.name = "query-alarm-clock",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_query_alarm_clock,
},
Time to test the new command. Build qemu, run it as described in the "Testing"
@@ -518,7 +515,7 @@ in the monitor.c file. The entry for the "info alarmclock" follows:
.args_type = "",
.params = "",
.help = "show information about the alarm clock",
- .mhandler.info = hmp_info_alarm_clock,
+ .mhandler.cmd = hmp_info_alarm_clock,
},
To test this, run qemu and type "info alarmclock" in the user monitor.
@@ -605,7 +602,6 @@ To test this you have to add the corresponding qmp-commands.hx entry:
{
.name = "query-alarm-methods",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_query_alarm_methods,
},
Now Build qemu, run it as explained in the "Testing" section and try our new
diff --git a/qmp-commands.hx b/qmp-commands.hx
index 8a13550..734f3d7 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -63,7 +63,6 @@ EQMP
{
.name = "quit",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_quit,
},
SQMP
@@ -84,7 +83,6 @@ EQMP
{
.name = "eject",
.args_type = "force:-f,device:B",
- .mhandler.cmd_new = qmp_marshal_eject,
},
SQMP
@@ -110,7 +108,6 @@ EQMP
{
.name = "change",
.args_type = "device:B,target:F,arg:s?",
- .mhandler.cmd_new = qmp_marshal_change,
},
SQMP
@@ -146,7 +143,6 @@ EQMP
{
.name = "screendump",
.args_type = "filename:F",
- .mhandler.cmd_new = qmp_marshal_screendump,
},
SQMP
@@ -169,7 +165,6 @@ EQMP
{
.name = "stop",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_stop,
},
SQMP
@@ -190,7 +185,6 @@ EQMP
{
.name = "cont",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_cont,
},
SQMP
@@ -211,7 +205,6 @@ EQMP
{
.name = "system_wakeup",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_system_wakeup,
},
SQMP
@@ -232,7 +225,6 @@ EQMP
{
.name = "system_reset",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_system_reset,
},
SQMP
@@ -253,7 +245,6 @@ EQMP
{
.name = "system_powerdown",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_system_powerdown,
},
SQMP
@@ -276,7 +267,6 @@ EQMP
.args_type = "device:O",
.params = "driver[,prop=value][,...]",
.help = "add device, like -device on the command line",
- .mhandler.cmd_new = qmp_device_add,
},
SQMP
@@ -310,7 +300,6 @@ EQMP
{
.name = "device_del",
.args_type = "id:s",
- .mhandler.cmd_new = qmp_marshal_device_del,
},
SQMP
@@ -338,7 +327,6 @@ EQMP
{
.name = "send-key",
.args_type = "keys:q,hold-time:i?",
- .mhandler.cmd_new = qmp_marshal_send_key,
},
SQMP
@@ -369,7 +357,6 @@ EQMP
{
.name = "cpu",
.args_type = "index:i",
- .mhandler.cmd_new = qmp_marshal_cpu,
},
SQMP
@@ -394,7 +381,6 @@ EQMP
{
.name = "cpu-add",
.args_type = "id:i",
- .mhandler.cmd_new = qmp_marshal_cpu_add,
},
SQMP
@@ -417,7 +403,6 @@ EQMP
{
.name = "memsave",
.args_type = "val:l,size:i,filename:s,cpu:i?",
- .mhandler.cmd_new = qmp_marshal_memsave,
},
SQMP
@@ -446,7 +431,6 @@ EQMP
{
.name = "pmemsave",
.args_type = "val:l,size:i,filename:s",
- .mhandler.cmd_new = qmp_marshal_pmemsave,
},
SQMP
@@ -474,7 +458,6 @@ EQMP
{
.name = "inject-nmi",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_inject_nmi,
},
SQMP
@@ -497,7 +480,6 @@ EQMP
{
.name = "ringbuf-write",
.args_type = "device:s,data:s,format:s?",
- .mhandler.cmd_new = qmp_marshal_ringbuf_write,
},
SQMP
@@ -526,7 +508,6 @@ EQMP
{
.name = "ringbuf-read",
.args_type = "device:s,size:i,format:s?",
- .mhandler.cmd_new = qmp_marshal_ringbuf_read,
},
SQMP
@@ -562,7 +543,6 @@ EQMP
{
.name = "xen-save-devices-state",
.args_type = "filename:F",
- .mhandler.cmd_new = qmp_marshal_xen_save_devices_state,
},
SQMP
@@ -589,7 +569,6 @@ EQMP
{
.name = "xen-load-devices-state",
.args_type = "filename:F",
- .mhandler.cmd_new = qmp_marshal_xen_load_devices_state,
},
SQMP
@@ -616,7 +595,6 @@ EQMP
{
.name = "xen-set-global-dirty-log",
.args_type = "enable:b",
- .mhandler.cmd_new = qmp_marshal_xen_set_global_dirty_log,
},
SQMP
@@ -640,7 +618,6 @@ EQMP
{
.name = "migrate",
.args_type = "detach:-d,blk:-b,inc:-i,uri:s",
- .mhandler.cmd_new = qmp_marshal_migrate,
},
SQMP
@@ -673,7 +650,6 @@ EQMP
{
.name = "migrate_cancel",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_migrate_cancel,
},
SQMP
@@ -694,7 +670,6 @@ EQMP
{
.name = "migrate-incoming",
.args_type = "uri:s",
- .mhandler.cmd_new = qmp_marshal_migrate_incoming,
},
SQMP
@@ -722,7 +697,6 @@ EQMP
{
.name = "migrate-set-cache-size",
.args_type = "value:o",
- .mhandler.cmd_new = qmp_marshal_migrate_set_cache_size,
},
SQMP
@@ -745,7 +719,6 @@ EQMP
{
.name = "migrate-start-postcopy",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_migrate_start_postcopy,
},
SQMP
@@ -764,7 +737,6 @@ EQMP
{
.name = "query-migrate-cache-size",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_query_migrate_cache_size,
},
SQMP
@@ -786,7 +758,6 @@ EQMP
{
.name = "migrate_set_speed",
.args_type = "value:o",
- .mhandler.cmd_new = qmp_marshal_migrate_set_speed,
},
SQMP
@@ -809,7 +780,6 @@ EQMP
{
.name = "migrate_set_downtime",
.args_type = "value:T",
- .mhandler.cmd_new = qmp_marshal_migrate_set_downtime,
},
SQMP
@@ -834,7 +804,6 @@ EQMP
.args_type = "protocol:s,hostname:s,port:i?,tls-port:i?,cert-subject:s?",
.params = "protocol hostname port tls-port cert-subject",
.help = "set migration information for remote display",
- .mhandler.cmd_new = qmp_marshal_client_migrate_info,
},
SQMP
@@ -868,7 +837,6 @@ EQMP
.args_type = "paging:b,protocol:s,detach:b?,begin:i?,end:i?,format:s?",
.params = "-p protocol [-d] [begin] [length] [format]",
.help = "dump guest memory to file",
- .mhandler.cmd_new = qmp_marshal_dump_guest_memory,
},
SQMP
@@ -907,7 +875,6 @@ EQMP
{
.name = "query-dump-guest-memory-capability",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_query_dump_guest_memory_capability,
},
SQMP
@@ -929,7 +896,6 @@ EQMP
.args_type = "",
.params = "",
.help = "query background dump status",
- .mhandler.cmd_new = qmp_marshal_query_dump,
},
SQMP
@@ -952,7 +918,6 @@ EQMP
{
.name = "dump-skeys",
.args_type = "filename:F",
- .mhandler.cmd_new = qmp_marshal_dump_skeys,
},
#endif
@@ -976,7 +941,6 @@ EQMP
{
.name = "netdev_add",
.args_type = "netdev:O",
- .mhandler.cmd_new = qmp_netdev_add,
},
SQMP
@@ -1007,7 +971,6 @@ EQMP
{
.name = "netdev_del",
.args_type = "id:s",
- .mhandler.cmd_new = qmp_marshal_netdev_del,
},
SQMP
@@ -1031,7 +994,6 @@ EQMP
{
.name = "object-add",
.args_type = "qom-type:s,id:s,props:q?",
- .mhandler.cmd_new = qmp_marshal_object_add,
},
SQMP
@@ -1057,7 +1019,6 @@ EQMP
{
.name = "object-del",
.args_type = "id:s",
- .mhandler.cmd_new = qmp_marshal_object_del,
},
SQMP
@@ -1082,7 +1043,6 @@ EQMP
{
.name = "block_resize",
.args_type = "device:s?,node-name:s?,size:o",
- .mhandler.cmd_new = qmp_marshal_block_resize,
},
SQMP
@@ -1107,7 +1067,6 @@ EQMP
{
.name = "block-stream",
.args_type = "job-id:s?,device:B,base:s?,speed:o?,backing-file:s?,on-error:s?",
- .mhandler.cmd_new = qmp_marshal_block_stream,
},
SQMP
@@ -1152,7 +1111,6 @@ EQMP
{
.name = "block-commit",
.args_type = "job-id:s?,device:B,base:s?,top:s?,backing-file:s?,speed:o?",
- .mhandler.cmd_new = qmp_marshal_block_commit,
},
SQMP
@@ -1219,7 +1177,6 @@ EQMP
.args_type = "job-id:s?,sync:s,device:B,target:s,speed:i?,mode:s?,"
"format:s?,bitmap:s?,compress:b?,"
"on-source-error:s?,on-target-error:s?",
- .mhandler.cmd_new = qmp_marshal_drive_backup,
},
SQMP
@@ -1277,7 +1234,6 @@ EQMP
.name = "blockdev-backup",
.args_type = "job-id:s?,sync:s,device:B,target:B,speed:i?,compress:b?,"
"on-source-error:s?,on-target-error:s?",
- .mhandler.cmd_new = qmp_marshal_blockdev_backup,
},
SQMP
@@ -1321,33 +1277,27 @@ EQMP
{
.name = "block-job-set-speed",
.args_type = "device:B,speed:o",
- .mhandler.cmd_new = qmp_marshal_block_job_set_speed,
},
{
.name = "block-job-cancel",
.args_type = "device:B,force:b?",
- .mhandler.cmd_new = qmp_marshal_block_job_cancel,
},
{
.name = "block-job-pause",
.args_type = "device:B",
- .mhandler.cmd_new = qmp_marshal_block_job_pause,
},
{
.name = "block-job-resume",
.args_type = "device:B",
- .mhandler.cmd_new = qmp_marshal_block_job_resume,
},
{
.name = "block-job-complete",
.args_type = "device:B",
- .mhandler.cmd_new = qmp_marshal_block_job_complete,
},
{
.name = "transaction",
.args_type = "actions:q,properties:q?",
- .mhandler.cmd_new = qmp_marshal_transaction,
},
SQMP
@@ -1442,7 +1392,6 @@ EQMP
{
.name = "block-dirty-bitmap-add",
.args_type = "node:B,name:s,granularity:i?",
- .mhandler.cmd_new = qmp_marshal_block_dirty_bitmap_add,
},
SQMP
@@ -1470,7 +1419,6 @@ EQMP
{
.name = "block-dirty-bitmap-remove",
.args_type = "node:B,name:s",
- .mhandler.cmd_new = qmp_marshal_block_dirty_bitmap_remove,
},
SQMP
@@ -1498,7 +1446,6 @@ EQMP
{
.name = "block-dirty-bitmap-clear",
.args_type = "node:B,name:s",
- .mhandler.cmd_new = qmp_marshal_block_dirty_bitmap_clear,
},
SQMP
@@ -1527,7 +1474,6 @@ EQMP
{
.name = "blockdev-snapshot-sync",
.args_type = "device:s?,node-name:s?,snapshot-file:s,snapshot-node-name:s?,format:s?,mode:s?",
- .mhandler.cmd_new = qmp_marshal_blockdev_snapshot_sync,
},
SQMP
@@ -1563,7 +1509,6 @@ EQMP
{
.name = "blockdev-snapshot",
.args_type = "node:s,overlay:s",
- .mhandler.cmd_new = qmp_marshal_blockdev_snapshot,
},
SQMP
@@ -1601,7 +1546,6 @@ EQMP
{
.name = "blockdev-snapshot-internal-sync",
.args_type = "device:B,name:s",
- .mhandler.cmd_new = qmp_marshal_blockdev_snapshot_internal_sync,
},
SQMP
@@ -1631,8 +1575,6 @@ EQMP
{
.name = "blockdev-snapshot-delete-internal-sync",
.args_type = "device:B,id:s?,name:s?",
- .mhandler.cmd_new =
- qmp_marshal_blockdev_snapshot_delete_internal_sync,
},
SQMP
@@ -1676,7 +1618,6 @@ EQMP
"on-source-error:s?,on-target-error:s?,"
"unmap:b?,"
"granularity:i?,buf-size:i?",
- .mhandler.cmd_new = qmp_marshal_drive_mirror,
},
SQMP
@@ -1741,7 +1682,6 @@ EQMP
.args_type = "job-id:s?,sync:s,device:B,target:B,replaces:s?,speed:i?,"
"on-source-error:s?,on-target-error:s?,"
"granularity:i?,buf-size:i?",
- .mhandler.cmd_new = qmp_marshal_blockdev_mirror,
},
SQMP
@@ -1790,7 +1730,6 @@ EQMP
{
.name = "change-backing-file",
.args_type = "device:s,image-node-name:s,backing-file:s",
- .mhandler.cmd_new = qmp_marshal_change_backing_file,
},
SQMP
@@ -1830,7 +1769,6 @@ EQMP
{
.name = "balloon",
.args_type = "value:M",
- .mhandler.cmd_new = qmp_marshal_balloon,
},
SQMP
@@ -1853,7 +1791,6 @@ EQMP
{
.name = "set_link",
.args_type = "name:s,up:b",
- .mhandler.cmd_new = qmp_marshal_set_link,
},
SQMP
@@ -1879,7 +1816,6 @@ EQMP
.args_type = "fdname:s",
.params = "getfd name",
.help = "receive a file descriptor via SCM rights and assign it a name",
- .mhandler.cmd_new = qmp_marshal_getfd,
},
SQMP
@@ -1912,7 +1848,6 @@ EQMP
.args_type = "fdname:s",
.params = "closefd name",
.help = "close a file descriptor previously passed via SCM rights",
- .mhandler.cmd_new = qmp_marshal_closefd,
},
SQMP
@@ -1937,7 +1872,6 @@ EQMP
.args_type = "fdset-id:i?,opaque:s?",
.params = "add-fd fdset-id opaque",
.help = "Add a file descriptor, that was passed via SCM rights, to an fd set",
- .mhandler.cmd_new = qmp_marshal_add_fd,
},
SQMP
@@ -1976,7 +1910,6 @@ EQMP
.args_type = "fdset-id:i,fd:i?",
.params = "remove-fd fdset-id fd",
.help = "Remove a file descriptor from an fd set",
- .mhandler.cmd_new = qmp_marshal_remove_fd,
},
SQMP
@@ -2008,7 +1941,6 @@ EQMP
.name = "query-fdsets",
.args_type = "",
.help = "Return information describing all fd sets",
- .mhandler.cmd_new = qmp_marshal_query_fdsets,
},
SQMP
@@ -2057,7 +1989,6 @@ EQMP
{
.name = "block_passwd",
.args_type = "device:s?,node-name:s?,password:s",
- .mhandler.cmd_new = qmp_marshal_block_passwd,
},
SQMP
@@ -2083,7 +2014,6 @@ EQMP
{
.name = "block_set_io_throttle",
.args_type = "device:B,bps:l,bps_rd:l,bps_wr:l,iops:l,iops_rd:l,iops_wr:l,bps_max:l?,bps_rd_max:l?,bps_wr_max:l?,iops_max:l?,iops_rd_max:l?,iops_wr_max:l?,bps_max_length:l?,bps_rd_max_length:l?,bps_wr_max_length:l?,iops_max_length:l?,iops_rd_max_length:l?,iops_wr_max_length:l?,iops_size:l?,group:s?",
- .mhandler.cmd_new = qmp_marshal_block_set_io_throttle,
},
SQMP
@@ -2140,7 +2070,6 @@ EQMP
{
.name = "set_password",
.args_type = "protocol:s,password:s,connected:s?",
- .mhandler.cmd_new = qmp_marshal_set_password,
},
SQMP
@@ -2166,7 +2095,6 @@ EQMP
{
.name = "expire_password",
.args_type = "protocol:s,time:s",
- .mhandler.cmd_new = qmp_marshal_expire_password,
},
SQMP
@@ -2191,7 +2119,6 @@ EQMP
{
.name = "add_client",
.args_type = "protocol:s,fdname:s,skipauth:b?,tls:b?",
- .mhandler.cmd_new = qmp_marshal_add_client,
},
SQMP
@@ -2219,7 +2146,6 @@ EQMP
.args_type = "",
.params = "",
.help = "enable QMP capabilities",
- .mhandler.cmd_new = qmp_marshal_qmp_capabilities,
},
SQMP
@@ -2242,7 +2168,6 @@ EQMP
{
.name = "human-monitor-command",
.args_type = "command-line:s,cpu-index:i?",
- .mhandler.cmd_new = qmp_marshal_human_monitor_command,
},
SQMP
@@ -2321,7 +2246,6 @@ EQMP
{
.name = "query-version",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_query_version,
},
SQMP
@@ -2358,7 +2282,6 @@ EQMP
{
.name = "query-commands",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_query_commands,
},
SQMP
@@ -2395,7 +2318,6 @@ EQMP
{
.name = "query-events",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_query_events,
},
SQMP
@@ -2412,7 +2334,6 @@ EQMP
{
.name = "query-qmp-schema",
.args_type = "",
- .mhandler.cmd_new = qmp_query_qmp_schema,
},
SQMP
@@ -2457,7 +2378,6 @@ EQMP
{
.name = "query-chardev",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_query_chardev,
},
SQMP
@@ -2498,7 +2418,6 @@ EQMP
{
.name = "query-chardev-backends",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_query_chardev_backends,
},
SQMP
@@ -2682,7 +2601,6 @@ EQMP
{
.name = "query-block",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_query_block,
},
SQMP
@@ -2879,7 +2797,6 @@ EQMP
{
.name = "query-blockstats",
.args_type = "query-nodes:b?",
- .mhandler.cmd_new = qmp_marshal_query_blockstats,
},
SQMP
@@ -2934,7 +2851,6 @@ EQMP
{
.name = "query-cpus",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_query_cpus,
},
SQMP
@@ -2973,7 +2889,6 @@ EQMP
{
.name = "query-iothreads",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_query_iothreads,
},
SQMP
@@ -3190,7 +3105,6 @@ EQMP
{
.name = "query-pci",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_query_pci,
},
SQMP
@@ -3214,7 +3128,6 @@ EQMP
{
.name = "query-kvm",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_query_kvm,
},
SQMP
@@ -3254,7 +3167,6 @@ EQMP
{
.name = "query-status",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_query_status,
},
SQMP
@@ -3298,7 +3210,6 @@ EQMP
{
.name = "query-mice",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_query_mice,
},
SQMP
@@ -3361,12 +3272,10 @@ EQMP
{
.name = "query-vnc",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_query_vnc,
},
{
.name = "query-vnc-servers",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_query_vnc_servers,
},
SQMP
@@ -3443,7 +3352,6 @@ EQMP
{
.name = "query-spice",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_query_spice,
},
#endif
@@ -3467,7 +3375,6 @@ EQMP
{
.name = "query-name",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_query_name,
},
SQMP
@@ -3490,7 +3397,6 @@ EQMP
{
.name = "query-uuid",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_query_uuid,
},
SQMP
@@ -3539,7 +3445,6 @@ EQMP
{
.name = "query-command-line-options",
.args_type = "option:s?",
- .mhandler.cmd_new = qmp_marshal_query_command_line_options,
},
SQMP
@@ -3717,7 +3622,6 @@ EQMP
{
.name = "query-migrate",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_query_migrate,
},
SQMP
@@ -3747,7 +3651,6 @@ EQMP
.name = "migrate-set-capabilities",
.args_type = "capabilities:q",
.params = "capability:s,state:b",
- .mhandler.cmd_new = qmp_marshal_migrate_set_capabilities,
},
SQMP
query-migrate-capabilities
@@ -3784,7 +3687,6 @@ EQMP
{
.name = "query-migrate-capabilities",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_query_migrate_capabilities,
},
SQMP
@@ -3814,7 +3716,6 @@ EQMP
.name = "migrate-set-parameters",
.args_type =
"compress-level:i?,compress-threads:i?,decompress-threads:i?,cpu-throttle-initial:i?,cpu-throttle-increment:i?",
- .mhandler.cmd_new = qmp_marshal_migrate_set_parameters,
},
SQMP
query-migrate-parameters
@@ -3851,7 +3752,6 @@ EQMP
{
.name = "query-migrate-parameters",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_query_migrate_parameters,
},
SQMP
@@ -3879,106 +3779,88 @@ EQMP
{
.name = "query-balloon",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_query_balloon,
},
{
.name = "query-block-jobs",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_query_block_jobs,
},
{
.name = "qom-list",
.args_type = "path:s",
- .mhandler.cmd_new = qmp_marshal_qom_list,
},
{
.name = "qom-set",
.args_type = "path:s,property:s,value:q",
- .mhandler.cmd_new = qmp_marshal_qom_set,
},
{
.name = "qom-get",
.args_type = "path:s,property:s",
- .mhandler.cmd_new = qmp_marshal_qom_get,
},
{
.name = "nbd-server-start",
.args_type = "addr:q,tls-creds:s?",
- .mhandler.cmd_new = qmp_marshal_nbd_server_start,
},
{
.name = "nbd-server-add",
.args_type = "device:B,writable:b?",
- .mhandler.cmd_new = qmp_marshal_nbd_server_add,
},
{
.name = "nbd-server-stop",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_nbd_server_stop,
},
{
.name = "change-vnc-password",
.args_type = "password:s",
- .mhandler.cmd_new = qmp_marshal_change_vnc_password,
},
{
.name = "qom-list-types",
.args_type = "implements:s?,abstract:b?",
- .mhandler.cmd_new = qmp_marshal_qom_list_types,
},
{
.name = "device-list-properties",
.args_type = "typename:s",
- .mhandler.cmd_new = qmp_marshal_device_list_properties,
},
{
.name = "query-machines",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_query_machines,
},
{
.name = "query-cpu-definitions",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_query_cpu_definitions,
},
{
.name = "query-cpu-model-expansion",
.args_type = "type:s,model:q",
- .mhandler.cmd_new = qmp_marshal_query_cpu_model_expansion,
},
{
.name = "query-cpu-model-comparison",
.args_type = "modela:q,modelb:q",
- .mhandler.cmd_new = qmp_marshal_query_cpu_model_comparison,
},
{
.name = "query-cpu-model-baseline",
.args_type = "modela:q,modelb:q",
- .mhandler.cmd_new = qmp_marshal_query_cpu_model_baseline,
},
{
.name = "query-target",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_query_target,
},
{
.name = "query-tpm",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_query_tpm,
},
SQMP
@@ -4012,7 +3894,6 @@ EQMP
{
.name = "query-tpm-models",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_query_tpm_models,
},
SQMP
@@ -4033,7 +3914,6 @@ EQMP
{
.name = "query-tpm-types",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_query_tpm_types,
},
SQMP
@@ -4054,7 +3934,6 @@ EQMP
{
.name = "chardev-add",
.args_type = "id:s,backend:q",
- .mhandler.cmd_new = qmp_marshal_chardev_add,
},
SQMP
@@ -4091,7 +3970,6 @@ EQMP
{
.name = "chardev-remove",
.args_type = "id:s",
- .mhandler.cmd_new = qmp_marshal_chardev_remove,
},
@@ -4114,7 +3992,6 @@ EQMP
{
.name = "query-rx-filter",
.args_type = "name:s?",
- .mhandler.cmd_new = qmp_marshal_query_rx_filter,
},
SQMP
@@ -4180,7 +4057,6 @@ EQMP
{
.name = "blockdev-add",
.args_type = "options:q",
- .mhandler.cmd_new = qmp_marshal_blockdev_add,
},
SQMP
@@ -4239,7 +4115,6 @@ EQMP
{
.name = "x-blockdev-del",
.args_type = "id:s?,node-name:s?",
- .mhandler.cmd_new = qmp_marshal_x_blockdev_del,
},
SQMP
@@ -4296,7 +4171,6 @@ EQMP
{
.name = "blockdev-open-tray",
.args_type = "device:s,force:b?",
- .mhandler.cmd_new = qmp_marshal_blockdev_open_tray,
},
SQMP
@@ -4344,7 +4218,6 @@ EQMP
{
.name = "blockdev-close-tray",
.args_type = "device:s",
- .mhandler.cmd_new = qmp_marshal_blockdev_close_tray,
},
SQMP
@@ -4379,7 +4252,6 @@ EQMP
{
.name = "x-blockdev-remove-medium",
.args_type = "device:s",
- .mhandler.cmd_new = qmp_marshal_x_blockdev_remove_medium,
},
SQMP
@@ -4427,7 +4299,6 @@ EQMP
{
.name = "x-blockdev-insert-medium",
.args_type = "device:s,node-name:s",
- .mhandler.cmd_new = qmp_marshal_x_blockdev_insert_medium,
},
SQMP
@@ -4467,7 +4338,6 @@ EQMP
{
.name = "x-blockdev-change",
.args_type = "parent:B,child:B?,node:B?",
- .mhandler.cmd_new = qmp_marshal_x_blockdev_change,
},
SQMP
@@ -4520,7 +4390,6 @@ EQMP
{
.name = "query-named-block-nodes",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_query_named_block_nodes,
},
SQMP
@@ -4582,7 +4451,6 @@ EQMP
{
.name = "blockdev-change-medium",
.args_type = "device:B,filename:F,format:s?,read-only-mode:s?",
- .mhandler.cmd_new = qmp_marshal_blockdev_change_medium,
},
SQMP
@@ -4635,7 +4503,6 @@ EQMP
{
.name = "query-memdev",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_query_memdev,
},
SQMP
@@ -4673,7 +4540,6 @@ EQMP
{
.name = "query-memory-devices",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_query_memory_devices,
},
SQMP
@@ -4700,7 +4566,6 @@ EQMP
{
.name = "query-acpi-ospm-status",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_query_acpi_ospm_status,
},
SQMP
@@ -4723,7 +4588,6 @@ EQMP
{
.name = "rtc-reset-reinjection",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_rtc_reset_reinjection,
},
#endif
@@ -4744,7 +4608,6 @@ EQMP
{
.name = "trace-event-get-state",
.args_type = "name:s,vcpu:i?",
- .mhandler.cmd_new = qmp_marshal_trace_event_get_state,
},
SQMP
@@ -4776,7 +4639,6 @@ EQMP
{
.name = "trace-event-set-state",
.args_type = "name:s,enable:b,ignore-unavailable:b?,vcpu:i?",
- .mhandler.cmd_new = qmp_marshal_trace_event_set_state,
},
SQMP
@@ -4811,7 +4673,6 @@ EQMP
{
.name = "input-send-event",
.args_type = "console:i?,events:q",
- .mhandler.cmd_new = qmp_marshal_input_send_event,
},
SQMP
@@ -4875,7 +4736,6 @@ EQMP
{
.name = "block-set-write-threshold",
.args_type = "node-name:s,write-threshold:l",
- .mhandler.cmd_new = qmp_marshal_block_set_write_threshold,
},
SQMP
@@ -4903,7 +4763,6 @@ EQMP
{
.name = "query-rocker",
.args_type = "name:s",
- .mhandler.cmd_new = qmp_marshal_query_rocker,
},
SQMP
@@ -4924,7 +4783,6 @@ EQMP
{
.name = "query-rocker-ports",
.args_type = "name:s",
- .mhandler.cmd_new = qmp_marshal_query_rocker_ports,
},
SQMP
@@ -4949,7 +4807,6 @@ EQMP
{
.name = "query-rocker-of-dpa-flows",
.args_type = "name:s,tbl-id:i?",
- .mhandler.cmd_new = qmp_marshal_query_rocker_of_dpa_flows,
},
SQMP
@@ -4978,7 +4835,6 @@ EQMP
{
.name = "query-rocker-of-dpa-groups",
.args_type = "name:s,type:i?",
- .mhandler.cmd_new = qmp_marshal_query_rocker_of_dpa_groups,
},
SQMP
@@ -5009,7 +4865,6 @@ EQMP
{
.name = "query-gic-capabilities",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_query_gic_capabilities,
},
#endif
@@ -5033,7 +4888,6 @@ EQMP
{
.name = "query-hotpluggable-cpus",
.args_type = "",
- .mhandler.cmd_new = qmp_marshal_query_hotpluggable_cpus,
},
SQMP
--
2.10.0
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [Qemu-devel] [PATCH v6 10/18] monitor: implement 'qmp_query_commands' without qmp_cmds
2016-09-12 9:18 [Qemu-devel] [PATCH v6 00/18] qapi: remove the 'middle' mode Marc-André Lureau
` (8 preceding siblings ...)
2016-09-12 9:19 ` [Qemu-devel] [PATCH v6 09/18] monitor: use qmp_find_command() (using generated qapi code) Marc-André Lureau
@ 2016-09-12 9:19 ` Marc-André Lureau
2016-09-12 9:19 ` [Qemu-devel] [PATCH v6 11/18] monitor: remove mhandler.cmd_new Marc-André Lureau
` (8 subsequent siblings)
18 siblings, 0 replies; 33+ messages in thread
From: Marc-André Lureau @ 2016-09-12 9:19 UTC (permalink / raw)
To: qemu-devel; +Cc: eblake, armbru, Marc-André Lureau
One step towards getting rid of the static qmp_cmds table.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
monitor.c | 29 ++++++++++++++++++-----------
1 file changed, 18 insertions(+), 11 deletions(-)
diff --git a/monitor.c b/monitor.c
index 6e0ae81..f50aa6e 100644
--- a/monitor.c
+++ b/monitor.c
@@ -957,21 +957,28 @@ static void hmp_info_help(Monitor *mon, const QDict *qdict)
help_cmd(mon, "info");
}
-CommandInfoList *qmp_query_commands(Error **errp)
+static void query_commands_cb(QmpCommand *cmd, void *opaque)
{
- CommandInfoList *info, *cmd_list = NULL;
- const mon_cmd_t *cmd;
-
- for (cmd = qmp_cmds; cmd->name != NULL; cmd++) {
- info = g_malloc0(sizeof(*info));
- info->value = g_malloc0(sizeof(*info->value));
- info->value->name = g_strdup(cmd->name);
+ CommandInfoList *info, **list = opaque;
- info->next = cmd_list;
- cmd_list = info;
+ if (!cmd->enabled) {
+ return;
}
- return cmd_list;
+ info = g_malloc0(sizeof(*info));
+ info->value = g_malloc0(sizeof(*info->value));
+ info->value->name = g_strdup(cmd->name);
+ info->next = *list;
+ *list = info;
+}
+
+CommandInfoList *qmp_query_commands(Error **errp)
+{
+ CommandInfoList *list = NULL;
+
+ qmp_for_each_command(query_commands_cb, &list);
+
+ return list;
}
EventInfoList *qmp_query_events(Error **errp)
--
2.10.0
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [Qemu-devel] [PATCH v6 11/18] monitor: remove mhandler.cmd_new
2016-09-12 9:18 [Qemu-devel] [PATCH v6 00/18] qapi: remove the 'middle' mode Marc-André Lureau
` (9 preceding siblings ...)
2016-09-12 9:19 ` [Qemu-devel] [PATCH v6 10/18] monitor: implement 'qmp_query_commands' without qmp_cmds Marc-André Lureau
@ 2016-09-12 9:19 ` Marc-André Lureau
2016-09-12 9:19 ` [Qemu-devel] [PATCH v6 12/18] qapi: remove the "middle" mode Marc-André Lureau
` (7 subsequent siblings)
18 siblings, 0 replies; 33+ messages in thread
From: Marc-André Lureau @ 2016-09-12 9:19 UTC (permalink / raw)
To: qemu-devel; +Cc: eblake, armbru, Marc-André Lureau
This is no longer necessary now that we aren't using middle mode
anymore.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
monitor.c | 13 +--
docs/writing-qmp-commands.txt | 4 +-
hmp-commands-info.hx | 118 ++++++++++++------------
hmp-commands.hx | 208 +++++++++++++++++++++---------------------
4 files changed, 170 insertions(+), 173 deletions(-)
diff --git a/monitor.c b/monitor.c
index f50aa6e..d5d6e95 100644
--- a/monitor.c
+++ b/monitor.c
@@ -130,13 +130,10 @@ typedef struct mon_cmd_t {
const char *args_type;
const char *params;
const char *help;
- union {
- void (*cmd)(Monitor *mon, const QDict *qdict);
- void (*cmd_new)(QDict *params, QObject **ret_data, Error **errp);
- } mhandler;
- /* @sub_table is a list of 2nd level of commands. If it do not exist,
- * mhandler should be used. If it exist, sub_table[?].mhandler should be
- * used, and mhandler of 1st level plays the role of help function.
+ void (*cmd)(Monitor *mon, const QDict *qdict);
+ /* @sub_table is a list of 2nd level of commands. If it does not exist,
+ * cmd should be used. If it exists, sub_table[?].cmd should be
+ * used, and cmd of 1st level plays the role of help function.
*/
struct mon_cmd_t *sub_table;
void (*command_completion)(ReadLineState *rs, int nb_args, const char *str);
@@ -3005,7 +3002,7 @@ static void handle_hmp_command(Monitor *mon, const char *cmdline)
return;
}
- cmd->mhandler.cmd(mon, qdict);
+ cmd->cmd(mon, qdict);
QDECREF(qdict);
}
diff --git a/docs/writing-qmp-commands.txt b/docs/writing-qmp-commands.txt
index 0a66e0e..c425393 100644
--- a/docs/writing-qmp-commands.txt
+++ b/docs/writing-qmp-commands.txt
@@ -335,7 +335,7 @@ we should add it to the hmp-commands.hx file:
.args_type = "message:s?",
.params = "hello-world [message]",
.help = "Print message to the standard output",
- .mhandler.cmd = hmp_hello_world,
+ .cmd = hmp_hello_world,
},
STEXI
@@ -515,7 +515,7 @@ in the monitor.c file. The entry for the "info alarmclock" follows:
.args_type = "",
.params = "",
.help = "show information about the alarm clock",
- .mhandler.cmd = hmp_info_alarm_clock,
+ .cmd = hmp_info_alarm_clock,
},
To test this, run qemu and type "info alarmclock" in the user monitor.
diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx
index 74446c6..19729e5 100644
--- a/hmp-commands-info.hx
+++ b/hmp-commands-info.hx
@@ -18,7 +18,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "show the version of QEMU",
- .mhandler.cmd = hmp_info_version,
+ .cmd = hmp_info_version,
},
STEXI
@@ -32,7 +32,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "show the network state",
- .mhandler.cmd = hmp_info_network,
+ .cmd = hmp_info_network,
},
STEXI
@@ -46,7 +46,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "show the character devices",
- .mhandler.cmd = hmp_info_chardev,
+ .cmd = hmp_info_chardev,
},
STEXI
@@ -61,7 +61,7 @@ ETEXI
.params = "[-n] [-v] [device]",
.help = "show info of one block device or all block devices "
"(-n: show named nodes; -v: show details)",
- .mhandler.cmd = hmp_info_block,
+ .cmd = hmp_info_block,
},
STEXI
@@ -75,7 +75,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "show block device statistics",
- .mhandler.cmd = hmp_info_blockstats,
+ .cmd = hmp_info_blockstats,
},
STEXI
@@ -89,7 +89,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "show progress of ongoing block device operations",
- .mhandler.cmd = hmp_info_block_jobs,
+ .cmd = hmp_info_block_jobs,
},
STEXI
@@ -103,7 +103,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "show the cpu registers",
- .mhandler.cmd = hmp_info_registers,
+ .cmd = hmp_info_registers,
},
STEXI
@@ -118,7 +118,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "show local apic state",
- .mhandler.cmd = hmp_info_local_apic,
+ .cmd = hmp_info_local_apic,
},
#endif
@@ -134,7 +134,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "show io apic state",
- .mhandler.cmd = hmp_info_io_apic,
+ .cmd = hmp_info_io_apic,
},
#endif
@@ -149,7 +149,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "show infos for each CPU",
- .mhandler.cmd = hmp_info_cpus,
+ .cmd = hmp_info_cpus,
},
STEXI
@@ -163,7 +163,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "show the command line history",
- .mhandler.cmd = hmp_info_history,
+ .cmd = hmp_info_history,
},
STEXI
@@ -180,11 +180,11 @@ ETEXI
.params = "",
.help = "show the interrupts statistics (if available)",
#ifdef TARGET_SPARC
- .mhandler.cmd = sun4m_hmp_info_irq,
+ .cmd = sun4m_hmp_info_irq,
#elif defined(TARGET_LM32)
- .mhandler.cmd = lm32_hmp_info_irq,
+ .cmd = lm32_hmp_info_irq,
#else
- .mhandler.cmd = hmp_info_irq,
+ .cmd = hmp_info_irq,
#endif
},
@@ -200,11 +200,11 @@ ETEXI
.params = "",
.help = "show i8259 (PIC) state",
#ifdef TARGET_SPARC
- .mhandler.cmd = sun4m_hmp_info_pic,
+ .cmd = sun4m_hmp_info_pic,
#elif defined(TARGET_LM32)
- .mhandler.cmd = lm32_hmp_info_pic,
+ .cmd = lm32_hmp_info_pic,
#else
- .mhandler.cmd = hmp_info_pic,
+ .cmd = hmp_info_pic,
#endif
},
#endif
@@ -220,7 +220,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "show PCI info",
- .mhandler.cmd = hmp_info_pci,
+ .cmd = hmp_info_pci,
},
STEXI
@@ -236,7 +236,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "show virtual to physical memory mappings",
- .mhandler.cmd = hmp_info_tlb,
+ .cmd = hmp_info_tlb,
},
#endif
@@ -252,7 +252,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "show the active virtual memory mappings",
- .mhandler.cmd = hmp_info_mem,
+ .cmd = hmp_info_mem,
},
#endif
@@ -267,7 +267,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "show memory tree",
- .mhandler.cmd = hmp_info_mtree,
+ .cmd = hmp_info_mtree,
},
STEXI
@@ -281,7 +281,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "show dynamic compiler info",
- .mhandler.cmd = hmp_info_jit,
+ .cmd = hmp_info_jit,
},
STEXI
@@ -295,7 +295,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "show dynamic compiler opcode counters",
- .mhandler.cmd = hmp_info_opcount,
+ .cmd = hmp_info_opcount,
},
STEXI
@@ -309,7 +309,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "show KVM information",
- .mhandler.cmd = hmp_info_kvm,
+ .cmd = hmp_info_kvm,
},
STEXI
@@ -323,7 +323,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "show NUMA information",
- .mhandler.cmd = hmp_info_numa,
+ .cmd = hmp_info_numa,
},
STEXI
@@ -337,7 +337,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "show guest USB devices",
- .mhandler.cmd = hmp_info_usb,
+ .cmd = hmp_info_usb,
},
STEXI
@@ -351,7 +351,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "show host USB devices",
- .mhandler.cmd = hmp_info_usbhost,
+ .cmd = hmp_info_usbhost,
},
STEXI
@@ -365,7 +365,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "show profiling information",
- .mhandler.cmd = hmp_info_profile,
+ .cmd = hmp_info_profile,
},
STEXI
@@ -379,7 +379,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "show capture information",
- .mhandler.cmd = hmp_info_capture,
+ .cmd = hmp_info_capture,
},
STEXI
@@ -393,7 +393,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "show the currently saved VM snapshots",
- .mhandler.cmd = hmp_info_snapshots,
+ .cmd = hmp_info_snapshots,
},
STEXI
@@ -407,7 +407,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "show the current VM status (running|paused)",
- .mhandler.cmd = hmp_info_status,
+ .cmd = hmp_info_status,
},
STEXI
@@ -421,7 +421,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "show which guest mouse is receiving events",
- .mhandler.cmd = hmp_info_mice,
+ .cmd = hmp_info_mice,
},
STEXI
@@ -435,7 +435,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "show the vnc server status",
- .mhandler.cmd = hmp_info_vnc,
+ .cmd = hmp_info_vnc,
},
STEXI
@@ -450,7 +450,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "show the spice server status",
- .mhandler.cmd = hmp_info_spice,
+ .cmd = hmp_info_spice,
},
#endif
@@ -465,7 +465,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "show the current VM name",
- .mhandler.cmd = hmp_info_name,
+ .cmd = hmp_info_name,
},
STEXI
@@ -479,7 +479,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "show the current VM UUID",
- .mhandler.cmd = hmp_info_uuid,
+ .cmd = hmp_info_uuid,
},
STEXI
@@ -493,7 +493,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "show CPU statistics",
- .mhandler.cmd = hmp_info_cpustats,
+ .cmd = hmp_info_cpustats,
},
STEXI
@@ -508,7 +508,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "show user network stack connection states",
- .mhandler.cmd = hmp_info_usernet,
+ .cmd = hmp_info_usernet,
},
#endif
@@ -523,7 +523,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "show migration status",
- .mhandler.cmd = hmp_info_migrate,
+ .cmd = hmp_info_migrate,
},
STEXI
@@ -537,7 +537,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "show current migration capabilities",
- .mhandler.cmd = hmp_info_migrate_capabilities,
+ .cmd = hmp_info_migrate_capabilities,
},
STEXI
@@ -551,7 +551,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "show current migration parameters",
- .mhandler.cmd = hmp_info_migrate_parameters,
+ .cmd = hmp_info_migrate_parameters,
},
STEXI
@@ -565,7 +565,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "show current migration xbzrle cache size",
- .mhandler.cmd = hmp_info_migrate_cache_size,
+ .cmd = hmp_info_migrate_cache_size,
},
STEXI
@@ -579,7 +579,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "show balloon information",
- .mhandler.cmd = hmp_info_balloon,
+ .cmd = hmp_info_balloon,
},
STEXI
@@ -593,7 +593,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "show device tree",
- .mhandler.cmd = hmp_info_qtree,
+ .cmd = hmp_info_qtree,
},
STEXI
@@ -607,7 +607,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "show qdev device model list",
- .mhandler.cmd = hmp_info_qdm,
+ .cmd = hmp_info_qdm,
},
STEXI
@@ -621,7 +621,7 @@ ETEXI
.args_type = "path:s?",
.params = "[path]",
.help = "show QOM composition tree",
- .mhandler.cmd = hmp_info_qom_tree,
+ .cmd = hmp_info_qom_tree,
},
STEXI
@@ -635,7 +635,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "show roms",
- .mhandler.cmd = hmp_info_roms,
+ .cmd = hmp_info_roms,
},
STEXI
@@ -650,7 +650,7 @@ ETEXI
.params = "[name] [vcpu]",
.help = "show available trace-events & their state "
"(name: event name pattern; vcpu: vCPU to query, default is any)",
- .mhandler.cmd = hmp_info_trace_events,
+ .cmd = hmp_info_trace_events,
.command_completion = info_trace_events_completion,
},
@@ -665,7 +665,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "show the TPM device",
- .mhandler.cmd = hmp_info_tpm,
+ .cmd = hmp_info_tpm,
},
STEXI
@@ -679,7 +679,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "show memory backends",
- .mhandler.cmd = hmp_info_memdev,
+ .cmd = hmp_info_memdev,
},
STEXI
@@ -693,7 +693,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "show memory devices",
- .mhandler.cmd = hmp_info_memory_devices,
+ .cmd = hmp_info_memory_devices,
},
STEXI
@@ -707,7 +707,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "show iothreads",
- .mhandler.cmd = hmp_info_iothreads,
+ .cmd = hmp_info_iothreads,
},
STEXI
@@ -721,7 +721,7 @@ ETEXI
.args_type = "name:s",
.params = "name",
.help = "Show rocker switch",
- .mhandler.cmd = hmp_rocker,
+ .cmd = hmp_rocker,
},
STEXI
@@ -735,7 +735,7 @@ ETEXI
.args_type = "name:s",
.params = "name",
.help = "Show rocker ports",
- .mhandler.cmd = hmp_rocker_ports,
+ .cmd = hmp_rocker_ports,
},
STEXI
@@ -749,7 +749,7 @@ ETEXI
.args_type = "name:s,tbl_id:i?",
.params = "name [tbl_id]",
.help = "Show rocker OF-DPA flow tables",
- .mhandler.cmd = hmp_rocker_of_dpa_flows,
+ .cmd = hmp_rocker_of_dpa_flows,
},
STEXI
@@ -763,7 +763,7 @@ ETEXI
.args_type = "name:s,type:i?",
.params = "name [type]",
.help = "Show rocker OF-DPA groups",
- .mhandler.cmd = hmp_rocker_of_dpa_groups,
+ .cmd = hmp_rocker_of_dpa_groups,
},
STEXI
@@ -778,7 +778,7 @@ ETEXI
.args_type = "addr:l",
.params = "address",
.help = "Display the value of a storage key",
- .mhandler.cmd = hmp_info_skeys,
+ .cmd = hmp_info_skeys,
},
#endif
@@ -793,7 +793,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "Display the latest dump status",
- .mhandler.cmd = hmp_info_dump,
+ .cmd = hmp_info_dump,
},
STEXI
@@ -807,7 +807,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "Show information about hotpluggable CPUs",
- .mhandler.cmd = hmp_hotpluggable_cpus,
+ .cmd = hmp_hotpluggable_cpus,
},
STEXI
diff --git a/hmp-commands.hx b/hmp-commands.hx
index 74f32e5..06bef47 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -14,7 +14,7 @@ ETEXI
.args_type = "name:S?",
.params = "[cmd]",
.help = "show the help",
- .mhandler.cmd = do_help_cmd,
+ .cmd = do_help_cmd,
},
STEXI
@@ -28,7 +28,7 @@ ETEXI
.args_type = "device:B",
.params = "device|all",
.help = "commit changes to the disk images (if -snapshot is used) or backing files",
- .mhandler.cmd = hmp_commit,
+ .cmd = hmp_commit,
},
STEXI
@@ -47,7 +47,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "quit the emulator",
- .mhandler.cmd = hmp_quit,
+ .cmd = hmp_quit,
},
STEXI
@@ -61,7 +61,7 @@ ETEXI
.args_type = "device:B,size:o",
.params = "device size",
.help = "resize a block image",
- .mhandler.cmd = hmp_block_resize,
+ .cmd = hmp_block_resize,
},
STEXI
@@ -78,7 +78,7 @@ ETEXI
.args_type = "device:B,speed:o?,base:s?",
.params = "device [speed [base]]",
.help = "copy data from a backing file into a block device",
- .mhandler.cmd = hmp_block_stream,
+ .cmd = hmp_block_stream,
},
STEXI
@@ -92,7 +92,7 @@ ETEXI
.args_type = "device:B,speed:o",
.params = "device speed",
.help = "set maximum speed for a background block operation",
- .mhandler.cmd = hmp_block_job_set_speed,
+ .cmd = hmp_block_job_set_speed,
},
STEXI
@@ -107,7 +107,7 @@ ETEXI
.params = "[-f] device",
.help = "stop an active background block operation (use -f"
"\n\t\t\t if the operation is currently paused)",
- .mhandler.cmd = hmp_block_job_cancel,
+ .cmd = hmp_block_job_cancel,
},
STEXI
@@ -121,7 +121,7 @@ ETEXI
.args_type = "device:B",
.params = "device",
.help = "stop an active background block operation",
- .mhandler.cmd = hmp_block_job_complete,
+ .cmd = hmp_block_job_complete,
},
STEXI
@@ -136,7 +136,7 @@ ETEXI
.args_type = "device:B",
.params = "device",
.help = "pause an active background block operation",
- .mhandler.cmd = hmp_block_job_pause,
+ .cmd = hmp_block_job_pause,
},
STEXI
@@ -150,7 +150,7 @@ ETEXI
.args_type = "device:B",
.params = "device",
.help = "resume a paused background block operation",
- .mhandler.cmd = hmp_block_job_resume,
+ .cmd = hmp_block_job_resume,
},
STEXI
@@ -164,7 +164,7 @@ ETEXI
.args_type = "force:-f,device:B",
.params = "[-f] device",
.help = "eject a removable medium (use -f to force it)",
- .mhandler.cmd = hmp_eject,
+ .cmd = hmp_eject,
},
STEXI
@@ -178,7 +178,7 @@ ETEXI
.args_type = "id:B",
.params = "device",
.help = "remove host block device",
- .mhandler.cmd = hmp_drive_del,
+ .cmd = hmp_drive_del,
},
STEXI
@@ -197,7 +197,7 @@ ETEXI
.args_type = "device:B,target:F,arg:s?,read-only-mode:s?",
.params = "device filename [format [read-only-mode]]",
.help = "change a removable medium, optional format",
- .mhandler.cmd = hmp_change,
+ .cmd = hmp_change,
},
STEXI
@@ -256,7 +256,7 @@ ETEXI
.args_type = "filename:F",
.params = "filename",
.help = "save screen into PPM image 'filename'",
- .mhandler.cmd = hmp_screendump,
+ .cmd = hmp_screendump,
},
STEXI
@@ -270,7 +270,7 @@ ETEXI
.args_type = "filename:F",
.params = "filename",
.help = "output logs to 'filename'",
- .mhandler.cmd = hmp_logfile,
+ .cmd = hmp_logfile,
},
STEXI
@@ -285,7 +285,7 @@ ETEXI
.params = "name on|off [vcpu]",
.help = "changes status of a specific trace event "
"(vcpu: vCPU to set, default is all)",
- .mhandler.cmd = hmp_trace_event,
+ .cmd = hmp_trace_event,
.command_completion = trace_event_completion,
},
@@ -301,7 +301,7 @@ ETEXI
.args_type = "op:s?,arg:F?",
.params = "on|off|flush|set [arg]",
.help = "open, close, or flush trace file, or set a new file name",
- .mhandler.cmd = hmp_trace_file,
+ .cmd = hmp_trace_file,
},
STEXI
@@ -316,7 +316,7 @@ ETEXI
.args_type = "items:s",
.params = "item1[,...]",
.help = "activate logging of the specified items",
- .mhandler.cmd = hmp_log,
+ .cmd = hmp_log,
},
STEXI
@@ -330,7 +330,7 @@ ETEXI
.args_type = "name:s?",
.params = "[tag|id]",
.help = "save a VM snapshot. If no tag or id are provided, a new snapshot is created",
- .mhandler.cmd = hmp_savevm,
+ .cmd = hmp_savevm,
},
STEXI
@@ -347,7 +347,7 @@ ETEXI
.args_type = "name:s",
.params = "tag|id",
.help = "restore a VM snapshot from its tag or id",
- .mhandler.cmd = hmp_loadvm,
+ .cmd = hmp_loadvm,
.command_completion = loadvm_completion,
},
@@ -363,7 +363,7 @@ ETEXI
.args_type = "name:s",
.params = "tag|id",
.help = "delete a VM snapshot from its tag or id",
- .mhandler.cmd = hmp_delvm,
+ .cmd = hmp_delvm,
.command_completion = delvm_completion,
},
@@ -378,7 +378,7 @@ ETEXI
.args_type = "option:s?",
.params = "[on|off]",
.help = "run emulation in singlestep mode or switch to normal mode",
- .mhandler.cmd = hmp_singlestep,
+ .cmd = hmp_singlestep,
},
STEXI
@@ -393,7 +393,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "stop emulation",
- .mhandler.cmd = hmp_stop,
+ .cmd = hmp_stop,
},
STEXI
@@ -407,7 +407,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "resume emulation",
- .mhandler.cmd = hmp_cont,
+ .cmd = hmp_cont,
},
STEXI
@@ -421,7 +421,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "wakeup guest from suspend",
- .mhandler.cmd = hmp_system_wakeup,
+ .cmd = hmp_system_wakeup,
},
STEXI
@@ -435,7 +435,7 @@ ETEXI
.args_type = "device:s?",
.params = "[device]",
.help = "start gdbserver on given device (default 'tcp::1234'), stop with 'none'",
- .mhandler.cmd = hmp_gdbserver,
+ .cmd = hmp_gdbserver,
},
STEXI
@@ -449,7 +449,7 @@ ETEXI
.args_type = "fmt:/,addr:l",
.params = "/fmt addr",
.help = "virtual memory dump starting at 'addr'",
- .mhandler.cmd = hmp_memory_dump,
+ .cmd = hmp_memory_dump,
},
STEXI
@@ -463,7 +463,7 @@ ETEXI
.args_type = "fmt:/,addr:l",
.params = "/fmt addr",
.help = "physical memory dump starting at 'addr'",
- .mhandler.cmd = hmp_physical_memory_dump,
+ .cmd = hmp_physical_memory_dump,
},
STEXI
@@ -530,7 +530,7 @@ ETEXI
.args_type = "fmt:/,val:l",
.params = "/fmt expr",
.help = "print expression value (use $reg for CPU register access)",
- .mhandler.cmd = do_print,
+ .cmd = do_print,
},
STEXI
@@ -545,7 +545,7 @@ ETEXI
.args_type = "fmt:/,addr:i,index:i.",
.params = "/fmt addr",
.help = "I/O port read",
- .mhandler.cmd = hmp_ioport_read,
+ .cmd = hmp_ioport_read,
},
STEXI
@@ -559,7 +559,7 @@ ETEXI
.args_type = "fmt:/,addr:i,val:i",
.params = "/fmt addr value",
.help = "I/O port write",
- .mhandler.cmd = hmp_ioport_write,
+ .cmd = hmp_ioport_write,
},
STEXI
@@ -573,7 +573,7 @@ ETEXI
.args_type = "keys:s,hold-time:i?",
.params = "keys [hold_ms]",
.help = "send keys to the VM (e.g. 'sendkey ctrl-alt-f1', default hold time=100 ms)",
- .mhandler.cmd = hmp_sendkey,
+ .cmd = hmp_sendkey,
.command_completion = sendkey_completion,
},
@@ -596,7 +596,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "reset the system",
- .mhandler.cmd = hmp_system_reset,
+ .cmd = hmp_system_reset,
},
STEXI
@@ -610,7 +610,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "send system power down event",
- .mhandler.cmd = hmp_system_powerdown,
+ .cmd = hmp_system_powerdown,
},
STEXI
@@ -624,7 +624,7 @@ ETEXI
.args_type = "start:i,size:i",
.params = "addr size",
.help = "compute the checksum of a memory region",
- .mhandler.cmd = hmp_sum,
+ .cmd = hmp_sum,
},
STEXI
@@ -638,7 +638,7 @@ ETEXI
.args_type = "devname:s",
.params = "device",
.help = "add USB device (e.g. 'host:bus.addr' or 'host:vendor_id:product_id')",
- .mhandler.cmd = hmp_usb_add,
+ .cmd = hmp_usb_add,
},
STEXI
@@ -653,7 +653,7 @@ ETEXI
.args_type = "devname:s",
.params = "device",
.help = "remove USB device 'bus.addr'",
- .mhandler.cmd = hmp_usb_del,
+ .cmd = hmp_usb_del,
},
STEXI
@@ -669,7 +669,7 @@ ETEXI
.args_type = "device:O",
.params = "driver[,prop=value][,...]",
.help = "add device, like -device on the command line",
- .mhandler.cmd = hmp_device_add,
+ .cmd = hmp_device_add,
.command_completion = device_add_completion,
},
@@ -684,7 +684,7 @@ ETEXI
.args_type = "id:s",
.params = "device",
.help = "remove device",
- .mhandler.cmd = hmp_device_del,
+ .cmd = hmp_device_del,
.command_completion = device_del_completion,
},
@@ -700,7 +700,7 @@ ETEXI
.args_type = "index:i",
.params = "index",
.help = "set the default CPU",
- .mhandler.cmd = hmp_cpu,
+ .cmd = hmp_cpu,
},
STEXI
@@ -714,7 +714,7 @@ ETEXI
.args_type = "dx_str:s,dy_str:s,dz_str:s?",
.params = "dx dy [dz]",
.help = "send mouse move events",
- .mhandler.cmd = hmp_mouse_move,
+ .cmd = hmp_mouse_move,
},
STEXI
@@ -729,7 +729,7 @@ ETEXI
.args_type = "button_state:i",
.params = "state",
.help = "change mouse button state (1=L, 2=M, 4=R)",
- .mhandler.cmd = hmp_mouse_button,
+ .cmd = hmp_mouse_button,
},
STEXI
@@ -743,7 +743,7 @@ ETEXI
.args_type = "index:i",
.params = "index",
.help = "set which mouse device receives events",
- .mhandler.cmd = hmp_mouse_set,
+ .cmd = hmp_mouse_set,
},
STEXI
@@ -761,7 +761,7 @@ ETEXI
.args_type = "path:F,freq:i?,bits:i?,nchannels:i?",
.params = "path [frequency [bits [channels]]]",
.help = "capture audio to a wave file (default frequency=44100 bits=16 channels=2)",
- .mhandler.cmd = hmp_wavcapture,
+ .cmd = hmp_wavcapture,
},
STEXI
@item wavcapture @var{filename} [@var{frequency} [@var{bits} [@var{channels}]]]
@@ -782,7 +782,7 @@ ETEXI
.args_type = "n:i",
.params = "capture index",
.help = "stop capture",
- .mhandler.cmd = hmp_stopcapture,
+ .cmd = hmp_stopcapture,
},
STEXI
@item stopcapture @var{index}
@@ -798,7 +798,7 @@ ETEXI
.args_type = "val:l,size:i,filename:s",
.params = "addr size file",
.help = "save to disk virtual memory dump starting at 'addr' of size 'size'",
- .mhandler.cmd = hmp_memsave,
+ .cmd = hmp_memsave,
},
STEXI
@@ -812,7 +812,7 @@ ETEXI
.args_type = "val:l,size:i,filename:s",
.params = "addr size file",
.help = "save to disk physical memory dump starting at 'addr' of size 'size'",
- .mhandler.cmd = hmp_pmemsave,
+ .cmd = hmp_pmemsave,
},
STEXI
@@ -826,7 +826,7 @@ ETEXI
.args_type = "bootdevice:s",
.params = "bootdevice",
.help = "define new values for the boot device list",
- .mhandler.cmd = hmp_boot_set,
+ .cmd = hmp_boot_set,
},
STEXI
@@ -844,7 +844,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "inject an NMI",
- .mhandler.cmd = hmp_nmi,
+ .cmd = hmp_nmi,
},
STEXI
@item nmi @var{cpu}
@@ -858,7 +858,7 @@ ETEXI
.args_type = "device:s,data:s",
.params = "device data",
.help = "Write to a ring buffer character device",
- .mhandler.cmd = hmp_ringbuf_write,
+ .cmd = hmp_ringbuf_write,
.command_completion = ringbuf_write_completion,
},
@@ -875,7 +875,7 @@ ETEXI
.args_type = "device:s,size:i",
.params = "device size",
.help = "Read from a ring buffer character device",
- .mhandler.cmd = hmp_ringbuf_read,
+ .cmd = hmp_ringbuf_read,
.command_completion = ringbuf_write_completion,
},
@@ -901,7 +901,7 @@ ETEXI
" full copy of disk\n\t\t\t -i for migration without "
"shared storage with incremental copy of disk "
"(base image shared between src and destination)",
- .mhandler.cmd = hmp_migrate,
+ .cmd = hmp_migrate,
},
@@ -918,7 +918,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "cancel the current VM migration",
- .mhandler.cmd = hmp_migrate_cancel,
+ .cmd = hmp_migrate_cancel,
},
STEXI
@@ -933,7 +933,7 @@ ETEXI
.args_type = "uri:s",
.params = "uri",
.help = "Continue an incoming migration from an -incoming defer",
- .mhandler.cmd = hmp_migrate_incoming,
+ .cmd = hmp_migrate_incoming,
},
STEXI
@@ -954,7 +954,7 @@ ETEXI
"The cache size affects the number of cache misses."
"In case of a high cache miss ratio you need to increase"
" the cache size",
- .mhandler.cmd = hmp_migrate_set_cache_size,
+ .cmd = hmp_migrate_set_cache_size,
},
STEXI
@@ -969,7 +969,7 @@ ETEXI
.params = "value",
.help = "set maximum speed (in bytes) for migrations. "
"Defaults to MB if no size suffix is specified, ie. B/K/M/G/T",
- .mhandler.cmd = hmp_migrate_set_speed,
+ .cmd = hmp_migrate_set_speed,
},
STEXI
@@ -983,7 +983,7 @@ ETEXI
.args_type = "value:T",
.params = "value",
.help = "set maximum tolerated downtime (in seconds) for migrations",
- .mhandler.cmd = hmp_migrate_set_downtime,
+ .cmd = hmp_migrate_set_downtime,
},
STEXI
@@ -997,7 +997,7 @@ ETEXI
.args_type = "capability:s,state:b",
.params = "capability state",
.help = "Enable/Disable the usage of a capability for migration",
- .mhandler.cmd = hmp_migrate_set_capability,
+ .cmd = hmp_migrate_set_capability,
.command_completion = migrate_set_capability_completion,
},
@@ -1012,7 +1012,7 @@ ETEXI
.args_type = "parameter:s,value:s",
.params = "parameter value",
.help = "Set the parameter for migration",
- .mhandler.cmd = hmp_migrate_set_parameter,
+ .cmd = hmp_migrate_set_parameter,
.command_completion = migrate_set_parameter_completion,
},
@@ -1029,7 +1029,7 @@ ETEXI
.help = "Followup to a migration command to switch the migration"
" to postcopy mode. The postcopy-ram capability must "
"be set before the original migration command.",
- .mhandler.cmd = hmp_migrate_start_postcopy,
+ .cmd = hmp_migrate_start_postcopy,
},
STEXI
@@ -1044,7 +1044,7 @@ ETEXI
.args_type = "protocol:s,hostname:s,port:i?,tls-port:i?,cert-subject:s?",
.params = "protocol hostname port tls-port cert-subject",
.help = "set migration information for remote display",
- .mhandler.cmd = hmp_client_migrate_info,
+ .cmd = hmp_client_migrate_info,
},
STEXI
@@ -1067,7 +1067,7 @@ ETEXI
"-s: dump in kdump-compressed format, with snappy compression.\n\t\t\t"
"begin: the starting physical address.\n\t\t\t"
"length: the memory size, in bytes.",
- .mhandler.cmd = hmp_dump_guest_memory,
+ .cmd = hmp_dump_guest_memory,
},
@@ -1094,7 +1094,7 @@ ETEXI
.args_type = "filename:F",
.params = "",
.help = "Save guest storage keys into file 'filename'.\n",
- .mhandler.cmd = hmp_dump_skeys,
+ .cmd = hmp_dump_skeys,
},
#endif
@@ -1116,7 +1116,7 @@ ETEXI
"The default format is qcow2. The -n flag requests QEMU\n\t\t\t"
"to reuse the image found in new-image-file, instead of\n\t\t\t"
"recreating it from scratch.",
- .mhandler.cmd = hmp_snapshot_blkdev,
+ .cmd = hmp_snapshot_blkdev,
},
STEXI
@@ -1132,7 +1132,7 @@ ETEXI
.help = "take an internal snapshot of device.\n\t\t\t"
"The format of the image used by device must\n\t\t\t"
"support it, such as qcow2.\n\t\t\t",
- .mhandler.cmd = hmp_snapshot_blkdev_internal,
+ .cmd = hmp_snapshot_blkdev_internal,
},
STEXI
@@ -1150,7 +1150,7 @@ ETEXI
"the snapshot matching both id and name.\n\t\t\t"
"The format of the image used by device must\n\t\t\t"
"support it, such as qcow2.\n\t\t\t",
- .mhandler.cmd = hmp_snapshot_delete_blkdev_internal,
+ .cmd = hmp_snapshot_delete_blkdev_internal,
},
STEXI
@@ -1171,7 +1171,7 @@ ETEXI
"in new-image-file, instead of recreating it from scratch.\n\t\t\t"
"The -f flag requests QEMU to copy the whole disk,\n\t\t\t"
"so that the result does not need a backing file.\n\t\t\t",
- .mhandler.cmd = hmp_drive_mirror,
+ .cmd = hmp_drive_mirror,
},
STEXI
@item drive_mirror
@@ -1194,7 +1194,7 @@ ETEXI
"so that the result does not need a backing file.\n\t\t\t"
"The -c flag requests QEMU to compress backup data\n\t\t\t"
"(if the target format supports it).\n\t\t\t",
- .mhandler.cmd = hmp_drive_backup,
+ .cmd = hmp_drive_backup,
},
STEXI
@item drive_backup
@@ -1212,7 +1212,7 @@ ETEXI
"[,snapshot=on|off][,cache=on|off]\n"
"[,readonly=on|off][,copy-on-read=on|off]",
.help = "add drive to PCI storage controller",
- .mhandler.cmd = hmp_drive_add,
+ .cmd = hmp_drive_add,
},
STEXI
@@ -1236,7 +1236,7 @@ ETEXI
"<error_status> = error string or 32bit\n\t\t\t"
"<tlb header> = 32bit x 4\n\t\t\t"
"<tlb header prefix> = 32bit x 4",
- .mhandler.cmd = hmp_pcie_aer_inject_error,
+ .cmd = hmp_pcie_aer_inject_error,
},
STEXI
@@ -1250,7 +1250,7 @@ ETEXI
.args_type = "device:s,opts:s?",
.params = "tap|user|socket|vde|netmap|bridge|vhost-user|dump [options]",
.help = "add host VLAN client",
- .mhandler.cmd = hmp_host_net_add,
+ .cmd = hmp_host_net_add,
.command_completion = host_net_add_completion,
},
@@ -1265,7 +1265,7 @@ ETEXI
.args_type = "vlan_id:i,device:s",
.params = "vlan_id name",
.help = "remove host VLAN client",
- .mhandler.cmd = hmp_host_net_remove,
+ .cmd = hmp_host_net_remove,
.command_completion = host_net_remove_completion,
},
@@ -1280,7 +1280,7 @@ ETEXI
.args_type = "netdev:O",
.params = "[user|tap|socket|vde|bridge|hubport|netmap|vhost-user],id=str[,prop=value][,...]",
.help = "add host network device",
- .mhandler.cmd = hmp_netdev_add,
+ .cmd = hmp_netdev_add,
.command_completion = netdev_add_completion,
},
@@ -1295,7 +1295,7 @@ ETEXI
.args_type = "id:s",
.params = "id",
.help = "remove host network device",
- .mhandler.cmd = hmp_netdev_del,
+ .cmd = hmp_netdev_del,
.command_completion = netdev_del_completion,
},
@@ -1310,7 +1310,7 @@ ETEXI
.args_type = "object:O",
.params = "[qom-type=]type,id=str[,prop=value][,...]",
.help = "create QOM object",
- .mhandler.cmd = hmp_object_add,
+ .cmd = hmp_object_add,
.command_completion = object_add_completion,
},
@@ -1325,7 +1325,7 @@ ETEXI
.args_type = "id:s",
.params = "id",
.help = "destroy QOM object",
- .mhandler.cmd = hmp_object_del,
+ .cmd = hmp_object_del,
.command_completion = object_del_completion,
},
@@ -1341,7 +1341,7 @@ ETEXI
.args_type = "arg1:s,arg2:s?,arg3:s?",
.params = "[vlan_id name] [tcp|udp]:[hostaddr]:hostport-[guestaddr]:guestport",
.help = "redirect TCP or UDP connections from host to guest (requires -net user)",
- .mhandler.cmd = hmp_hostfwd_add,
+ .cmd = hmp_hostfwd_add,
},
#endif
STEXI
@@ -1356,7 +1356,7 @@ ETEXI
.args_type = "arg1:s,arg2:s?,arg3:s?",
.params = "[vlan_id name] [tcp|udp]:[hostaddr]:hostport",
.help = "remove host-to-guest TCP or UDP redirection",
- .mhandler.cmd = hmp_hostfwd_remove,
+ .cmd = hmp_hostfwd_remove,
},
#endif
@@ -1371,7 +1371,7 @@ ETEXI
.args_type = "value:M",
.params = "target",
.help = "request VM to change its memory allocation (in MB)",
- .mhandler.cmd = hmp_balloon,
+ .cmd = hmp_balloon,
},
STEXI
@@ -1385,7 +1385,7 @@ ETEXI
.args_type = "name:s,up:b",
.params = "name on|off",
.help = "change the link status of a network adapter",
- .mhandler.cmd = hmp_set_link,
+ .cmd = hmp_set_link,
.command_completion = set_link_completion,
},
@@ -1400,7 +1400,7 @@ ETEXI
.args_type = "action:s",
.params = "[reset|shutdown|poweroff|pause|debug|none]",
.help = "change watchdog action",
- .mhandler.cmd = hmp_watchdog_action,
+ .cmd = hmp_watchdog_action,
.command_completion = watchdog_action_completion,
},
@@ -1415,7 +1415,7 @@ ETEXI
.args_type = "aclname:s",
.params = "aclname",
.help = "list rules in the access control list",
- .mhandler.cmd = hmp_acl_show,
+ .cmd = hmp_acl_show,
},
STEXI
@@ -1432,7 +1432,7 @@ ETEXI
.args_type = "aclname:s,policy:s",
.params = "aclname allow|deny",
.help = "set default access control list policy",
- .mhandler.cmd = hmp_acl_policy,
+ .cmd = hmp_acl_policy,
},
STEXI
@@ -1448,7 +1448,7 @@ ETEXI
.args_type = "aclname:s,match:s,policy:s,index:i?",
.params = "aclname match allow|deny [index]",
.help = "add a match rule to the access control list",
- .mhandler.cmd = hmp_acl_add,
+ .cmd = hmp_acl_add,
},
STEXI
@@ -1467,7 +1467,7 @@ ETEXI
.args_type = "aclname:s,match:s",
.params = "aclname match",
.help = "remove a match rule from the access control list",
- .mhandler.cmd = hmp_acl_remove,
+ .cmd = hmp_acl_remove,
},
STEXI
@@ -1481,7 +1481,7 @@ ETEXI
.args_type = "aclname:s",
.params = "aclname",
.help = "reset the access control list",
- .mhandler.cmd = hmp_acl_reset,
+ .cmd = hmp_acl_reset,
},
STEXI
@@ -1496,7 +1496,7 @@ ETEXI
.args_type = "all:-a,writable:-w,uri:s",
.params = "nbd_server_start [-a] [-w] host:port",
.help = "serve block devices on the given host and port",
- .mhandler.cmd = hmp_nbd_server_start,
+ .cmd = hmp_nbd_server_start,
},
STEXI
@item nbd_server_start @var{host}:@var{port}
@@ -1512,7 +1512,7 @@ ETEXI
.args_type = "writable:-w,device:B",
.params = "nbd_server_add [-w] device",
.help = "export a block device via NBD",
- .mhandler.cmd = hmp_nbd_server_add,
+ .cmd = hmp_nbd_server_add,
},
STEXI
@item nbd_server_add @var{device}
@@ -1527,7 +1527,7 @@ ETEXI
.args_type = "",
.params = "nbd_server_stop",
.help = "stop serving block devices using the NBD protocol",
- .mhandler.cmd = hmp_nbd_server_stop,
+ .cmd = hmp_nbd_server_stop,
},
STEXI
@item nbd_server_stop
@@ -1543,7 +1543,7 @@ ETEXI
.args_type = "broadcast:-b,cpu_index:i,bank:i,status:l,mcg_status:l,addr:l,misc:l",
.params = "[-b] cpu bank status mcgstatus addr misc",
.help = "inject a MCE on the given CPU [and broadcast to other CPUs with -b option]",
- .mhandler.cmd = hmp_mce,
+ .cmd = hmp_mce,
},
#endif
@@ -1558,7 +1558,7 @@ ETEXI
.args_type = "fdname:s",
.params = "getfd name",
.help = "receive a file descriptor via SCM rights and assign it a name",
- .mhandler.cmd = hmp_getfd,
+ .cmd = hmp_getfd,
},
STEXI
@@ -1574,7 +1574,7 @@ ETEXI
.args_type = "fdname:s",
.params = "closefd name",
.help = "close a file descriptor previously passed via SCM rights",
- .mhandler.cmd = hmp_closefd,
+ .cmd = hmp_closefd,
},
STEXI
@@ -1590,7 +1590,7 @@ ETEXI
.args_type = "device:B,password:s",
.params = "block_passwd device password",
.help = "set the password of encrypted block devices",
- .mhandler.cmd = hmp_block_passwd,
+ .cmd = hmp_block_passwd,
},
STEXI
@@ -1604,7 +1604,7 @@ ETEXI
.args_type = "device:B,bps:l,bps_rd:l,bps_wr:l,iops:l,iops_rd:l,iops_wr:l",
.params = "device bps bps_rd bps_wr iops iops_rd iops_wr",
.help = "change I/O throttle limits for a block drive",
- .mhandler.cmd = hmp_block_set_io_throttle,
+ .cmd = hmp_block_set_io_throttle,
},
STEXI
@@ -1618,7 +1618,7 @@ ETEXI
.args_type = "protocol:s,password:s,connected:s?",
.params = "protocol password action-if-connected",
.help = "set spice/vnc password",
- .mhandler.cmd = hmp_set_password,
+ .cmd = hmp_set_password,
},
STEXI
@@ -1637,7 +1637,7 @@ ETEXI
.args_type = "protocol:s,time:s",
.params = "protocol time",
.help = "set spice/vnc password expire-time",
- .mhandler.cmd = hmp_expire_password,
+ .cmd = hmp_expire_password,
},
STEXI
@@ -1668,7 +1668,7 @@ ETEXI
.args_type = "args:s",
.params = "args",
.help = "add chardev",
- .mhandler.cmd = hmp_chardev_add,
+ .cmd = hmp_chardev_add,
.command_completion = chardev_add_completion,
},
@@ -1684,7 +1684,7 @@ ETEXI
.args_type = "id:s",
.params = "id",
.help = "remove chardev",
- .mhandler.cmd = hmp_chardev_remove,
+ .cmd = hmp_chardev_remove,
.command_completion = chardev_remove_completion,
},
@@ -1700,7 +1700,7 @@ ETEXI
.args_type = "device:B,command:s",
.params = "[device] \"[command]\"",
.help = "run a qemu-io command on a block device",
- .mhandler.cmd = hmp_qemu_io,
+ .cmd = hmp_qemu_io,
},
STEXI
@@ -1715,7 +1715,7 @@ ETEXI
.args_type = "id:i",
.params = "id",
.help = "add cpu",
- .mhandler.cmd = hmp_cpu_add,
+ .cmd = hmp_cpu_add,
},
STEXI
@@ -1729,7 +1729,7 @@ ETEXI
.args_type = "path:s?",
.params = "path",
.help = "list QOM properties",
- .mhandler.cmd = hmp_qom_list,
+ .cmd = hmp_qom_list,
},
STEXI
@@ -1742,7 +1742,7 @@ ETEXI
.args_type = "path:s,property:s,value:s",
.params = "path property value",
.help = "set QOM property",
- .mhandler.cmd = hmp_qom_set,
+ .cmd = hmp_qom_set,
},
STEXI
@@ -1755,8 +1755,8 @@ ETEXI
.args_type = "item:s?",
.params = "[subcommand]",
.help = "show various information about the system state",
- .mhandler.cmd = hmp_info_help,
- .sub_table = info_cmds,
+ .cmd = hmp_info_help,
+ .sub_table = info_cmds,
},
STEXI
--
2.10.0
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [Qemu-devel] [PATCH v6 12/18] qapi: remove the "middle" mode
2016-09-12 9:18 [Qemu-devel] [PATCH v6 00/18] qapi: remove the 'middle' mode Marc-André Lureau
` (10 preceding siblings ...)
2016-09-12 9:19 ` [Qemu-devel] [PATCH v6 11/18] monitor: remove mhandler.cmd_new Marc-André Lureau
@ 2016-09-12 9:19 ` Marc-André Lureau
2016-09-12 9:19 ` [Qemu-devel] [PATCH v6 13/18] qapi: check invalid arguments on no-args commands Marc-André Lureau
` (6 subsequent siblings)
18 siblings, 0 replies; 33+ messages in thread
From: Marc-André Lureau @ 2016-09-12 9:19 UTC (permalink / raw)
To: qemu-devel; +Cc: eblake, armbru, Marc-André Lureau
Now that the register function is always generated, we can
remove the so-called "middle" mode from the generator script.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
scripts/qapi-commands.py | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py
index b150db9..eac64ce 100644
--- a/scripts/qapi-commands.py
+++ b/scripts/qapi-commands.py
@@ -206,8 +206,7 @@ class QAPISchemaGenCommandVisitor(QAPISchemaVisitor):
self._visited_ret_types = set()
def visit_end(self):
- if not middle_mode:
- self.defn += gen_registry(self._regy)
+ self.defn += gen_registry(self._regy)
self._regy = None
self._visited_ret_types = None
@@ -221,18 +220,10 @@ class QAPISchemaGenCommandVisitor(QAPISchemaVisitor):
self.defn += gen_marshal_output(ret_type)
self.decl += gen_marshal_decl(name)
self.defn += gen_marshal(name, arg_type, boxed, ret_type)
- if not middle_mode:
- self._regy += gen_register_command(name, success_response)
+ self._regy += gen_register_command(name, success_response)
-middle_mode = False
-
-(input_file, output_dir, do_c, do_h, prefix, opts) = \
- parse_command_line("m", ["middle"])
-
-for o, a in opts:
- if o in ("-m", "--middle"):
- middle_mode = True
+(input_file, output_dir, do_c, do_h, prefix, opts) = parse_command_line()
c_comment = '''
/*
--
2.10.0
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [Qemu-devel] [PATCH v6 13/18] qapi: check invalid arguments on no-args commands
2016-09-12 9:18 [Qemu-devel] [PATCH v6 00/18] qapi: remove the 'middle' mode Marc-André Lureau
` (11 preceding siblings ...)
2016-09-12 9:19 ` [Qemu-devel] [PATCH v6 12/18] qapi: remove the "middle" mode Marc-André Lureau
@ 2016-09-12 9:19 ` Marc-André Lureau
2016-09-12 9:19 ` [Qemu-devel] [PATCH v6 14/18] tests: add a test to check invalid args Marc-André Lureau
` (5 subsequent siblings)
18 siblings, 0 replies; 33+ messages in thread
From: Marc-André Lureau @ 2016-09-12 9:19 UTC (permalink / raw)
To: qemu-devel; +Cc: eblake, armbru, Marc-André Lureau
The generated marshal functions do not visit arguments from commands
that take no arguments. Thus they fail to catch invalid
members. Visit the arguments, if provided, to throw an error in case of
invalid members.
Currently, qmp_check_client_args() checks for invalid arguments and
correctly catches this case. When switching to qmp_dispatch() we want to
keep that behaviour. The commands using 'O' may have arbitrary
arguments, and must have 'gen': false in the qapi schema to skip the
generated checks.
Old/new diff:
void qmp_marshal_stop(QDict *args, QObject **ret, Error **errp)
{
Error *err = NULL;
+ Visitor *v = NULL;
- (void)args;
+ if (args) {
+ v = qmp_input_visitor_new(QOBJECT(args), true);
+ visit_start_struct(v, NULL, NULL, 0, &err);
+ if (err) {
+ goto out;
+ }
+
+ if (!err) {
+ visit_check_struct(v, &err);
+ }
+ visit_end_struct(v, NULL);
+ if (err) {
+ goto out;
+ }
+ }
qmp_stop(&err);
+
+out:
error_propagate(errp, err);
+ visit_free(v);
+ if (args) {
+ v = qapi_dealloc_visitor_new();
+ visit_start_struct(v, NULL, NULL, 0, NULL);
+
+ visit_end_struct(v, NULL);
+ visit_free(v);
+ }
}
The new code closely resembles code for a command with arguments.
Differences:
- the visit of the argument and its cleanup struct don't visit any
members (because there are none).
- the visit of the argument struct and its cleanup are conditional.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
tests/test-qmp-commands.c | 15 ++++++++++++
scripts/qapi-commands.py | 58 +++++++++++++++++++++++++++++++++++------------
2 files changed, 58 insertions(+), 15 deletions(-)
diff --git a/tests/test-qmp-commands.c b/tests/test-qmp-commands.c
index 261fd9e..81cbe54 100644
--- a/tests/test-qmp-commands.c
+++ b/tests/test-qmp-commands.c
@@ -106,6 +106,7 @@ static void test_dispatch_cmd(void)
static void test_dispatch_cmd_failure(void)
{
QDict *req = qdict_new();
+ QDict *args = qdict_new();
QObject *resp;
qdict_put_obj(req, "execute", QOBJECT(qstring_from_str("user_def_cmd2")));
@@ -114,6 +115,20 @@ static void test_dispatch_cmd_failure(void)
assert(resp != NULL);
assert(qdict_haskey(qobject_to_qdict(resp), "error"));
+ qobject_decref(resp);
+ QDECREF(req);
+
+ /* check that with extra arguments it throws an error */
+ req = qdict_new();
+ qdict_put(args, "a", qint_from_int(66));
+ qdict_put(req, "arguments", args);
+
+ qdict_put_obj(req, "execute", QOBJECT(qstring_from_str("user_def_cmd")));
+
+ resp = qmp_dispatch(QOBJECT(req));
+ assert(resp != NULL);
+ assert(qdict_haskey(qobject_to_qdict(resp), "error"));
+
qobject_decref(resp);
QDECREF(req);
}
diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py
index eac64ce..2f603b0 100644
--- a/scripts/qapi-commands.py
+++ b/scripts/qapi-commands.py
@@ -95,6 +95,8 @@ def gen_marshal_decl(name):
def gen_marshal(name, arg_type, boxed, ret_type):
+ have_args = arg_type and not arg_type.is_empty()
+
ret = mcgen('''
%(proto)s
@@ -109,17 +111,31 @@ def gen_marshal(name, arg_type, boxed, ret_type):
''',
c_type=ret_type.c_type())
- if arg_type and not arg_type.is_empty():
+ if have_args:
+ visit_members = ('visit_type_%s_members(v, &arg, &err);'
+ % arg_type.c_name())
ret += mcgen('''
Visitor *v;
%(c_name)s arg = {0};
+''',
+ c_name=arg_type.c_name())
+ else:
+ visit_members = ''
+ ret += mcgen('''
+ Visitor *v = NULL;
+
+ if (args) {
+''')
+ push_indent()
+
+ ret += mcgen('''
v = qmp_input_visitor_new(QOBJECT(args), true);
visit_start_struct(v, NULL, NULL, 0, &err);
if (err) {
goto out;
}
- visit_type_%(c_name)s_members(v, &arg, &err);
+ %(visit_members)s
if (!err) {
visit_check_struct(v, &err);
}
@@ -128,35 +144,47 @@ def gen_marshal(name, arg_type, boxed, ret_type):
goto out;
}
''',
- c_name=arg_type.c_name())
+ visit_members=visit_members)
- else:
+ if not have_args:
+ pop_indent()
ret += mcgen('''
-
- (void)args;
+ }
''')
ret += gen_call(name, arg_type, boxed, ret_type)
- # 'goto out' produced above for arg_type, and by gen_call() for ret_type
- if (arg_type and not arg_type.is_empty()) or ret_type:
- ret += mcgen('''
+ ret += mcgen('''
out:
-''')
- ret += mcgen('''
error_propagate(errp, err);
+ visit_free(v);
''')
- if arg_type and not arg_type.is_empty():
+
+ if have_args:
+ visit_members = ('visit_type_%s_members(v, &arg, NULL);'
+ % arg_type.c_name())
+ else:
+ visit_members = ''
ret += mcgen('''
- visit_free(v);
+ if (args) {
+''')
+ push_indent()
+
+ ret += mcgen('''
v = qapi_dealloc_visitor_new();
visit_start_struct(v, NULL, NULL, 0, NULL);
- visit_type_%(c_name)s_members(v, &arg, NULL);
+ %(visit_members)s
visit_end_struct(v, NULL);
visit_free(v);
''',
- c_name=arg_type.c_name())
+ visit_members=visit_members)
+
+ if not have_args:
+ pop_indent()
+ ret += mcgen('''
+ }
+''')
ret += mcgen('''
}
--
2.10.0
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [Qemu-devel] [PATCH v6 14/18] tests: add a test to check invalid args
2016-09-12 9:18 [Qemu-devel] [PATCH v6 00/18] qapi: remove the 'middle' mode Marc-André Lureau
` (12 preceding siblings ...)
2016-09-12 9:19 ` [Qemu-devel] [PATCH v6 13/18] qapi: check invalid arguments on no-args commands Marc-André Lureau
@ 2016-09-12 9:19 ` Marc-André Lureau
2016-09-12 11:23 ` Markus Armbruster
2016-09-12 9:19 ` [Qemu-devel] [PATCH v6 15/18] monitor: use qmp_dispatch() Marc-André Lureau
` (4 subsequent siblings)
18 siblings, 1 reply; 33+ messages in thread
From: Marc-André Lureau @ 2016-09-12 9:19 UTC (permalink / raw)
To: qemu-devel; +Cc: eblake, armbru, Marc-André Lureau
Check that invalid args on commands without arguments returns an error.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
tests/test-qga.c | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/tests/test-qga.c b/tests/test-qga.c
index 21f44f8..40af649 100644
--- a/tests/test-qga.c
+++ b/tests/test-qga.c
@@ -198,6 +198,26 @@ static void test_qga_ping(gconstpointer fix)
QDECREF(ret);
}
+static void test_qga_invalid_args(gconstpointer fix)
+{
+ const TestFixture *fixture = fix;
+ QDict *ret, *error;
+ const gchar *class, *desc;
+
+ ret = qmp_fd(fixture->fd, "{'execute': 'guest-ping', "
+ "'arguments': {'foo': 42 }}");
+ g_assert_nonnull(ret);
+
+ error = qdict_get_qdict(ret, "error");
+ class = qdict_get_try_str(error, "class");
+ desc = qdict_get_try_str(error, "desc");
+
+ g_assert_cmpstr(class, ==, "GenericError");
+ g_assert_cmpstr(desc, ==, "QMP input object member 'foo' is unexpected");
+
+ QDECREF(ret);
+}
+
static void test_qga_invalid_cmd(gconstpointer fix)
{
const TestFixture *fixture = fix;
@@ -911,6 +931,7 @@ int main(int argc, char **argv)
g_test_add_data_func("/qga/file-write-read", &fix, test_qga_file_write_read);
g_test_add_data_func("/qga/get-time", &fix, test_qga_get_time);
g_test_add_data_func("/qga/invalid-cmd", &fix, test_qga_invalid_cmd);
+ g_test_add_data_func("/qga/invalid-args", &fix, test_qga_invalid_args);
g_test_add_data_func("/qga/fsfreeze-status", &fix,
test_qga_fsfreeze_status);
--
2.10.0
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [Qemu-devel] [PATCH v6 15/18] monitor: use qmp_dispatch()
2016-09-12 9:18 [Qemu-devel] [PATCH v6 00/18] qapi: remove the 'middle' mode Marc-André Lureau
` (13 preceding siblings ...)
2016-09-12 9:19 ` [Qemu-devel] [PATCH v6 14/18] tests: add a test to check invalid args Marc-André Lureau
@ 2016-09-12 9:19 ` Marc-André Lureau
2016-09-20 14:48 ` Alberto Garcia
2016-09-12 9:19 ` [Qemu-devel] [PATCH v6 16/18] build-sys: remove qmp-commands-old.h Marc-André Lureau
` (3 subsequent siblings)
18 siblings, 1 reply; 33+ messages in thread
From: Marc-André Lureau @ 2016-09-12 9:19 UTC (permalink / raw)
To: qemu-devel; +Cc: eblake, armbru, Marc-André Lureau
Replace the old manual dispatch and validation code by the generic one
provided by qapi common code.
Note that it is now possible to call the following commands that used to
be disabled by compile-time conditionals:
- dump-skeys
- query-spice
- rtc-reset-reinjection
- query-gic-capabilities
Their fallback functions return an appropriate "feature disabled" error.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
monitor.c | 326 +++++++----------------------------------------------------
trace-events | 1 -
2 files changed, 34 insertions(+), 293 deletions(-)
diff --git a/monitor.c b/monitor.c
index d5d6e95..8bb8bbf 100644
--- a/monitor.c
+++ b/monitor.c
@@ -166,7 +166,6 @@ struct MonFdset {
};
typedef struct {
- QObject *id;
JSONMessageParser parser;
/*
* When a client connects, we're in capabilities negotiation mode.
@@ -229,8 +228,6 @@ static int mon_refcount;
static mon_cmd_t mon_cmds[];
static mon_cmd_t info_cmds[];
-static const mon_cmd_t qmp_cmds[];
-
Monitor *cur_mon;
static QEMUClockType event_clock_type = QEMU_CLOCK_REALTIME;
@@ -401,49 +398,6 @@ static void monitor_json_emitter(Monitor *mon, const QObject *data)
QDECREF(json);
}
-static QDict *build_qmp_error_dict(Error *err)
-{
- QObject *obj;
-
- obj = qobject_from_jsonf("{ 'error': { 'class': %s, 'desc': %s } }",
- QapiErrorClass_lookup[error_get_class(err)],
- error_get_pretty(err));
-
- return qobject_to_qdict(obj);
-}
-
-static void monitor_protocol_emitter(Monitor *mon, QObject *data,
- Error *err)
-{
- QDict *qmp;
-
- trace_monitor_protocol_emitter(mon);
-
- if (!err) {
- /* success response */
- qmp = qdict_new();
- if (data) {
- qobject_incref(data);
- qdict_put_obj(qmp, "return", data);
- } else {
- /* return an empty QDict by default */
- qdict_put(qmp, "return", qdict_new());
- }
- } else {
- /* error response */
- qmp = build_qmp_error_dict(err);
- }
-
- if (mon->qmp.id) {
- qdict_put_obj(qmp, "id", mon->qmp.id);
- mon->qmp.id = NULL;
- }
-
- monitor_json_emitter(mon, QOBJECT(qmp));
- QDECREF(qmp);
-}
-
-
static MonitorQAPIEventConf monitor_qapi_event_conf[QAPI_EVENT__MAX] = {
/* Limit guest-triggerable events to 1 per second */
[QAPI_EVENT_RTC_CHANGE] = { 1000 * SCALE_MS },
@@ -2211,11 +2165,6 @@ static mon_cmd_t mon_cmds[] = {
{ NULL, NULL, },
};
-static const mon_cmd_t qmp_cmds[] = {
-#include "qmp-commands-old.h"
- { /* NULL */ },
-};
-
/*******************************************************************/
static const char *pch;
@@ -2566,11 +2515,6 @@ static const mon_cmd_t *search_dispatch_table(const mon_cmd_t *disp_table,
return NULL;
}
-static const mon_cmd_t *qmp_find_cmd(const char *cmdname)
-{
- return search_dispatch_table(qmp_cmds, cmdname);
-}
-
/*
* Parse command name from @cmdp according to command table @table.
* If blank, return NULL.
@@ -3721,199 +3665,6 @@ static bool invalid_qmp_mode(const Monitor *mon, const char *cmd,
return false;
}
-/*
- * Argument validation rules:
- *
- * 1. The argument must exist in cmd_args qdict
- * 2. The argument type must be the expected one
- *
- * Special case: If the argument doesn't exist in cmd_args and
- * the QMP_ACCEPT_UNKNOWNS flag is set, then the
- * checking is skipped for it.
- */
-static void check_client_args_type(const QDict *client_args,
- const QDict *cmd_args, int flags,
- Error **errp)
-{
- const QDictEntry *ent;
-
- for (ent = qdict_first(client_args); ent;ent = qdict_next(client_args,ent)){
- QObject *obj;
- QString *arg_type;
- const QObject *client_arg = qdict_entry_value(ent);
- const char *client_arg_name = qdict_entry_key(ent);
-
- obj = qdict_get(cmd_args, client_arg_name);
- if (!obj) {
- if (flags & QMP_ACCEPT_UNKNOWNS) {
- /* handler accepts unknowns */
- continue;
- }
- /* client arg doesn't exist */
- error_setg(errp, QERR_INVALID_PARAMETER, client_arg_name);
- return;
- }
-
- arg_type = qobject_to_qstring(obj);
- assert(arg_type != NULL);
-
- /* check if argument's type is correct */
- switch (qstring_get_str(arg_type)[0]) {
- case 'F':
- case 'B':
- case 's':
- if (qobject_type(client_arg) != QTYPE_QSTRING) {
- error_setg(errp, QERR_INVALID_PARAMETER_TYPE,
- client_arg_name, "string");
- return;
- }
- break;
- case 'i':
- case 'l':
- case 'M':
- case 'o':
- if (qobject_type(client_arg) != QTYPE_QINT) {
- error_setg(errp, QERR_INVALID_PARAMETER_TYPE,
- client_arg_name, "int");
- return;
- }
- break;
- case 'T':
- if (qobject_type(client_arg) != QTYPE_QINT &&
- qobject_type(client_arg) != QTYPE_QFLOAT) {
- error_setg(errp, QERR_INVALID_PARAMETER_TYPE,
- client_arg_name, "number");
- return;
- }
- break;
- case 'b':
- case '-':
- if (qobject_type(client_arg) != QTYPE_QBOOL) {
- error_setg(errp, QERR_INVALID_PARAMETER_TYPE,
- client_arg_name, "bool");
- return;
- }
- break;
- case 'O':
- assert(flags & QMP_ACCEPT_UNKNOWNS);
- break;
- case 'q':
- /* Any QObject can be passed. */
- break;
- case '/':
- case '.':
- /*
- * These types are not supported by QMP and thus are not
- * handled here. Fall through.
- */
- default:
- abort();
- }
- }
-}
-
-/*
- * - Check if the client has passed all mandatory args
- * - Set special flags for argument validation
- */
-static void check_mandatory_args(const QDict *cmd_args,
- const QDict *client_args, int *flags,
- Error **errp)
-{
- const QDictEntry *ent;
-
- for (ent = qdict_first(cmd_args); ent; ent = qdict_next(cmd_args, ent)) {
- const char *cmd_arg_name = qdict_entry_key(ent);
- QString *type = qobject_to_qstring(qdict_entry_value(ent));
- assert(type != NULL);
-
- if (qstring_get_str(type)[0] == 'O') {
- assert((*flags & QMP_ACCEPT_UNKNOWNS) == 0);
- *flags |= QMP_ACCEPT_UNKNOWNS;
- } else if (qstring_get_str(type)[0] != '-' &&
- qstring_get_str(type)[1] != '?' &&
- !qdict_haskey(client_args, cmd_arg_name)) {
- error_setg(errp, QERR_MISSING_PARAMETER, cmd_arg_name);
- return;
- }
- }
-}
-
-static QDict *qdict_from_args_type(const char *args_type)
-{
- int i;
- QDict *qdict;
- QString *key, *type, *cur_qs;
-
- assert(args_type != NULL);
-
- qdict = qdict_new();
-
- if (args_type == NULL || args_type[0] == '\0') {
- /* no args, empty qdict */
- goto out;
- }
-
- key = qstring_new();
- type = qstring_new();
-
- cur_qs = key;
-
- for (i = 0;; i++) {
- switch (args_type[i]) {
- case ',':
- case '\0':
- qdict_put(qdict, qstring_get_str(key), type);
- QDECREF(key);
- if (args_type[i] == '\0') {
- goto out;
- }
- type = qstring_new(); /* qdict has ref */
- cur_qs = key = qstring_new();
- break;
- case ':':
- cur_qs = type;
- break;
- default:
- qstring_append_chr(cur_qs, args_type[i]);
- break;
- }
- }
-
-out:
- return qdict;
-}
-
-/*
- * Client argument checking rules:
- *
- * 1. Client must provide all mandatory arguments
- * 2. Each argument provided by the client must be expected
- * 3. Each argument provided by the client must have the type expected
- * by the command
- */
-static void qmp_check_client_args(const mon_cmd_t *cmd, QDict *client_args,
- Error **errp)
-{
- Error *err = NULL;
- int flags;
- QDict *cmd_args;
-
- cmd_args = qdict_from_args_type(cmd->args_type);
-
- flags = 0;
- check_mandatory_args(cmd_args, client_args, &flags, &err);
- if (err) {
- goto out;
- }
-
- check_client_args_type(client_args, cmd_args, flags, &err);
-
-out:
- error_propagate(errp, err);
- QDECREF(cmd_args);
-}
-
/*
* Input object checking rules
*
@@ -3972,67 +3723,58 @@ static QDict *qmp_check_input_obj(QObject *input_obj, Error **errp)
static void handle_qmp_command(JSONMessageParser *parser, GQueue *tokens)
{
- Error *local_err = NULL;
- QObject *obj, *data;
- QDict *input, *args;
- const mon_cmd_t *cmd;
- QmpCommand *qcmd;
+ QObject *req, *rsp = NULL, *id = NULL;
+ QDict *qdict = NULL;
const char *cmd_name;
Monitor *mon = cur_mon;
+ Error *err = NULL;
- args = input = NULL;
- data = NULL;
-
- obj = json_parser_parse(tokens, NULL);
- if (!obj) {
- // FIXME: should be triggered in json_parser_parse()
- error_setg(&local_err, QERR_JSON_PARSING);
+ req = json_parser_parse_err(tokens, NULL, &err);
+ if (err || !req || qobject_type(req) != QTYPE_QDICT) {
+ if (!err) {
+ error_setg(&err, QERR_JSON_PARSING);
+ }
goto err_out;
}
- input = qmp_check_input_obj(obj, &local_err);
- if (!input) {
- qobject_decref(obj);
+ qdict = qmp_check_input_obj(req, &err);
+ if (!qdict) {
goto err_out;
}
- mon->qmp.id = qdict_get(input, "id");
- qobject_incref(mon->qmp.id);
+ id = qdict_get(qdict, "id");
+ qobject_incref(id);
+ qdict_del(qdict, "id");
- cmd_name = qdict_get_str(input, "execute");
+ cmd_name = qdict_get_str(qdict, "execute");
trace_handle_qmp_command(mon, cmd_name);
- cmd = qmp_find_cmd(cmd_name);
- qcmd = qmp_find_command(cmd_name);
- if (!qcmd || !cmd) {
- error_set(&local_err, ERROR_CLASS_COMMAND_NOT_FOUND,
- "The command %s has not been found", cmd_name);
- goto err_out;
- }
- if (invalid_qmp_mode(mon, cmd_name, &local_err)) {
+
+ if (invalid_qmp_mode(mon, cmd_name, &err)) {
goto err_out;
}
- obj = qdict_get(input, "arguments");
- if (!obj) {
- args = qdict_new();
- } else {
- args = qobject_to_qdict(obj);
- QINCREF(args);
- }
+ rsp = qmp_dispatch(req);
- qmp_check_client_args(cmd, args, &local_err);
- if (local_err) {
- goto err_out;
+err_out:
+ if (err) {
+ qdict = qdict_new();
+ qdict_put_obj(qdict, "error", qmp_build_error_object(err));
+ error_free(err);
+ rsp = QOBJECT(qdict);
}
- qcmd->fn(args, &data, &local_err);
+ if (rsp) {
+ if (id) {
+ qdict_put_obj(qobject_to_qdict(rsp), "id", id);
+ id = NULL;
+ }
-err_out:
- monitor_protocol_emitter(mon, data, local_err);
- qobject_decref(data);
- error_free(local_err);
- QDECREF(input);
- QDECREF(args);
+ monitor_json_emitter(mon, rsp);
+ }
+
+ qobject_decref(id);
+ qobject_decref(rsp);
+ qobject_decref(req);
}
static void monitor_qmp_read(void *opaque, const uint8_t *buf, int size)
diff --git a/trace-events b/trace-events
index 616cc52..8d59631 100644
--- a/trace-events
+++ b/trace-events
@@ -98,7 +98,6 @@ qemu_co_mutex_unlock_return(void *mutex, void *self) "mutex %p self %p"
# monitor.c
handle_qmp_command(void *mon, const char *cmd_name) "mon %p cmd_name \"%s\""
-monitor_protocol_emitter(void *mon) "mon %p"
monitor_protocol_event_handler(uint32_t event, void *qdict) "event=%d data=%p"
monitor_protocol_event_emit(uint32_t event, void *data) "event=%d data=%p"
monitor_protocol_event_queue(uint32_t event, void *qdict, uint64_t rate) "event=%d data=%p rate=%" PRId64
--
2.10.0
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [Qemu-devel] [PATCH v6 16/18] build-sys: remove qmp-commands-old.h
2016-09-12 9:18 [Qemu-devel] [PATCH v6 00/18] qapi: remove the 'middle' mode Marc-André Lureau
` (14 preceding siblings ...)
2016-09-12 9:19 ` [Qemu-devel] [PATCH v6 15/18] monitor: use qmp_dispatch() Marc-André Lureau
@ 2016-09-12 9:19 ` Marc-André Lureau
2016-09-12 9:19 ` [Qemu-devel] [PATCH v6 17/18] qmp-commands.hx: fix some styling Marc-André Lureau
` (2 subsequent siblings)
18 siblings, 0 replies; 33+ messages in thread
From: Marc-André Lureau @ 2016-09-12 9:19 UTC (permalink / raw)
To: qemu-devel; +Cc: eblake, armbru, Marc-André Lureau
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
Makefile.target | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/Makefile.target b/Makefile.target
index 8c7a072..19cc49c 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -156,7 +156,7 @@ else
obj-y += hw/$(TARGET_BASE_ARCH)/
endif
-GENERATED_HEADERS += hmp-commands.h hmp-commands-info.h qmp-commands-old.h
+GENERATED_HEADERS += hmp-commands.h hmp-commands-info.h
endif # CONFIG_SOFTMMU
@@ -209,13 +209,10 @@ hmp-commands.h: $(SRC_PATH)/hmp-commands.hx $(SRC_PATH)/scripts/hxtool
hmp-commands-info.h: $(SRC_PATH)/hmp-commands-info.hx $(SRC_PATH)/scripts/hxtool
$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@," GEN $(TARGET_DIR)$@")
-qmp-commands-old.h: $(SRC_PATH)/qmp-commands.hx $(SRC_PATH)/scripts/hxtool
- $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@," GEN $(TARGET_DIR)$@")
-
clean: clean-target
rm -f *.a *~ $(PROGS)
rm -f $(shell find . -name '*.[od]')
- rm -f hmp-commands.h qmp-commands-old.h gdbstub-xml.c
+ rm -f hmp-commands.h gdbstub-xml.c
ifdef CONFIG_TRACE_SYSTEMTAP
rm -f *.stp
endif
--
2.10.0
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [Qemu-devel] [PATCH v6 17/18] qmp-commands.hx: fix some styling
2016-09-12 9:18 [Qemu-devel] [PATCH v6 00/18] qapi: remove the 'middle' mode Marc-André Lureau
` (15 preceding siblings ...)
2016-09-12 9:19 ` [Qemu-devel] [PATCH v6 16/18] build-sys: remove qmp-commands-old.h Marc-André Lureau
@ 2016-09-12 9:19 ` Marc-André Lureau
2016-09-12 9:19 ` [Qemu-devel] [PATCH v6 18/18] Replace qmp-commands.hx by docs/qmp-commands.txt Marc-André Lureau
2016-09-12 11:46 ` [Qemu-devel] [PATCH v6 00/18] qapi: remove the 'middle' mode Markus Armbruster
18 siblings, 0 replies; 33+ messages in thread
From: Marc-André Lureau @ 2016-09-12 9:19 UTC (permalink / raw)
To: qemu-devel; +Cc: eblake, armbru, Marc-André Lureau
Add some missing lines, remove superflous @ in command name, remove
trailing spaces.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
qmp-commands.hx | 34 ++++++++++++++++++----------------
1 file changed, 18 insertions(+), 16 deletions(-)
diff --git a/qmp-commands.hx b/qmp-commands.hx
index 734f3d7..b38772c 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -91,7 +91,7 @@ eject
Eject a removable medium.
-Arguments:
+Arguments:
- force: force ejection (json-bool, optional)
- device: device name (json-string)
@@ -1395,7 +1395,6 @@ EQMP
},
SQMP
-
block-dirty-bitmap-add
----------------------
Since 2.4
@@ -1422,7 +1421,6 @@ EQMP
},
SQMP
-
block-dirty-bitmap-remove
-------------------------
Since 2.4
@@ -1449,7 +1447,6 @@ EQMP
},
SQMP
-
block-dirty-bitmap-clear
------------------------
Since 2.4
@@ -2176,7 +2173,7 @@ human-monitor-command
Execute a Human Monitor command.
-Arguments:
+Arguments:
- command-line: the command name and its arguments, just like the
Human Monitor's shell (json-string)
@@ -2988,7 +2985,7 @@ Example:
},
"function":0,
"regions":[
-
+
]
},
{
@@ -3005,7 +3002,7 @@ Example:
},
"function":0,
"regions":[
-
+
]
},
{
@@ -3467,8 +3464,8 @@ The main json-object contains the following:
- "setup-time" amount of setup time in milliseconds _before_ the
iterations begin but _after_ the QMP command is issued.
This is designed to provide an accounting of any activities
- (such as RDMA pinning) which may be expensive, but do not
- actually occur during the iterative migration rounds
+ (such as RDMA pinning) which may be expensive, but do not
+ actually occur during the iterative migration rounds
themselves. (json-int)
- "downtime": only present when migration has finished correctly
total amount in ms for downtime that happened (json-int)
@@ -4393,8 +4390,8 @@ EQMP
},
SQMP
-@query-named-block-nodes
-------------------------
+query-named-block-nodes
+-----------------------
Return a list of BlockDeviceInfo for all the named block driver nodes
@@ -4543,7 +4540,7 @@ EQMP
},
SQMP
-@query-memory-devices
+query-memory-devices
--------------------
Return a list of memory devices.
@@ -4561,6 +4558,7 @@ Example:
"slot": 0},
"type": "dimm"
} ] }
+
EQMP
{
@@ -4569,8 +4567,8 @@ EQMP
},
SQMP
-@query-acpi-ospm-status
---------------------
+query-acpi-ospm-status
+----------------------
Return list of ACPIOSTInfo for devices that support status reporting
via ACPI _OST method.
@@ -4582,6 +4580,7 @@ Example:
{ "slot": "2", "slot-type": "DIMM", "source": 0, "status": 0},
{ "slot": "3", "slot-type": "DIMM", "source": 0, "status": 0}
]}
+
EQMP
#if defined TARGET_I386
@@ -4603,6 +4602,7 @@ Example:
-> { "execute": "rtc-reset-reinjection" }
<- { "return": {} }
+
EQMP
{
@@ -4634,6 +4634,7 @@ Example:
-> { "execute": "trace-event-get-state", "arguments": { "name": "qemu_memalign" } }
<- { "return": [ { "name": "qemu_memalign", "state": "disabled" } ] }
+
EQMP
{
@@ -4668,6 +4669,7 @@ Example:
-> { "execute": "trace-event-set-state", "arguments": { "name": "qemu_memalign", "enable": "true" } }
<- { "return": {} }
+
EQMP
{
@@ -4676,8 +4678,8 @@ EQMP
},
SQMP
-@input-send-event
------------------
+input-send-event
+----------------
Send input event to guest.
--
2.10.0
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [Qemu-devel] [PATCH v6 18/18] Replace qmp-commands.hx by docs/qmp-commands.txt
2016-09-12 9:18 [Qemu-devel] [PATCH v6 00/18] qapi: remove the 'middle' mode Marc-André Lureau
` (16 preceding siblings ...)
2016-09-12 9:19 ` [Qemu-devel] [PATCH v6 17/18] qmp-commands.hx: fix some styling Marc-André Lureau
@ 2016-09-12 9:19 ` Marc-André Lureau
2016-09-12 21:22 ` Eric Blake
2016-09-12 21:52 ` Peter Maydell
2016-09-12 11:46 ` [Qemu-devel] [PATCH v6 00/18] qapi: remove the 'middle' mode Markus Armbruster
18 siblings, 2 replies; 33+ messages in thread
From: Marc-André Lureau @ 2016-09-12 9:19 UTC (permalink / raw)
To: qemu-devel; +Cc: eblake, armbru, Marc-André Lureau
The only remaining function of qmp-commands.hx is to let us generate
qmp-commands.txt from it. Replace qmp-commands.hx by qmp-commands.txt.
We intend to move the documentation into the QAPI schema and generate
qapi-commands.txt from it, but not right now.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
Makefile | 6 +-
.gitignore | 1 -
MAINTAINERS | 1 -
docs/qapi-code-gen.txt | 6 +-
qmp-commands.hx => docs/qmp-commands.txt | 1127 ------------------------------
docs/writing-qmp-commands.txt | 38 -
6 files changed, 4 insertions(+), 1175 deletions(-)
rename qmp-commands.hx => docs/qmp-commands.txt (87%)
diff --git a/Makefile b/Makefile
index d8a2891..bac69b2 100644
--- a/Makefile
+++ b/Makefile
@@ -92,7 +92,6 @@ HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF)
ifdef BUILD_DOCS
DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8
-DOCS+=qmp-commands.txt
ifdef CONFIG_VIRTFS
DOCS+=fsdev/virtfs-proxy-helper.1
endif
@@ -432,7 +431,7 @@ endif
install-doc: $(DOCS)
$(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)"
$(INSTALL_DATA) qemu-doc.html qemu-tech.html "$(DESTDIR)$(qemu_docdir)"
- $(INSTALL_DATA) qmp-commands.txt "$(DESTDIR)$(qemu_docdir)"
+ $(INSTALL_DATA) docs/qmp-commands.txt "$(DESTDIR)$(qemu_docdir)"
ifdef CONFIG_POSIX
$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1"
$(INSTALL_DATA) qemu.1 "$(DESTDIR)$(mandir)/man1"
@@ -555,9 +554,6 @@ qemu-monitor.texi: $(SRC_PATH)/hmp-commands.hx $(SRC_PATH)/scripts/hxtool
qemu-monitor-info.texi: $(SRC_PATH)/hmp-commands-info.hx $(SRC_PATH)/scripts/hxtool
$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@," GEN $@")
-qmp-commands.txt: $(SRC_PATH)/qmp-commands.hx $(SRC_PATH)/scripts/hxtool
- $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -q < $< > $@," GEN $@")
-
qemu-img-cmds.texi: $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PATH)/scripts/hxtool
$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@," GEN $@")
diff --git a/.gitignore b/.gitignore
index 88ec249..0ab8263 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,7 +53,6 @@
/qemu-bridge-helper
/qemu-monitor.texi
/qemu-monitor-info.texi
-/qmp-commands.txt
/vscclient
/fsdev/virtfs-proxy-helper
*.[1-9]
diff --git a/MAINTAINERS b/MAINTAINERS
index b6fb84e..84bdc46 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1237,7 +1237,6 @@ M: Markus Armbruster <armbru@redhat.com>
S: Supported
F: qmp.c
F: monitor.c
-F: qmp-commands.hx
F: docs/*qmp-*
F: scripts/qmp/
T: git git://repo.or.cz/qemu/armbru.git qapi-next
diff --git a/docs/qapi-code-gen.txt b/docs/qapi-code-gen.txt
index de298dc..5d4c2cd 100644
--- a/docs/qapi-code-gen.txt
+++ b/docs/qapi-code-gen.txt
@@ -964,9 +964,9 @@ Example:
Used to generate the marshaling/dispatch functions for the commands
defined in the schema. The generated code implements
-qmp_marshal_COMMAND() (mentioned in qmp-commands.hx, and registered
-automatically), and declares qmp_COMMAND() that the user must
-implement. The following files are generated:
+qmp_marshal_COMMAND() (registered automatically), and declares
+qmp_COMMAND() that the user must implement. The following files are
+generated:
$(prefix)qmp-marshal.c: command marshal/dispatch functions for each
QMP command defined in the schema. Functions
diff --git a/qmp-commands.hx b/docs/qmp-commands.txt
similarity index 87%
rename from qmp-commands.hx
rename to docs/qmp-commands.txt
index b38772c..acebeb3 100644
--- a/qmp-commands.hx
+++ b/docs/qmp-commands.txt
@@ -1,8 +1,3 @@
-HXCOMM QMP dispatch table and documentation
-HXCOMM Text between SQMP and EQMP is copied to the QMP documentation file and
-HXCOMM does not show up in the other formats.
-
-SQMP
QMP Supported Commands
----------------------
@@ -58,14 +53,6 @@ If you're planning to adopt QMP, please observe the following:
Server's responses in the examples below are always a success response, please
refer to the QMP specification for more details on error responses.
-EQMP
-
- {
- .name = "quit",
- .args_type = "",
- },
-
-SQMP
quit
----
@@ -78,14 +65,6 @@ Example:
-> { "execute": "quit" }
<- { "return": {} }
-EQMP
-
- {
- .name = "eject",
- .args_type = "force:-f,device:B",
- },
-
-SQMP
eject
-----
@@ -103,14 +82,6 @@ Example:
Note: The "force" argument defaults to false.
-EQMP
-
- {
- .name = "change",
- .args_type = "device:B,target:F,arg:s?",
- },
-
-SQMP
change
------
@@ -138,14 +109,6 @@ Examples:
"arg": "foobar1" } }
<- { "return": {} }
-EQMP
-
- {
- .name = "screendump",
- .args_type = "filename:F",
- },
-
-SQMP
screendump
----------
@@ -160,14 +123,6 @@ Example:
-> { "execute": "screendump", "arguments": { "filename": "/tmp/image" } }
<- { "return": {} }
-EQMP
-
- {
- .name = "stop",
- .args_type = "",
- },
-
-SQMP
stop
----
@@ -180,14 +135,6 @@ Example:
-> { "execute": "stop" }
<- { "return": {} }
-EQMP
-
- {
- .name = "cont",
- .args_type = "",
- },
-
-SQMP
cont
----
@@ -200,14 +147,6 @@ Example:
-> { "execute": "cont" }
<- { "return": {} }
-EQMP
-
- {
- .name = "system_wakeup",
- .args_type = "",
- },
-
-SQMP
system_wakeup
-------------
@@ -220,14 +159,6 @@ Example:
-> { "execute": "system_wakeup" }
<- { "return": {} }
-EQMP
-
- {
- .name = "system_reset",
- .args_type = "",
- },
-
-SQMP
system_reset
------------
@@ -240,14 +171,6 @@ Example:
-> { "execute": "system_reset" }
<- { "return": {} }
-EQMP
-
- {
- .name = "system_powerdown",
- .args_type = "",
- },
-
-SQMP
system_powerdown
----------------
@@ -260,16 +183,6 @@ Example:
-> { "execute": "system_powerdown" }
<- { "return": {} }
-EQMP
-
- {
- .name = "device_add",
- .args_type = "device:O",
- .params = "driver[,prop=value][,...]",
- .help = "add device, like -device on the command line",
- },
-
-SQMP
device_add
----------
@@ -295,14 +208,6 @@ Notes:
(2) It's possible to list device properties by running QEMU with the
"-device DEVICE,\?" command-line argument, where DEVICE is the device's name
-EQMP
-
- {
- .name = "device_del",
- .args_type = "id:s",
- },
-
-SQMP
device_del
----------
@@ -322,14 +227,6 @@ Example:
-> { "execute": "device_del", "arguments": { "id": "/machine/peripheral-anon/device[0]" } }
<- { "return": {} }
-EQMP
-
- {
- .name = "send-key",
- .args_type = "keys:q,hold-time:i?",
- },
-
-SQMP
send-key
----------
@@ -352,14 +249,6 @@ Example:
{ "type": "qcode", "data": "delete" } ] } }
<- { "return": {} }
-EQMP
-
- {
- .name = "cpu",
- .args_type = "index:i",
- },
-
-SQMP
cpu
---
@@ -376,14 +265,6 @@ Example:
Note: CPUs' indexes are obtained with the 'query-cpus' command.
-EQMP
-
- {
- .name = "cpu-add",
- .args_type = "id:i",
- },
-
-SQMP
cpu-add
-------
@@ -398,14 +279,6 @@ Example:
-> { "execute": "cpu-add", "arguments": { "id": 2 } }
<- { "return": {} }
-EQMP
-
- {
- .name = "memsave",
- .args_type = "val:l,size:i,filename:s,cpu:i?",
- },
-
-SQMP
memsave
-------
@@ -426,14 +299,6 @@ Example:
"filename": "/tmp/virtual-mem-dump" } }
<- { "return": {} }
-EQMP
-
- {
- .name = "pmemsave",
- .args_type = "val:l,size:i,filename:s",
- },
-
-SQMP
pmemsave
--------
@@ -453,14 +318,6 @@ Example:
"filename": "/tmp/physical-mem-dump" } }
<- { "return": {} }
-EQMP
-
- {
- .name = "inject-nmi",
- .args_type = "",
- },
-
-SQMP
inject-nmi
----------
@@ -475,14 +332,6 @@ Example:
Note: inject-nmi fails when the guest doesn't support injecting.
-EQMP
-
- {
- .name = "ringbuf-write",
- .args_type = "device:s,data:s,format:s?",
- },
-
-SQMP
ringbuf-write
-------------
@@ -503,14 +352,6 @@ Example:
"format": "utf8" } }
<- { "return": {} }
-EQMP
-
- {
- .name = "ringbuf-read",
- .args_type = "device:s,size:i,format:s?",
- },
-
-SQMP
ringbuf-read
-------------
@@ -538,14 +379,6 @@ Example:
"format": "utf8" } }
<- {"return": "abcdefgh"}
-EQMP
-
- {
- .name = "xen-save-devices-state",
- .args_type = "filename:F",
- },
-
-SQMP
xen-save-devices-state
-------
@@ -564,14 +397,6 @@ Example:
"arguments": { "filename": "/tmp/save" } }
<- { "return": {} }
-EQMP
-
- {
- .name = "xen-load-devices-state",
- .args_type = "filename:F",
- },
-
-SQMP
xen-load-devices-state
----------------------
@@ -590,14 +415,6 @@ Example:
"arguments": { "filename": "/tmp/resume" } }
<- { "return": {} }
-EQMP
-
- {
- .name = "xen-set-global-dirty-log",
- .args_type = "enable:b",
- },
-
-SQMP
xen-set-global-dirty-log
-------
@@ -613,14 +430,6 @@ Example:
"arguments": { "enable": true } }
<- { "return": {} }
-EQMP
-
- {
- .name = "migrate",
- .args_type = "detach:-d,blk:-b,inc:-i,uri:s",
- },
-
-SQMP
migrate
-------
@@ -645,14 +454,6 @@ Notes:
(3) The user Monitor's "detach" argument is invalid in QMP and should not
be used
-EQMP
-
- {
- .name = "migrate_cancel",
- .args_type = "",
- },
-
-SQMP
migrate_cancel
--------------
@@ -665,14 +466,6 @@ Example:
-> { "execute": "migrate_cancel" }
<- { "return": {} }
-EQMP
-
- {
- .name = "migrate-incoming",
- .args_type = "uri:s",
- },
-
-SQMP
migrate-incoming
----------------
@@ -693,13 +486,6 @@ Notes:
be used
(2) The uri format is the same as for -incoming
-EQMP
- {
- .name = "migrate-set-cache-size",
- .args_type = "value:o",
- },
-
-SQMP
migrate-set-cache-size
----------------------
@@ -715,13 +501,6 @@ Example:
-> { "execute": "migrate-set-cache-size", "arguments": { "value": 536870912 } }
<- { "return": {} }
-EQMP
- {
- .name = "migrate-start-postcopy",
- .args_type = "",
- },
-
-SQMP
migrate-start-postcopy
----------------------
@@ -732,14 +511,6 @@ Example:
-> { "execute": "migrate-start-postcopy" }
<- { "return": {} }
-EQMP
-
- {
- .name = "query-migrate-cache-size",
- .args_type = "",
- },
-
-SQMP
query-migrate-cache-size
------------------------
@@ -753,14 +524,6 @@ Example:
-> { "execute": "query-migrate-cache-size" }
<- { "return": 67108864 }
-EQMP
-
- {
- .name = "migrate_set_speed",
- .args_type = "value:o",
- },
-
-SQMP
migrate_set_speed
-----------------
@@ -775,14 +538,6 @@ Example:
-> { "execute": "migrate_set_speed", "arguments": { "value": 1024 } }
<- { "return": {} }
-EQMP
-
- {
- .name = "migrate_set_downtime",
- .args_type = "value:T",
- },
-
-SQMP
migrate_set_downtime
--------------------
@@ -797,16 +552,6 @@ Example:
-> { "execute": "migrate_set_downtime", "arguments": { "value": 0.1 } }
<- { "return": {} }
-EQMP
-
- {
- .name = "client_migrate_info",
- .args_type = "protocol:s,hostname:s,port:i?,tls-port:i?,cert-subject:s?",
- .params = "protocol hostname port tls-port cert-subject",
- .help = "set migration information for remote display",
- },
-
-SQMP
client_migrate_info
-------------------
@@ -830,16 +575,6 @@ Example:
"port": 1234 } }
<- { "return": {} }
-EQMP
-
- {
- .name = "dump-guest-memory",
- .args_type = "paging:b,protocol:s,detach:b?,begin:i?,end:i?,format:s?",
- .params = "-p protocol [-d] [begin] [length] [format]",
- .help = "dump guest memory to file",
- },
-
-SQMP
dump
@@ -870,14 +605,6 @@ Notes:
(1) All boolean arguments default to false
-EQMP
-
- {
- .name = "query-dump-guest-memory-capability",
- .args_type = "",
- },
-
-SQMP
query-dump-guest-memory-capability
----------
@@ -889,16 +616,6 @@ Example:
<- { "return": { "formats":
["elf", "kdump-zlib", "kdump-lzo", "kdump-snappy"] }
-EQMP
-
- {
- .name = "query-dump",
- .args_type = "",
- .params = "",
- .help = "query background dump status",
- },
-
-SQMP
query-dump
----------
@@ -912,16 +629,6 @@ Example:
<- { "return": { "status": "active", "completed": 1024000,
"total": 2048000 } }
-EQMP
-
-#if defined TARGET_S390X
- {
- .name = "dump-skeys",
- .args_type = "filename:F",
- },
-#endif
-
-SQMP
dump-skeys
----------
@@ -936,14 +643,6 @@ Example:
-> { "execute": "dump-skeys", "arguments": { "filename": "/tmp/skeys" } }
<- { "return": {} }
-EQMP
-
- {
- .name = "netdev_add",
- .args_type = "netdev:O",
- },
-
-SQMP
netdev_add
----------
@@ -966,14 +665,6 @@ Note: The supported device options are the same ones supported by the '-netdev'
command-line argument, which are listed in the '-help' output or QEMU's
manual
-EQMP
-
- {
- .name = "netdev_del",
- .args_type = "id:s",
- },
-
-SQMP
netdev_del
----------
@@ -989,14 +680,6 @@ Example:
<- { "return": {} }
-EQMP
-
- {
- .name = "object-add",
- .args_type = "qom-type:s,id:s,props:q?",
- },
-
-SQMP
object-add
----------
@@ -1014,14 +697,6 @@ Example:
"props": { "filename": "/dev/hwrng" } } }
<- { "return": {} }
-EQMP
-
- {
- .name = "object-del",
- .args_type = "id:s",
- },
-
-SQMP
object-del
----------
@@ -1037,15 +712,6 @@ Example:
<- { "return": {} }
-EQMP
-
-
- {
- .name = "block_resize",
- .args_type = "device:s?,node-name:s?,size:o",
- },
-
-SQMP
block_resize
------------
@@ -1062,14 +728,6 @@ Example:
-> { "execute": "block_resize", "arguments": { "device": "scratch", "size": 1073741824 } }
<- { "return": {} }
-EQMP
-
- {
- .name = "block-stream",
- .args_type = "job-id:s?,device:B,base:s?,speed:o?,backing-file:s?,on-error:s?",
- },
-
-SQMP
block-stream
------------
@@ -1106,14 +764,6 @@ Example:
"base": "/tmp/master.qcow2" } }
<- { "return": {} }
-EQMP
-
- {
- .name = "block-commit",
- .args_type = "job-id:s?,device:B,base:s?,top:s?,backing-file:s?,speed:o?",
- },
-
-SQMP
block-commit
------------
@@ -1170,16 +820,6 @@ Example:
"top": "/tmp/snap1.qcow2" } }
<- { "return": {} }
-EQMP
-
- {
- .name = "drive-backup",
- .args_type = "job-id:s?,sync:s,device:B,target:s,speed:i?,mode:s?,"
- "format:s?,bitmap:s?,compress:b?,"
- "on-source-error:s?,on-target-error:s?",
- },
-
-SQMP
drive-backup
------------
@@ -1228,15 +868,6 @@ Example:
"target": "backup.img" } }
<- { "return": {} }
-EQMP
-
- {
- .name = "blockdev-backup",
- .args_type = "job-id:s?,sync:s,device:B,target:B,speed:i?,compress:b?,"
- "on-source-error:s?,on-target-error:s?",
- },
-
-SQMP
blockdev-backup
---------------
@@ -1272,35 +903,6 @@ Example:
"target": "tgt-id" } }
<- { "return": {} }
-EQMP
-
- {
- .name = "block-job-set-speed",
- .args_type = "device:B,speed:o",
- },
-
- {
- .name = "block-job-cancel",
- .args_type = "device:B,force:b?",
- },
- {
- .name = "block-job-pause",
- .args_type = "device:B",
- },
- {
- .name = "block-job-resume",
- .args_type = "device:B",
- },
- {
- .name = "block-job-complete",
- .args_type = "device:B",
- },
- {
- .name = "transaction",
- .args_type = "actions:q,properties:q?",
- },
-
-SQMP
transaction
-----------
@@ -1387,14 +989,6 @@ Example:
"name": "snapshot0" } } ] } }
<- { "return": {} }
-EQMP
-
- {
- .name = "block-dirty-bitmap-add",
- .args_type = "node:B,name:s,granularity:i?",
- },
-
-SQMP
block-dirty-bitmap-add
----------------------
Since 2.4
@@ -1413,14 +1007,6 @@ Example:
"name": "bitmap0" } }
<- { "return": {} }
-EQMP
-
- {
- .name = "block-dirty-bitmap-remove",
- .args_type = "node:B,name:s",
- },
-
-SQMP
block-dirty-bitmap-remove
-------------------------
Since 2.4
@@ -1439,14 +1025,6 @@ Example:
"name": "bitmap0" } }
<- { "return": {} }
-EQMP
-
- {
- .name = "block-dirty-bitmap-clear",
- .args_type = "node:B,name:s",
- },
-
-SQMP
block-dirty-bitmap-clear
------------------------
Since 2.4
@@ -1466,14 +1044,6 @@ Example:
"name": "bitmap0" } }
<- { "return": {} }
-EQMP
-
- {
- .name = "blockdev-snapshot-sync",
- .args_type = "device:s?,node-name:s?,snapshot-file:s,snapshot-node-name:s?,format:s?,mode:s?",
- },
-
-SQMP
blockdev-snapshot-sync
----------------------
@@ -1501,14 +1071,6 @@ Example:
"format": "qcow2" } }
<- { "return": {} }
-EQMP
-
- {
- .name = "blockdev-snapshot",
- .args_type = "node:s,overlay:s",
- },
-
-SQMP
blockdev-snapshot
-----------------
Since 2.5
@@ -1538,14 +1100,6 @@ Example:
"overlay": "node1534" } }
<- { "return": {} }
-EQMP
-
- {
- .name = "blockdev-snapshot-internal-sync",
- .args_type = "device:B,name:s",
- },
-
-SQMP
blockdev-snapshot-internal-sync
-------------------------------
@@ -1567,14 +1121,6 @@ Example:
}
<- { "return": {} }
-EQMP
-
- {
- .name = "blockdev-snapshot-delete-internal-sync",
- .args_type = "device:B,id:s?,name:s?",
- },
-
-SQMP
blockdev-snapshot-delete-internal-sync
--------------------------------------
@@ -1606,18 +1152,6 @@ Example:
}
}
-EQMP
-
- {
- .name = "drive-mirror",
- .args_type = "job-id:s?,sync:s,device:B,target:s,speed:i?,mode:s?,"
- "format:s?,node-name:s?,replaces:s?,"
- "on-source-error:s?,on-target-error:s?,"
- "unmap:b?,"
- "granularity:i?,buf-size:i?",
- },
-
-SQMP
drive-mirror
------------
@@ -1672,16 +1206,6 @@ Example:
"format": "qcow2" } }
<- { "return": {} }
-EQMP
-
- {
- .name = "blockdev-mirror",
- .args_type = "job-id:s?,sync:s,device:B,target:B,replaces:s?,speed:i?,"
- "on-source-error:s?,on-target-error:s?,"
- "granularity:i?,buf-size:i?",
- },
-
-SQMP
blockdev-mirror
------------
@@ -1723,13 +1247,6 @@ Example:
"sync": "full" } }
<- { "return": {} }
-EQMP
- {
- .name = "change-backing-file",
- .args_type = "device:s,image-node-name:s,backing-file:s",
- },
-
-SQMP
change-backing-file
-------------------
Since: 2.1
@@ -1761,14 +1278,6 @@ Arguments:
Returns: Nothing on success
If "device" does not exist or cannot be determined, DeviceNotFound
-EQMP
-
- {
- .name = "balloon",
- .args_type = "value:M",
- },
-
-SQMP
balloon
-------
@@ -1783,14 +1292,6 @@ Example:
-> { "execute": "balloon", "arguments": { "value": 536870912 } }
<- { "return": {} }
-EQMP
-
- {
- .name = "set_link",
- .args_type = "name:s,up:b",
- },
-
-SQMP
set_link
--------
@@ -1806,16 +1307,6 @@ Example:
-> { "execute": "set_link", "arguments": { "name": "e1000.0", "up": false } }
<- { "return": {} }
-EQMP
-
- {
- .name = "getfd",
- .args_type = "fdname:s",
- .params = "getfd name",
- .help = "receive a file descriptor via SCM rights and assign it a name",
- },
-
-SQMP
getfd
-----
@@ -1838,16 +1329,6 @@ Notes:
(2) The 'closefd' command can be used to explicitly close the file
descriptor when it is no longer needed.
-EQMP
-
- {
- .name = "closefd",
- .args_type = "fdname:s",
- .params = "closefd name",
- .help = "close a file descriptor previously passed via SCM rights",
- },
-
-SQMP
closefd
-------
@@ -1862,16 +1343,6 @@ Example:
-> { "execute": "closefd", "arguments": { "fdname": "fd1" } }
<- { "return": {} }
-EQMP
-
- {
- .name = "add-fd",
- .args_type = "fdset-id:i?,opaque:s?",
- .params = "add-fd fdset-id opaque",
- .help = "Add a file descriptor, that was passed via SCM rights, to an fd set",
- },
-
-SQMP
add-fd
-------
@@ -1900,16 +1371,6 @@ Notes:
(1) The list of fd sets is shared by all monitor connections.
(2) If "fdset-id" is not specified, a new fd set will be created.
-EQMP
-
- {
- .name = "remove-fd",
- .args_type = "fdset-id:i,fd:i?",
- .params = "remove-fd fdset-id fd",
- .help = "Remove a file descriptor from an fd set",
- },
-
-SQMP
remove-fd
---------
@@ -1932,15 +1393,6 @@ Notes:
(2) If "fd" is not specified, all file descriptors in "fdset-id" will be
removed.
-EQMP
-
- {
- .name = "query-fdsets",
- .args_type = "",
- .help = "Return information describing all fd sets",
- },
-
-SQMP
query-fdsets
-------------
@@ -1981,14 +1433,6 @@ Example:
Note: The list of fd sets is shared by all monitor connections.
-EQMP
-
- {
- .name = "block_passwd",
- .args_type = "device:s?,node-name:s?,password:s",
- },
-
-SQMP
block_passwd
------------
@@ -2006,14 +1450,6 @@ Example:
"password": "12345" } }
<- { "return": {} }
-EQMP
-
- {
- .name = "block_set_io_throttle",
- .args_type = "device:B,bps:l,bps_rd:l,bps_wr:l,iops:l,iops_rd:l,iops_wr:l,bps_max:l?,bps_rd_max:l?,bps_wr_max:l?,iops_max:l?,iops_rd_max:l?,iops_wr_max:l?,bps_max_length:l?,bps_rd_max_length:l?,bps_wr_max_length:l?,iops_max_length:l?,iops_rd_max_length:l?,iops_wr_max_length:l?,iops_size:l?,group:s?",
- },
-
-SQMP
block_set_io_throttle
------------
@@ -2062,14 +1498,6 @@ Example:
"iops_size": 0 } }
<- { "return": {} }
-EQMP
-
- {
- .name = "set_password",
- .args_type = "protocol:s,password:s,connected:s?",
- },
-
-SQMP
set_password
------------
@@ -2087,14 +1515,6 @@ Example:
"password": "secret" } }
<- { "return": {} }
-EQMP
-
- {
- .name = "expire_password",
- .args_type = "protocol:s,time:s",
- },
-
-SQMP
expire_password
---------------
@@ -2111,14 +1531,6 @@ Example:
"time": "+60" } }
<- { "return": {} }
-EQMP
-
- {
- .name = "add_client",
- .args_type = "protocol:s,fdname:s,skipauth:b?,tls:b?",
- },
-
-SQMP
add_client
----------
@@ -2137,15 +1549,6 @@ Example:
"fdname": "myclient" } }
<- { "return": {} }
-EQMP
- {
- .name = "qmp_capabilities",
- .args_type = "",
- .params = "",
- .help = "enable QMP capabilities",
- },
-
-SQMP
qmp_capabilities
----------------
@@ -2160,14 +1563,6 @@ Example:
Note: This command must be issued before issuing any other command.
-EQMP
-
- {
- .name = "human-monitor-command",
- .args_type = "command-line:s,cpu-index:i?",
- },
-
-SQMP
human-monitor-command
---------------------
@@ -2204,13 +1599,7 @@ Notes:
3. Query Commands
=================
-HXCOMM Each query command below is inside a SQMP/EQMP section, do NOT change
-HXCOMM this! We will possibly move query commands definitions inside those
-HXCOMM sections, just like regular commands.
-
-EQMP
-SQMP
query-version
-------------
@@ -2238,14 +1627,6 @@ Example:
}
}
-EQMP
-
- {
- .name = "query-version",
- .args_type = "",
- },
-
-SQMP
query-commands
--------------
@@ -2274,14 +1655,6 @@ Example:
Note: This example has been shortened as the real response is too long.
-EQMP
-
- {
- .name = "query-commands",
- .args_type = "",
- },
-
-SQMP
query-events
--------------
@@ -2310,14 +1683,6 @@ Example:
Note: This example has been shortened as the real response is too long.
-EQMP
-
- {
- .name = "query-events",
- .args_type = "",
- },
-
-SQMP
query-qmp-schema
----------------
@@ -2326,14 +1691,6 @@ named schema entities. Entities are commands, events and various
types. See docs/qapi-code-gen.txt for information on their structure
and intended use.
-EQMP
-
- {
- .name = "query-qmp-schema",
- .args_type = "",
- },
-
-SQMP
query-chardev
-------------
@@ -2370,14 +1727,6 @@ Example:
]
}
-EQMP
-
- {
- .name = "query-chardev",
- .args_type = "",
- },
-
-SQMP
query-chardev-backends
-------------
@@ -2410,14 +1759,6 @@ Example:
]
}
-EQMP
-
- {
- .name = "query-chardev-backends",
- .args_type = "",
- },
-
-SQMP
query-block
-----------
@@ -2593,14 +1934,6 @@ Example:
]
}
-EQMP
-
- {
- .name = "query-block",
- .args_type = "",
- },
-
-SQMP
query-blockstats
----------------
@@ -2789,14 +2122,6 @@ Example:
]
}
-EQMP
-
- {
- .name = "query-blockstats",
- .args_type = "query-nodes:b?",
- },
-
-SQMP
query-cpus
----------
@@ -2843,14 +2168,6 @@ Example:
]
}
-EQMP
-
- {
- .name = "query-cpus",
- .args_type = "",
- },
-
-SQMP
query-iothreads
---------------
@@ -2881,14 +2198,6 @@ Example:
]
}
-EQMP
-
- {
- .name = "query-iothreads",
- .args_type = "",
- },
-
-SQMP
query-pci
---------
@@ -3097,14 +2406,6 @@ Example:
Note: This example has been shortened as the real response is too long.
-EQMP
-
- {
- .name = "query-pci",
- .args_type = "",
- },
-
-SQMP
query-kvm
---------
@@ -3120,14 +2421,6 @@ Example:
-> { "execute": "query-kvm" }
<- { "return": { "enabled": true, "present": true } }
-EQMP
-
- {
- .name = "query-kvm",
- .args_type = "",
- },
-
-SQMP
query-status
------------
@@ -3159,14 +2452,6 @@ Example:
-> { "execute": "query-status" }
<- { "return": { "running": true, "singlestep": false, "status": "running" } }
-EQMP
-
- {
- .name = "query-status",
- .args_type = "",
- },
-
-SQMP
query-mice
----------
@@ -3202,14 +2487,6 @@ Example:
]
}
-EQMP
-
- {
- .name = "query-mice",
- .args_type = "",
- },
-
-SQMP
query-vnc
---------
@@ -3264,18 +2541,6 @@ Example:
}
}
-EQMP
-
- {
- .name = "query-vnc",
- .args_type = "",
- },
- {
- .name = "query-vnc-servers",
- .args_type = "",
- },
-
-SQMP
query-spice
-----------
@@ -3343,16 +2608,6 @@ Example:
}
}
-EQMP
-
-#if defined(CONFIG_SPICE)
- {
- .name = "query-spice",
- .args_type = "",
- },
-#endif
-
-SQMP
query-name
----------
@@ -3367,14 +2622,6 @@ Example:
-> { "execute": "query-name" }
<- { "return": { "name": "qemu-name" } }
-EQMP
-
- {
- .name = "query-name",
- .args_type = "",
- },
-
-SQMP
query-uuid
----------
@@ -3389,14 +2636,6 @@ Example:
-> { "execute": "query-uuid" }
<- { "return": { "UUID": "550e8400-e29b-41d4-a716-446655440000" } }
-EQMP
-
- {
- .name = "query-uuid",
- .args_type = "",
- },
-
-SQMP
query-command-line-options
--------------------------
@@ -3437,14 +2676,6 @@ Example:
]
}
-EQMP
-
- {
- .name = "query-command-line-options",
- .args_type = "option:s?",
- },
-
-SQMP
query-migrate
-------------
@@ -3614,14 +2845,6 @@ Examples:
}
}
-EQMP
-
- {
- .name = "query-migrate",
- .args_type = "",
- },
-
-SQMP
migrate-set-capabilities
------------------------
@@ -3642,14 +2865,6 @@ Example:
-> { "execute": "migrate-set-capabilities" , "arguments":
{ "capabilities": [ { "capability": "xbzrle", "state": true } ] } }
-EQMP
-
- {
- .name = "migrate-set-capabilities",
- .args_type = "capabilities:q",
- .params = "capability:s,state:b",
- },
-SQMP
query-migrate-capabilities
--------------------------
@@ -3679,14 +2894,6 @@ Example:
{"state": false, "capability": "postcopy-ram"}
]}
-EQMP
-
- {
- .name = "query-migrate-capabilities",
- .args_type = "",
- },
-
-SQMP
migrate-set-parameters
----------------------
@@ -3707,14 +2914,6 @@ Example:
-> { "execute": "migrate-set-parameters" , "arguments":
{ "compress-level": 1 } }
-EQMP
-
- {
- .name = "migrate-set-parameters",
- .args_type =
- "compress-level:i?,compress-threads:i?,decompress-threads:i?,cpu-throttle-initial:i?,cpu-throttle-increment:i?",
- },
-SQMP
query-migrate-parameters
------------------------
@@ -3744,14 +2943,6 @@ Example:
}
}
-EQMP
-
- {
- .name = "query-migrate-parameters",
- .args_type = "",
- },
-
-SQMP
query-balloon
-------------
@@ -3771,96 +2962,6 @@ Example:
}
}
-EQMP
-
- {
- .name = "query-balloon",
- .args_type = "",
- },
-
- {
- .name = "query-block-jobs",
- .args_type = "",
- },
-
- {
- .name = "qom-list",
- .args_type = "path:s",
- },
-
- {
- .name = "qom-set",
- .args_type = "path:s,property:s,value:q",
- },
-
- {
- .name = "qom-get",
- .args_type = "path:s,property:s",
- },
-
- {
- .name = "nbd-server-start",
- .args_type = "addr:q,tls-creds:s?",
- },
- {
- .name = "nbd-server-add",
- .args_type = "device:B,writable:b?",
- },
- {
- .name = "nbd-server-stop",
- .args_type = "",
- },
-
- {
- .name = "change-vnc-password",
- .args_type = "password:s",
- },
- {
- .name = "qom-list-types",
- .args_type = "implements:s?,abstract:b?",
- },
-
- {
- .name = "device-list-properties",
- .args_type = "typename:s",
- },
-
- {
- .name = "query-machines",
- .args_type = "",
- },
-
- {
- .name = "query-cpu-definitions",
- .args_type = "",
- },
-
- {
- .name = "query-cpu-model-expansion",
- .args_type = "type:s,model:q",
- },
-
- {
- .name = "query-cpu-model-comparison",
- .args_type = "modela:q,modelb:q",
- },
-
- {
- .name = "query-cpu-model-baseline",
- .args_type = "modela:q,modelb:q",
- },
-
- {
- .name = "query-target",
- .args_type = "",
- },
-
- {
- .name = "query-tpm",
- .args_type = "",
- },
-
-SQMP
query-tpm
---------
@@ -3886,14 +2987,6 @@ Example:
]
}
-EQMP
-
- {
- .name = "query-tpm-models",
- .args_type = "",
- },
-
-SQMP
query-tpm-models
----------------
@@ -3906,14 +2999,6 @@ Example:
-> { "execute": "query-tpm-models" }
<- { "return": [ "tpm-tis" ] }
-EQMP
-
- {
- .name = "query-tpm-types",
- .args_type = "",
- },
-
-SQMP
query-tpm-types
---------------
@@ -3926,14 +3011,6 @@ Example:
-> { "execute": "query-tpm-types" }
<- { "return": [ "passthrough" ] }
-EQMP
-
- {
- .name = "chardev-add",
- .args_type = "id:s,backend:q",
- },
-
-SQMP
chardev-add
----------------
@@ -3962,15 +3039,6 @@ Examples:
"backend" : { "type" : "pty", "data" : {} } } }
<- { "return": { "pty" : "/dev/pty/42" } }
-EQMP
-
- {
- .name = "chardev-remove",
- .args_type = "id:s",
- },
-
-
-SQMP
chardev-remove
--------------
@@ -3985,13 +3053,6 @@ Example:
-> { "execute": "chardev-remove", "arguments": { "id" : "foo" } }
<- { "return": {} }
-EQMP
- {
- .name = "query-rx-filter",
- .args_type = "name:s?",
- },
-
-SQMP
query-rx-filter
---------------
@@ -4049,14 +3110,6 @@ Example:
]
}
-EQMP
-
- {
- .name = "blockdev-add",
- .args_type = "options:q",
- },
-
-SQMP
blockdev-add
------------
@@ -4107,14 +3160,6 @@ Example (2):
<- { "return": {} }
-EQMP
-
- {
- .name = "x-blockdev-del",
- .args_type = "id:s?,node-name:s?",
- },
-
-SQMP
x-blockdev-del
------------
Since 2.5
@@ -4163,14 +3208,6 @@ Example:
}
<- { "return": {} }
-EQMP
-
- {
- .name = "blockdev-open-tray",
- .args_type = "device:s,force:b?",
- },
-
-SQMP
blockdev-open-tray
------------------
@@ -4210,14 +3247,6 @@ Example:
<- { "return": {} }
-EQMP
-
- {
- .name = "blockdev-close-tray",
- .args_type = "device:s",
- },
-
-SQMP
blockdev-close-tray
-------------------
@@ -4244,14 +3273,6 @@ Example:
<- { "return": {} }
-EQMP
-
- {
- .name = "x-blockdev-remove-medium",
- .args_type = "device:s",
- },
-
-SQMP
x-blockdev-remove-medium
------------------------
@@ -4291,14 +3312,6 @@ Example:
<- { "return": {} }
-EQMP
-
- {
- .name = "x-blockdev-insert-medium",
- .args_type = "device:s,node-name:s",
- },
-
-SQMP
x-blockdev-insert-medium
------------------------
@@ -4330,14 +3343,6 @@ Example:
<- { "return": {} }
-EQMP
-
- {
- .name = "x-blockdev-change",
- .args_type = "parent:B,child:B?,node:B?",
- },
-
-SQMP
x-blockdev-change
-----------------
@@ -4382,14 +3387,6 @@ Delete a quorum's node
"child": "children.1" } }
<- { "return": {} }
-EQMP
-
- {
- .name = "query-named-block-nodes",
- .args_type = "",
- },
-
-SQMP
query-named-block-nodes
-----------------------
@@ -4443,14 +3440,6 @@ Example:
}
} } ] }
-EQMP
-
- {
- .name = "blockdev-change-medium",
- .args_type = "device:B,filename:F,format:s?,read-only-mode:s?",
- },
-
-SQMP
blockdev-change-medium
----------------------
@@ -4495,14 +3484,6 @@ Examples:
<- { "return": {} }
-EQMP
-
- {
- .name = "query-memdev",
- .args_type = "",
- },
-
-SQMP
query-memdev
------------
@@ -4532,14 +3513,6 @@ Example (1):
]
}
-EQMP
-
- {
- .name = "query-memory-devices",
- .args_type = "",
- },
-
-SQMP
query-memory-devices
--------------------
@@ -4559,14 +3532,6 @@ Example:
"type": "dimm"
} ] }
-EQMP
-
- {
- .name = "query-acpi-ospm-status",
- .args_type = "",
- },
-
-SQMP
query-acpi-ospm-status
----------------------
@@ -4581,16 +3546,6 @@ Example:
{ "slot": "3", "slot-type": "DIMM", "source": 0, "status": 0}
]}
-EQMP
-
-#if defined TARGET_I386
- {
- .name = "rtc-reset-reinjection",
- .args_type = "",
- },
-#endif
-
-SQMP
rtc-reset-reinjection
---------------------
@@ -4603,14 +3558,6 @@ Example:
-> { "execute": "rtc-reset-reinjection" }
<- { "return": {} }
-EQMP
-
- {
- .name = "trace-event-get-state",
- .args_type = "name:s,vcpu:i?",
- },
-
-SQMP
trace-event-get-state
---------------------
@@ -4635,14 +3582,6 @@ Example:
-> { "execute": "trace-event-get-state", "arguments": { "name": "qemu_memalign" } }
<- { "return": [ { "name": "qemu_memalign", "state": "disabled" } ] }
-EQMP
-
- {
- .name = "trace-event-set-state",
- .args_type = "name:s,enable:b,ignore-unavailable:b?,vcpu:i?",
- },
-
-SQMP
trace-event-set-state
---------------------
@@ -4670,14 +3609,6 @@ Example:
-> { "execute": "trace-event-set-state", "arguments": { "name": "qemu_memalign", "enable": "true" } }
<- { "return": {} }
-EQMP
-
- {
- .name = "input-send-event",
- .args_type = "console:i?,events:q",
- },
-
-SQMP
input-send-event
----------------
@@ -4733,14 +3664,6 @@ Move mouse pointer to absolute coordinates (20000, 400).
{ "type": "abs", "data" : { "axis": "y", "value" : 400 } } ] } }
<- { "return": {} }
-EQMP
-
- {
- .name = "block-set-write-threshold",
- .args_type = "node-name:s,write-threshold:l",
- },
-
-SQMP
block-set-write-threshold
------------
@@ -4760,14 +3683,6 @@ Example:
"write-threshold": 17179869184 } }
<- { "return": {} }
-EQMP
-
- {
- .name = "query-rocker",
- .args_type = "name:s",
- },
-
-SQMP
Show rocker switch
------------------
@@ -4780,14 +3695,6 @@ Example:
-> { "execute": "query-rocker", "arguments": { "name": "sw1" } }
<- { "return": {"name": "sw1", "ports": 2, "id": 1327446905938}}
-EQMP
-
- {
- .name = "query-rocker-ports",
- .args_type = "name:s",
- },
-
-SQMP
Show rocker switch ports
------------------------
@@ -4804,14 +3711,6 @@ Example:
"autoneg": "off", "link-up": true, "speed": 10000}
]}
-EQMP
-
- {
- .name = "query-rocker-of-dpa-flows",
- .args_type = "name:s,tbl-id:i?",
- },
-
-SQMP
Show rocker switch OF-DPA flow tables
-------------------------------------
@@ -4832,14 +3731,6 @@ Example:
{...more...},
]}
-EQMP
-
- {
- .name = "query-rocker-of-dpa-groups",
- .args_type = "name:s,type:i?",
- },
-
-SQMP
Show rocker OF-DPA group tables
-------------------------------
@@ -4861,16 +3752,6 @@ Example:
"pop-vlan": 1, "id": 251658240}
]}
-EQMP
-
-#if defined TARGET_ARM
- {
- .name = "query-gic-capabilities",
- .args_type = "",
- },
-#endif
-
-SQMP
query-gic-capabilities
---------------
@@ -4885,14 +3766,6 @@ Example:
<- { "return": [{ "version": 2, "emulated": true, "kernel": false },
{ "version": 3, "emulated": false, "kernel": true } ] }
-EQMP
-
- {
- .name = "query-hotpluggable-cpus",
- .args_type = "",
- },
-
-SQMP
Show existing/possible CPUs
---------------------------
diff --git a/docs/writing-qmp-commands.txt b/docs/writing-qmp-commands.txt
index c425393..cfa6fe7 100644
--- a/docs/writing-qmp-commands.txt
+++ b/docs/writing-qmp-commands.txt
@@ -119,16 +119,6 @@ There are a few things to be noticed:
5. Printing to the terminal is discouraged for QMP commands, we do it here
because it's the easiest way to demonstrate a QMP command
-Now a little hack is needed. As we're still using the old QMP server we need
-to add the new command to its internal dispatch table. This step won't be
-required in the near future. Open the qmp-commands.hx file and add the
-following at the bottom:
-
- {
- .name = "hello-world",
- .args_type = "",
- },
-
You're done. Now build qemu, run it as suggested in the "Testing" section,
and then type the following QMP command:
@@ -173,20 +163,6 @@ There are two important details to be noticed:
2. The C implementation signature must follow the schema's argument ordering,
which is defined by the "data" member
-The last step is to update the qmp-commands.hx file:
-
- {
- .name = "hello-world",
- .args_type = "message:s?",
- },
-
-Notice that the "args_type" member got our "message" argument. The character
-"s" stands for "string" and "?" means it's optional. This too must be ordered
-according to the C implementation and schema file. You can look for more
-examples in the qmp-commands.hx file if you need to define more arguments.
-
-Again, this step won't be required in the future.
-
Time to test our new version of the "hello-world" command. Build qemu, run it as
described in the "Testing" section and then send two commands:
@@ -452,13 +428,6 @@ There are a number of things to be noticed:
6. You have to include the "qmp-commands.h" header file in qemu-timer.c,
otherwise qemu won't build
-The last step is to add the corresponding entry in the qmp-commands.hx file:
-
- {
- .name = "query-alarm-clock",
- .args_type = "",
- },
-
Time to test the new command. Build qemu, run it as described in the "Testing"
section and try this:
@@ -597,13 +566,6 @@ iteration of the loop. That's because the alarm timer method in use is the
first element of the alarm_timers array. Also notice that QAPI lists are handled
by hand and we return the head of the list.
-To test this you have to add the corresponding qmp-commands.hx entry:
-
- {
- .name = "query-alarm-methods",
- .args_type = "",
- },
-
Now Build qemu, run it as explained in the "Testing" section and try our new
command:
--
2.10.0
^ permalink raw reply related [flat|nested] 33+ messages in thread
* Re: [Qemu-devel] [PATCH v6 14/18] tests: add a test to check invalid args
2016-09-12 9:19 ` [Qemu-devel] [PATCH v6 14/18] tests: add a test to check invalid args Marc-André Lureau
@ 2016-09-12 11:23 ` Markus Armbruster
0 siblings, 0 replies; 33+ messages in thread
From: Markus Armbruster @ 2016-09-12 11:23 UTC (permalink / raw)
To: Marc-André Lureau; +Cc: qemu-devel
Marc-André Lureau <marcandre.lureau@redhat.com> writes:
> Check that invalid args on commands without arguments returns an error.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> tests/test-qga.c | 21 +++++++++++++++++++++
> 1 file changed, 21 insertions(+)
>
> diff --git a/tests/test-qga.c b/tests/test-qga.c
> index 21f44f8..40af649 100644
> --- a/tests/test-qga.c
> +++ b/tests/test-qga.c
> @@ -198,6 +198,26 @@ static void test_qga_ping(gconstpointer fix)
> QDECREF(ret);
> }
>
> +static void test_qga_invalid_args(gconstpointer fix)
> +{
> + const TestFixture *fixture = fix;
> + QDict *ret, *error;
> + const gchar *class, *desc;
> +
> + ret = qmp_fd(fixture->fd, "{'execute': 'guest-ping', "
> + "'arguments': {'foo': 42 }}");
> + g_assert_nonnull(ret);
> +
> + error = qdict_get_qdict(ret, "error");
> + class = qdict_get_try_str(error, "class");
> + desc = qdict_get_try_str(error, "desc");
> +
> + g_assert_cmpstr(class, ==, "GenericError");
> + g_assert_cmpstr(desc, ==, "QMP input object member 'foo' is unexpected");
We generally refrain from expecting an exact error message in tests, but
this file does it already elsewhere, so no objection.
> +
> + QDECREF(ret);
> +}
> +
> static void test_qga_invalid_cmd(gconstpointer fix)
> {
> const TestFixture *fixture = fix;
> @@ -911,6 +931,7 @@ int main(int argc, char **argv)
> g_test_add_data_func("/qga/file-write-read", &fix, test_qga_file_write_read);
> g_test_add_data_func("/qga/get-time", &fix, test_qga_get_time);
> g_test_add_data_func("/qga/invalid-cmd", &fix, test_qga_invalid_cmd);
> + g_test_add_data_func("/qga/invalid-args", &fix, test_qga_invalid_args);
> g_test_add_data_func("/qga/fsfreeze-status", &fix,
> test_qga_fsfreeze_status);
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [Qemu-devel] [PATCH v6 00/18] qapi: remove the 'middle' mode
2016-09-12 9:18 [Qemu-devel] [PATCH v6 00/18] qapi: remove the 'middle' mode Marc-André Lureau
` (17 preceding siblings ...)
2016-09-12 9:19 ` [Qemu-devel] [PATCH v6 18/18] Replace qmp-commands.hx by docs/qmp-commands.txt Marc-André Lureau
@ 2016-09-12 11:46 ` Markus Armbruster
18 siblings, 0 replies; 33+ messages in thread
From: Markus Armbruster @ 2016-09-12 11:46 UTC (permalink / raw)
To: Marc-André Lureau; +Cc: qemu-devel
Marc-André Lureau <marcandre.lureau@redhat.com> writes:
> Hi,
>
> Although some QMP commands are still not fully qapi'fied, it is
> possible to use more qapi common and generated code by dropping the
> 'middle' mode and use qmp_dispatch().
Applied to qapi-next, thanks!
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [Qemu-devel] [PATCH v6 01/18] build-sys: define QEMU_VERSION_{MAJOR, MINOR, MICRO}
2016-09-12 9:18 ` [Qemu-devel] [PATCH v6 01/18] build-sys: define QEMU_VERSION_{MAJOR, MINOR, MICRO} Marc-André Lureau
@ 2016-09-12 20:05 ` Eric Blake
2016-09-13 7:33 ` Markus Armbruster
0 siblings, 1 reply; 33+ messages in thread
From: Eric Blake @ 2016-09-12 20:05 UTC (permalink / raw)
To: Marc-André Lureau, qemu-devel; +Cc: armbru
[-- Attachment #1: Type: text/plain, Size: 1746 bytes --]
On 09/12/2016 04:18 AM, Marc-André Lureau wrote:
> There are better chances to find what went wrong at build time than a
> later assert in qmp_query_version
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> qmp.c | 16 +++-------------
> scripts/create_config | 6 ++++++
> 2 files changed, 9 insertions(+), 13 deletions(-)
>
> -
> - err = qemu_strtoll(tmp, &tmp, 10, &info->qemu->micro);
> - assert(err == 0);
> + info->qemu->major = QEMU_VERSION_MAJOR;
> + info->qemu->minor = QEMU_VERSION_MINOR;
> + info->qemu->micro = QEMU_VERSION_MICRO;
> info->package = g_strdup(QEMU_PKGVERSION);
>
> return info;
The old code silently ignores any garbage after the third integer (it
populates &tmp, but never checks the value of tmp).
> diff --git a/scripts/create_config b/scripts/create_config
> index 1dd6a35..e6929dd 100755
> --- a/scripts/create_config
> +++ b/scripts/create_config
> @@ -7,7 +7,13 @@ while read line; do
> case $line in
> VERSION=*) # configuration
> version=${line#*=}
> + major=$(echo "$version" | cut -d. -f1)
> + minor=$(echo "$version" | cut -d. -f2)
> + micro=$(echo "$version" | cut -d. -f3)
> echo "#define QEMU_VERSION \"$version\""
> + echo "#define QEMU_VERSION_MAJOR $major"
> + echo "#define QEMU_VERSION_MINOR $minor"
> + echo "#define QEMU_VERSION_MICRO $micro"
The new code likewise ignores any fourth field.
Do we care either way? Unless someone else has a reason for why we
should care, I'm fine with:
Reviewed-by: Eric Blake <eblake@redhat.com>
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [Qemu-devel] [PATCH v6 18/18] Replace qmp-commands.hx by docs/qmp-commands.txt
2016-09-12 9:19 ` [Qemu-devel] [PATCH v6 18/18] Replace qmp-commands.hx by docs/qmp-commands.txt Marc-André Lureau
@ 2016-09-12 21:22 ` Eric Blake
2016-09-13 7:37 ` Markus Armbruster
2016-09-12 21:52 ` Peter Maydell
1 sibling, 1 reply; 33+ messages in thread
From: Eric Blake @ 2016-09-12 21:22 UTC (permalink / raw)
To: Marc-André Lureau, qemu-devel; +Cc: armbru
[-- Attachment #1: Type: text/plain, Size: 1440 bytes --]
On 09/12/2016 04:19 AM, Marc-André Lureau wrote:
> The only remaining function of qmp-commands.hx is to let us generate
> qmp-commands.txt from it. Replace qmp-commands.hx by qmp-commands.txt.
>
> We intend to move the documentation into the QAPI schema and generate
> qapi-commands.txt from it, but not right now.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> Makefile | 6 +-
> .gitignore | 1 -
> MAINTAINERS | 1 -
> docs/qapi-code-gen.txt | 6 +-
> qmp-commands.hx => docs/qmp-commands.txt | 1127 ------------------------------
> docs/writing-qmp-commands.txt | 38 -
> 6 files changed, 4 insertions(+), 1175 deletions(-)
> rename qmp-commands.hx => docs/qmp-commands.txt (87%)
>
> +++ b/MAINTAINERS
> @@ -1237,7 +1237,6 @@ M: Markus Armbruster <armbru@redhat.com>
> S: Supported
> F: qmp.c
> F: monitor.c
> -F: qmp-commands.hx
> F: docs/*qmp-*
> F: scripts/qmp/
> T: git git://repo.or.cz/qemu/armbru.git qapi-next
Shouldn't we be adding F: qmp-commands.txt somewhere to the file in the
interim, at least until the promised later patch lands that once again
generates documentation (this time from .json files)?
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [Qemu-devel] [PATCH v6 18/18] Replace qmp-commands.hx by docs/qmp-commands.txt
2016-09-12 9:19 ` [Qemu-devel] [PATCH v6 18/18] Replace qmp-commands.hx by docs/qmp-commands.txt Marc-André Lureau
2016-09-12 21:22 ` Eric Blake
@ 2016-09-12 21:52 ` Peter Maydell
2016-09-12 22:37 ` Marc-André Lureau
1 sibling, 1 reply; 33+ messages in thread
From: Peter Maydell @ 2016-09-12 21:52 UTC (permalink / raw)
To: Marc-André Lureau; +Cc: QEMU Developers, Markus Armbruster
On 12 September 2016 at 10:19, Marc-André Lureau
<marcandre.lureau@redhat.com> wrote:
> The only remaining function of qmp-commands.hx is to let us generate
> qmp-commands.txt from it. Replace qmp-commands.hx by qmp-commands.txt.
>
> We intend to move the documentation into the QAPI schema and generate
> qapi-commands.txt from it, but not right now.
This is a bit sad, though I see that there were not all that
many actual docstrings to autogenerate from.
What's the plan for reintroducing autogeneration of the
protocol docs?
thanks
-- PMM
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [Qemu-devel] [PATCH v6 18/18] Replace qmp-commands.hx by docs/qmp-commands.txt
2016-09-12 21:52 ` Peter Maydell
@ 2016-09-12 22:37 ` Marc-André Lureau
2016-09-13 7:41 ` Markus Armbruster
0 siblings, 1 reply; 33+ messages in thread
From: Marc-André Lureau @ 2016-09-12 22:37 UTC (permalink / raw)
To: Peter Maydell; +Cc: QEMU Developers, Markus Armbruster
Hi
On Tue, Sep 13, 2016 at 1:54 AM Peter Maydell <peter.maydell@linaro.org>
wrote:
> On 12 September 2016 at 10:19, Marc-André Lureau
> <marcandre.lureau@redhat.com> wrote:
> > The only remaining function of qmp-commands.hx is to let us generate
> > qmp-commands.txt from it. Replace qmp-commands.hx by qmp-commands.txt.
> >
> > We intend to move the documentation into the QAPI schema and generate
> > qapi-commands.txt from it, but not right now.
>
> This is a bit sad, though I see that there were not all that
> many actual docstrings to autogenerate from.
>
> What's the plan for reintroducing autogeneration of the
> protocol docs?
>
>
I'll rebase my qapi-doc branch, do some cleanups, and submit (last update:
https://github.com/elmarco/qemu/commits/qapi-doc). Trouble is the series
got pretty large after I splitted all the documentation move. It's over 150
patches iirc, but it helps a lot with reviewing. Should I send it by
chunks, or should I send a single patch and points to the github branch for
the details? other options?
--
Marc-André Lureau
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [Qemu-devel] [PATCH v6 01/18] build-sys: define QEMU_VERSION_{MAJOR, MINOR, MICRO}
2016-09-12 20:05 ` Eric Blake
@ 2016-09-13 7:33 ` Markus Armbruster
2016-09-13 15:02 ` Eric Blake
0 siblings, 1 reply; 33+ messages in thread
From: Markus Armbruster @ 2016-09-13 7:33 UTC (permalink / raw)
To: Eric Blake; +Cc: Marc-André Lureau, qemu-devel
Eric Blake <eblake@redhat.com> writes:
> On 09/12/2016 04:18 AM, Marc-André Lureau wrote:
>> There are better chances to find what went wrong at build time than a
>> later assert in qmp_query_version
>>
>> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
>> ---
>> qmp.c | 16 +++-------------
>> scripts/create_config | 6 ++++++
>> 2 files changed, 9 insertions(+), 13 deletions(-)
>>
>> diff --git a/qmp.c b/qmp.c
>> index dea8f81..6733463 100644
>> --- a/qmp.c
>> +++ b/qmp.c
>> @@ -51,21 +51,11 @@ NameInfo *qmp_query_name(Error **errp)
>> VersionInfo *qmp_query_version(Error **errp)
>> {
>> VersionInfo *info = g_new0(VersionInfo, 1);
>> - const char *version = QEMU_VERSION;
>> - const char *tmp;
>> - int err;
>>
>> info->qemu = g_new0(VersionTriple, 1);
>> - err = qemu_strtoll(version, &tmp, 10, &info->qemu->major);
>> - assert(err == 0);
>> - tmp++;
>> -
>> - err = qemu_strtoll(tmp, &tmp, 10, &info->qemu->micro);
>> - assert(err == 0);
>> + info->qemu->major = QEMU_VERSION_MAJOR;
>> + info->qemu->minor = QEMU_VERSION_MINOR;
>> + info->qemu->micro = QEMU_VERSION_MICRO;
>> info->package = g_strdup(QEMU_PKGVERSION);
>>
>> return info;
>
> The old code silently ignores any garbage after the third integer (it
> populates &tmp, but never checks the value of tmp).
It also accepts any separator character between the integers, not just
'.'.
>> diff --git a/scripts/create_config b/scripts/create_config
>> index 1dd6a35..e6929dd 100755
>> --- a/scripts/create_config
>> +++ b/scripts/create_config
>> @@ -7,7 +7,13 @@ while read line; do
>> case $line in
>> VERSION=*) # configuration
>> version=${line#*=}
>> + major=$(echo "$version" | cut -d. -f1)
>> + minor=$(echo "$version" | cut -d. -f2)
>> + micro=$(echo "$version" | cut -d. -f3)
>> echo "#define QEMU_VERSION \"$version\""
>> + echo "#define QEMU_VERSION_MAJOR $major"
>> + echo "#define QEMU_VERSION_MINOR $minor"
>> + echo "#define QEMU_VERSION_MICRO $micro"
>
> The new code likewise ignores any fourth field.
Nope:
$ echo "2.7.50garbage" | cut -d. -f3
50garbage
The compiler will choke on
info->qemu->micro = QEMU_VERSION_MICRO;
because it's
info->qemu->micro = 50garbage;
after preprocessing.
The commit message could mention that VERSION is now parsed more
strictly (configure checks '.', the compiler checks integers), but I
guess it's not worth the bother now.
> Do we care either way? Unless someone else has a reason for why we
> should care, I'm fine with:
> Reviewed-by: Eric Blake <eblake@redhat.com>
Does your R-by stand?
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [Qemu-devel] [PATCH v6 18/18] Replace qmp-commands.hx by docs/qmp-commands.txt
2016-09-12 21:22 ` Eric Blake
@ 2016-09-13 7:37 ` Markus Armbruster
0 siblings, 0 replies; 33+ messages in thread
From: Markus Armbruster @ 2016-09-13 7:37 UTC (permalink / raw)
To: Eric Blake; +Cc: Marc-André Lureau, qemu-devel
Eric Blake <eblake@redhat.com> writes:
> On 09/12/2016 04:19 AM, Marc-André Lureau wrote:
>> The only remaining function of qmp-commands.hx is to let us generate
>> qmp-commands.txt from it. Replace qmp-commands.hx by qmp-commands.txt.
>>
>> We intend to move the documentation into the QAPI schema and generate
>> qapi-commands.txt from it, but not right now.
>>
>> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
>> ---
>> Makefile | 6 +-
>> .gitignore | 1 -
>> MAINTAINERS | 1 -
>> docs/qapi-code-gen.txt | 6 +-
>> qmp-commands.hx => docs/qmp-commands.txt | 1127 ------------------------------
>> docs/writing-qmp-commands.txt | 38 -
>> 6 files changed, 4 insertions(+), 1175 deletions(-)
>> rename qmp-commands.hx => docs/qmp-commands.txt (87%)
>>
>
>> +++ b/MAINTAINERS
>> @@ -1237,7 +1237,6 @@ M: Markus Armbruster <armbru@redhat.com>
>> S: Supported
>> F: qmp.c
>> F: monitor.c
>> -F: qmp-commands.hx
>> F: docs/*qmp-*
>> F: scripts/qmp/
>> T: git git://repo.or.cz/qemu/armbru.git qapi-next
>
> Shouldn't we be adding F: qmp-commands.txt somewhere to the file in the
> interim, at least until the promised later patch lands that once again
> generates documentation (this time from .json files)?
It's covered by the existing F: docs/*qmp-* line.
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [Qemu-devel] [PATCH v6 18/18] Replace qmp-commands.hx by docs/qmp-commands.txt
2016-09-12 22:37 ` Marc-André Lureau
@ 2016-09-13 7:41 ` Markus Armbruster
0 siblings, 0 replies; 33+ messages in thread
From: Markus Armbruster @ 2016-09-13 7:41 UTC (permalink / raw)
To: Marc-André Lureau; +Cc: Peter Maydell, QEMU Developers
Marc-André Lureau <marcandre.lureau@gmail.com> writes:
> Hi
>
> On Tue, Sep 13, 2016 at 1:54 AM Peter Maydell <peter.maydell@linaro.org>
> wrote:
>
>> On 12 September 2016 at 10:19, Marc-André Lureau
>> <marcandre.lureau@redhat.com> wrote:
>> > The only remaining function of qmp-commands.hx is to let us generate
>> > qmp-commands.txt from it. Replace qmp-commands.hx by qmp-commands.txt.
>> >
>> > We intend to move the documentation into the QAPI schema and generate
>> > qapi-commands.txt from it, but not right now.
>>
>> This is a bit sad, though I see that there were not all that
>> many actual docstrings to autogenerate from.
Actually no sadder than before. This patch merely drops the parts of
qmp-commands.hx that are no longer used, then renames the result to
docs/qmp-commands.txt. No change to the duplication of docs with the
QAPI schema. The actual de-duplication is in Marc-André's queue.
>> What's the plan for reintroducing autogeneration of the
>> protocol docs?
>>
>>
> I'll rebase my qapi-doc branch, do some cleanups, and submit (last update:
> https://github.com/elmarco/qemu/commits/qapi-doc). Trouble is the series
> got pretty large after I splitted all the documentation move. It's over 150
> patches iirc, but it helps a lot with reviewing. Should I send it by
> chunks, or should I send a single patch and points to the github branch for
> the details? other options?
Let's try chunks.
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [Qemu-devel] [PATCH v6 01/18] build-sys: define QEMU_VERSION_{MAJOR, MINOR, MICRO}
2016-09-13 7:33 ` Markus Armbruster
@ 2016-09-13 15:02 ` Eric Blake
0 siblings, 0 replies; 33+ messages in thread
From: Eric Blake @ 2016-09-13 15:02 UTC (permalink / raw)
To: Markus Armbruster; +Cc: Marc-André Lureau, qemu-devel
[-- Attachment #1: Type: text/plain, Size: 2319 bytes --]
On 09/13/2016 02:33 AM, Markus Armbruster wrote:
>>> info->qemu = g_new0(VersionTriple, 1);
>>> - err = qemu_strtoll(version, &tmp, 10, &info->qemu->major);
>>> - assert(err == 0);
>>> - tmp++;
>>> -
>>
>> The old code silently ignores any garbage after the third integer (it
>> populates &tmp, but never checks the value of tmp).
>
> It also accepts any separator character between the integers, not just
> '.'.
True, and didn't we have a release of qemu a few years ago (perhaps it
was a downstream Red Hat release; I can't quickly find it now...) where
we accidentally released the version string with a comma instead of a dot?
>>> version=${line#*=}
>>> + major=$(echo "$version" | cut -d. -f1)
>>> + minor=$(echo "$version" | cut -d. -f2)
>>> + micro=$(echo "$version" | cut -d. -f3)
>>> echo "#define QEMU_VERSION \"$version\""
>>> + echo "#define QEMU_VERSION_MAJOR $major"
>>> + echo "#define QEMU_VERSION_MINOR $minor"
>>> + echo "#define QEMU_VERSION_MICRO $micro"
>>
>> The new code likewise ignores any fourth field.
>
> Nope:
>
> $ echo "2.7.50garbage" | cut -d. -f3
> 50garbage
That's not a fourth field. I was thinking '2.7.50.0' ignoring '.0'.
>
> The compiler will choke on
>
> info->qemu->micro = QEMU_VERSION_MICRO;
>
> because it's
>
> info->qemu->micro = 50garbage;
>
> after preprocessing.
>
> The commit message could mention that VERSION is now parsed more
> strictly (configure checks '.', the compiler checks integers), but I
> guess it's not worth the bother now.
Indeed, the fact that we now separate on exactly '.' instead of the end
of an integer is different.
>
>> Do we care either way? Unless someone else has a reason for why we
>> should care, I'm fine with:
>> Reviewed-by: Eric Blake <eblake@redhat.com>
>
> Does your R-by stand?
Yes - while the parsing may have changed, it doesn't affect the common
case of a correctly-formed VERSION file. I'm okay if you want to tweak
the commit message to call out a summary of this conversation, but since
the patch is already on qapi-next staging, I'm also okay if it doesn't
change.
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [Qemu-devel] [PATCH v6 15/18] monitor: use qmp_dispatch()
2016-09-12 9:19 ` [Qemu-devel] [PATCH v6 15/18] monitor: use qmp_dispatch() Marc-André Lureau
@ 2016-09-20 14:48 ` Alberto Garcia
2016-09-20 21:58 ` Marc-André Lureau
0 siblings, 1 reply; 33+ messages in thread
From: Alberto Garcia @ 2016-09-20 14:48 UTC (permalink / raw)
To: Marc-André Lureau; +Cc: qemu-devel, eblake, armbru
On Mon, Sep 12, 2016 at 01:19:10PM +0400, Marc-André Lureau wrote:
> Replace the old manual dispatch and validation code by the generic one
> provided by qapi common code.
>
> Note that it is now possible to call the following commands that used to
> be disabled by compile-time conditionals:
> - dump-skeys
> - query-spice
> - rtc-reset-reinjection
> - query-gic-capabilities
>
> Their fallback functions return an appropriate "feature disabled" error.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
This patch breaks iotest 085 because the "missing parameter" error is
now different:
-{"error": {"class": "GenericError", "desc": "Parameter 'snapshot-file' is missing"}}
+{"error": {"class": "GenericError", "desc": "Invalid parameter type for 'snapshot-file', expected: string"}}
I was thinking to update the expected output of the iotest, but I
guess it's better to return a more meaningful error message?
Berto
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [Qemu-devel] [PATCH v6 15/18] monitor: use qmp_dispatch()
2016-09-20 14:48 ` Alberto Garcia
@ 2016-09-20 21:58 ` Marc-André Lureau
2016-09-20 22:00 ` Marc-André Lureau
0 siblings, 1 reply; 33+ messages in thread
From: Marc-André Lureau @ 2016-09-20 21:58 UTC (permalink / raw)
To: Alberto Garcia; +Cc: Marc-André Lureau, qemu-devel, eblake, armbru
Hi Alberto
----- Original Message -----
> On Mon, Sep 12, 2016 at 01:19:10PM +0400, Marc-André Lureau wrote:
> > Replace the old manual dispatch and validation code by the generic one
> > provided by qapi common code.
> >
> > Note that it is now possible to call the following commands that used to
> > be disabled by compile-time conditionals:
> > - dump-skeys
> > - query-spice
> > - rtc-reset-reinjection
> > - query-gic-capabilities
> >
> > Their fallback functions return an appropriate "feature disabled" error.
> >
> > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> This patch breaks iotest 085 because the "missing parameter" error is
> now different:
>
> -{"error": {"class": "GenericError", "desc": "Parameter 'snapshot-file' is
> missing"}}
> +{"error": {"class": "GenericError", "desc": "Invalid parameter type for
> 'snapshot-file', expected: string"}}
>
> I was thinking to update the expected output of the iotest, but I
> guess it's better to return a more meaningful error message?
The change is relatively easy (see attached patch), but there are other tests that expected the current error, see commit fe509ee237307843. I guess we should decided with one, and I think missing parameter is more appropriate.
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [Qemu-devel] [PATCH v6 15/18] monitor: use qmp_dispatch()
2016-09-20 21:58 ` Marc-André Lureau
@ 2016-09-20 22:00 ` Marc-André Lureau
2016-09-21 6:15 ` Markus Armbruster
0 siblings, 1 reply; 33+ messages in thread
From: Marc-André Lureau @ 2016-09-20 22:00 UTC (permalink / raw)
To: Alberto Garcia; +Cc: Marc-André Lureau, qemu-devel, eblake, armbru
[-- Attachment #1: Type: text/plain, Size: 1405 bytes --]
----- Original Message -----
> Hi Alberto
>
> ----- Original Message -----
> > On Mon, Sep 12, 2016 at 01:19:10PM +0400, Marc-André Lureau wrote:
> > > Replace the old manual dispatch and validation code by the generic one
> > > provided by qapi common code.
> > >
> > > Note that it is now possible to call the following commands that used to
> > > be disabled by compile-time conditionals:
> > > - dump-skeys
> > > - query-spice
> > > - rtc-reset-reinjection
> > > - query-gic-capabilities
> > >
> > > Their fallback functions return an appropriate "feature disabled" error.
> > >
> > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> >
> > This patch breaks iotest 085 because the "missing parameter" error is
> > now different:
> >
> > -{"error": {"class": "GenericError", "desc": "Parameter 'snapshot-file' is
> > missing"}}
> > +{"error": {"class": "GenericError", "desc": "Invalid parameter type for
> > 'snapshot-file', expected: string"}}
> >
> > I was thinking to update the expected output of the iotest, but I
> > guess it's better to return a more meaningful error message?
>
> The change is relatively easy (see attached patch), but there are other tests
> that expected the current error, see commit fe509ee237307843. I guess we
> should decided with one, and I think missing parameter is more appropriate.
>
diff attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: qapi-missingp.patch --]
[-- Type: text/x-patch; name=qapi-missingp.patch, Size: 5183 bytes --]
diff --git a/qapi/qmp-input-visitor.c b/qapi/qmp-input-visitor.c
index 64dd392..22b132b 100644
--- a/qapi/qmp-input-visitor.c
+++ b/qapi/qmp-input-visitor.c
@@ -169,7 +169,11 @@ static void qmp_input_start_struct(Visitor *v, const char *name, void **obj,
if (obj) {
*obj = NULL;
}
- if (!qobj || qobject_type(qobj) != QTYPE_QDICT) {
+ if (!qobj) {
+ error_setg(errp, QERR_MISSING_PARAMETER, name ? name : "null");
+ return;
+ }
+ if (qobject_type(qobj) != QTYPE_QDICT) {
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
"QDict");
return;
@@ -194,7 +198,11 @@ static void qmp_input_start_list(Visitor *v, const char *name,
QObject *qobj = qmp_input_get_object(qiv, name, true);
const QListEntry *entry;
- if (!qobj || qobject_type(qobj) != QTYPE_QLIST) {
+ if (!qobj) {
+ error_setg(errp, QERR_MISSING_PARAMETER, name ? name : "null");
+ return;
+ }
+ if (qobject_type(qobj) != QTYPE_QLIST) {
if (list) {
*list = NULL;
}
@@ -234,8 +242,10 @@ static void qmp_input_start_alternate(Visitor *v, const char *name,
QmpInputVisitor *qiv = to_qiv(v);
QObject *qobj = qmp_input_get_object(qiv, name, false);
- if (!qobj) {
+ if (obj) {
*obj = NULL;
+ }
+ if (!qobj) {
error_setg(errp, QERR_MISSING_PARAMETER, name ? name : "null");
return;
}
@@ -250,8 +260,13 @@ static void qmp_input_type_int64(Visitor *v, const char *name, int64_t *obj,
Error **errp)
{
QmpInputVisitor *qiv = to_qiv(v);
- QInt *qint = qobject_to_qint(qmp_input_get_object(qiv, name, true));
+ QObject *qobj = qmp_input_get_object(qiv, name, true);
+ QInt *qint = qobject_to_qint(qobj);
+ if (!qobj) {
+ error_setg(errp, QERR_MISSING_PARAMETER, name ? name : "null");
+ return;
+ }
if (!qint) {
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
"integer");
@@ -266,8 +281,13 @@ static void qmp_input_type_uint64(Visitor *v, const char *name, uint64_t *obj,
{
/* FIXME: qobject_to_qint mishandles values over INT64_MAX */
QmpInputVisitor *qiv = to_qiv(v);
- QInt *qint = qobject_to_qint(qmp_input_get_object(qiv, name, true));
+ QObject *qobj = qmp_input_get_object(qiv, name, true);
+ QInt *qint = qobject_to_qint(qobj);
+ if (!qobj) {
+ error_setg(errp, QERR_MISSING_PARAMETER, name ? name : "null");
+ return;
+ }
if (!qint) {
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
"integer");
@@ -281,8 +301,13 @@ static void qmp_input_type_bool(Visitor *v, const char *name, bool *obj,
Error **errp)
{
QmpInputVisitor *qiv = to_qiv(v);
- QBool *qbool = qobject_to_qbool(qmp_input_get_object(qiv, name, true));
+ QObject *qobj = qmp_input_get_object(qiv, name, true);
+ QBool *qbool = qobject_to_qbool(qobj);
+ if (!qobj) {
+ error_setg(errp, QERR_MISSING_PARAMETER, name ? name : "null");
+ return;
+ }
if (!qbool) {
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
"boolean");
@@ -296,8 +321,16 @@ static void qmp_input_type_str(Visitor *v, const char *name, char **obj,
Error **errp)
{
QmpInputVisitor *qiv = to_qiv(v);
- QString *qstr = qobject_to_qstring(qmp_input_get_object(qiv, name, true));
+ QObject *qobj = qmp_input_get_object(qiv, name, true);
+ QString *qstr = qobject_to_qstring(qobj);
+ if (obj) {
+ *obj = NULL;
+ }
+ if (!qobj) {
+ error_setg(errp, QERR_MISSING_PARAMETER, name ? name : "null");
+ return;
+ }
if (!qstr) {
*obj = NULL;
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
@@ -316,6 +349,10 @@ static void qmp_input_type_number(Visitor *v, const char *name, double *obj,
QInt *qint;
QFloat *qfloat;
+ if (!qobj) {
+ error_setg(errp, QERR_MISSING_PARAMETER, name ? name : "null");
+ return;
+ }
qint = qobject_to_qint(qobj);
if (qint) {
*obj = qint_get_int(qobject_to_qint(qobj));
@@ -338,6 +375,14 @@ static void qmp_input_type_any(Visitor *v, const char *name, QObject **obj,
QmpInputVisitor *qiv = to_qiv(v);
QObject *qobj = qmp_input_get_object(qiv, name, true);
+ if (obj) {
+ *obj = NULL;
+ }
+ if (!qobj) {
+ error_setg(errp, QERR_MISSING_PARAMETER, name ? name : "null");
+ return;
+ }
+
qobject_incref(qobj);
*obj = qobj;
}
@@ -347,6 +392,10 @@ static void qmp_input_type_null(Visitor *v, const char *name, Error **errp)
QmpInputVisitor *qiv = to_qiv(v);
QObject *qobj = qmp_input_get_object(qiv, name, true);
+ if (!qobj) {
+ error_setg(errp, QERR_MISSING_PARAMETER, name ? name : "null");
+ return;
+ }
if (qobject_type(qobj) != QTYPE_QNULL) {
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
"null");
^ permalink raw reply related [flat|nested] 33+ messages in thread
* Re: [Qemu-devel] [PATCH v6 15/18] monitor: use qmp_dispatch()
2016-09-20 22:00 ` Marc-André Lureau
@ 2016-09-21 6:15 ` Markus Armbruster
0 siblings, 0 replies; 33+ messages in thread
From: Markus Armbruster @ 2016-09-21 6:15 UTC (permalink / raw)
To: Marc-André Lureau; +Cc: Alberto Garcia, Marc-André Lureau, qemu-devel
Marc-André Lureau <mlureau@redhat.com> writes:
> ----- Original Message -----
>> Hi Alberto
>>
>> ----- Original Message -----
>> > On Mon, Sep 12, 2016 at 01:19:10PM +0400, Marc-André Lureau wrote:
>> > > Replace the old manual dispatch and validation code by the generic one
>> > > provided by qapi common code.
>> > >
>> > > Note that it is now possible to call the following commands that used to
>> > > be disabled by compile-time conditionals:
>> > > - dump-skeys
>> > > - query-spice
>> > > - rtc-reset-reinjection
>> > > - query-gic-capabilities
>> > >
>> > > Their fallback functions return an appropriate "feature disabled" error.
>> > >
>> > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
>> >
>> > This patch breaks iotest 085 because the "missing parameter" error is
>> > now different:
>> >
>> > -{"error": {"class": "GenericError", "desc": "Parameter 'snapshot-file' is
>> > missing"}}
>> > +{"error": {"class": "GenericError", "desc": "Invalid parameter type for
>> > 'snapshot-file', expected: string"}}
>> >
>> > I was thinking to update the expected output of the iotest, but I
>> > guess it's better to return a more meaningful error message?
>>
>> The change is relatively easy (see attached patch), but there are other tests
>> that expected the current error, see commit fe509ee237307843. I guess we
>> should decided with one, and I think missing parameter is more appropriate.
Agree.
> diff attached
>
> diff --git a/qapi/qmp-input-visitor.c b/qapi/qmp-input-visitor.c
> index 64dd392..22b132b 100644
> --- a/qapi/qmp-input-visitor.c
> +++ b/qapi/qmp-input-visitor.c
> @@ -169,7 +169,11 @@ static void qmp_input_start_struct(Visitor *v, const char *name, void **obj,
> if (obj) {
> *obj = NULL;
> }
> - if (!qobj || qobject_type(qobj) != QTYPE_QDICT) {
> + if (!qobj) {
> + error_setg(errp, QERR_MISSING_PARAMETER, name ? name : "null");
> + return;
> + }
> + if (qobject_type(qobj) != QTYPE_QDICT) {
> error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
> "QDict");
> return;
> @@ -194,7 +198,11 @@ static void qmp_input_start_list(Visitor *v, const char *name,
> QObject *qobj = qmp_input_get_object(qiv, name, true);
> const QListEntry *entry;
>
> - if (!qobj || qobject_type(qobj) != QTYPE_QLIST) {
> + if (!qobj) {
> + error_setg(errp, QERR_MISSING_PARAMETER, name ? name : "null");
> + return;
> + }
> + if (qobject_type(qobj) != QTYPE_QLIST) {
> if (list) {
> *list = NULL;
> }
> @@ -234,8 +242,10 @@ static void qmp_input_start_alternate(Visitor *v, const char *name,
> QmpInputVisitor *qiv = to_qiv(v);
> QObject *qobj = qmp_input_get_object(qiv, name, false);
>
> - if (!qobj) {
> + if (obj) {
> *obj = NULL;
> + }
> + if (!qobj) {
> error_setg(errp, QERR_MISSING_PARAMETER, name ? name : "null");
> return;
> }
> @@ -250,8 +260,13 @@ static void qmp_input_type_int64(Visitor *v, const char *name, int64_t *obj,
> Error **errp)
> {
> QmpInputVisitor *qiv = to_qiv(v);
> - QInt *qint = qobject_to_qint(qmp_input_get_object(qiv, name, true));
> + QObject *qobj = qmp_input_get_object(qiv, name, true);
> + QInt *qint = qobject_to_qint(qobj);
>
> + if (!qobj) {
> + error_setg(errp, QERR_MISSING_PARAMETER, name ? name : "null");
> + return;
> + }
> if (!qint) {
> error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
> "integer");
> @@ -266,8 +281,13 @@ static void qmp_input_type_uint64(Visitor *v, const char *name, uint64_t *obj,
> {
> /* FIXME: qobject_to_qint mishandles values over INT64_MAX */
> QmpInputVisitor *qiv = to_qiv(v);
> - QInt *qint = qobject_to_qint(qmp_input_get_object(qiv, name, true));
> + QObject *qobj = qmp_input_get_object(qiv, name, true);
> + QInt *qint = qobject_to_qint(qobj);
>
> + if (!qobj) {
> + error_setg(errp, QERR_MISSING_PARAMETER, name ? name : "null");
> + return;
> + }
> if (!qint) {
> error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
> "integer");
> @@ -281,8 +301,13 @@ static void qmp_input_type_bool(Visitor *v, const char *name, bool *obj,
> Error **errp)
> {
> QmpInputVisitor *qiv = to_qiv(v);
> - QBool *qbool = qobject_to_qbool(qmp_input_get_object(qiv, name, true));
> + QObject *qobj = qmp_input_get_object(qiv, name, true);
> + QBool *qbool = qobject_to_qbool(qobj);
>
> + if (!qobj) {
> + error_setg(errp, QERR_MISSING_PARAMETER, name ? name : "null");
> + return;
> + }
> if (!qbool) {
> error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
> "boolean");
> @@ -296,8 +321,16 @@ static void qmp_input_type_str(Visitor *v, const char *name, char **obj,
> Error **errp)
> {
> QmpInputVisitor *qiv = to_qiv(v);
> - QString *qstr = qobject_to_qstring(qmp_input_get_object(qiv, name, true));
> + QObject *qobj = qmp_input_get_object(qiv, name, true);
> + QString *qstr = qobject_to_qstring(qobj);
>
> + if (obj) {
> + *obj = NULL;
> + }
> + if (!qobj) {
> + error_setg(errp, QERR_MISSING_PARAMETER, name ? name : "null");
> + return;
> + }
> if (!qstr) {
> *obj = NULL;
> error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
> @@ -316,6 +349,10 @@ static void qmp_input_type_number(Visitor *v, const char *name, double *obj,
> QInt *qint;
> QFloat *qfloat;
>
> + if (!qobj) {
> + error_setg(errp, QERR_MISSING_PARAMETER, name ? name : "null");
> + return;
> + }
> qint = qobject_to_qint(qobj);
> if (qint) {
> *obj = qint_get_int(qobject_to_qint(qobj));
> @@ -338,6 +375,14 @@ static void qmp_input_type_any(Visitor *v, const char *name, QObject **obj,
> QmpInputVisitor *qiv = to_qiv(v);
> QObject *qobj = qmp_input_get_object(qiv, name, true);
>
> + if (obj) {
> + *obj = NULL;
> + }
> + if (!qobj) {
> + error_setg(errp, QERR_MISSING_PARAMETER, name ? name : "null");
> + return;
> + }
> +
> qobject_incref(qobj);
> *obj = qobj;
> }
> @@ -347,6 +392,10 @@ static void qmp_input_type_null(Visitor *v, const char *name, Error **errp)
> QmpInputVisitor *qiv = to_qiv(v);
> QObject *qobj = qmp_input_get_object(qiv, name, true);
>
> + if (!qobj) {
> + error_setg(errp, QERR_MISSING_PARAMETER, name ? name : "null");
> + return;
> + }
> if (qobject_type(qobj) != QTYPE_QNULL) {
> error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
> "null");
Changing qmp_input_get_object() to take an Error * parameter and set the
"Parameter FOO is missing" error could require less code. Suggest to
give it a try and see how you like it.
Need a proper patch to merge this regression fix.
^ permalink raw reply [flat|nested] 33+ messages in thread
end of thread, other threads:[~2016-09-21 6:15 UTC | newest]
Thread overview: 33+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-12 9:18 [Qemu-devel] [PATCH v6 00/18] qapi: remove the 'middle' mode Marc-André Lureau
2016-09-12 9:18 ` [Qemu-devel] [PATCH v6 01/18] build-sys: define QEMU_VERSION_{MAJOR, MINOR, MICRO} Marc-André Lureau
2016-09-12 20:05 ` Eric Blake
2016-09-13 7:33 ` Markus Armbruster
2016-09-13 15:02 ` Eric Blake
2016-09-12 9:18 ` [Qemu-devel] [PATCH v6 02/18] qapi-schema: use generated marshaller for 'qmp_capabilities' Marc-André Lureau
2016-09-12 9:18 ` [Qemu-devel] [PATCH v6 03/18] qapi-schema: add 'device_add' Marc-André Lureau
2016-09-12 9:18 ` [Qemu-devel] [PATCH v6 04/18] monitor: simplify invalid_qmp_mode() Marc-André Lureau
2016-09-12 9:19 ` [Qemu-devel] [PATCH v6 05/18] monitor: register gen:false commands manually Marc-André Lureau
2016-09-12 9:19 ` [Qemu-devel] [PATCH v6 06/18] qapi: Support unregistering QMP commands Marc-André Lureau
2016-09-12 9:19 ` [Qemu-devel] [PATCH v6 07/18] qmp: Hack to keep commands configuration-specific Marc-André Lureau
2016-09-12 9:19 ` [Qemu-devel] [PATCH v6 08/18] qapi: export the marshallers Marc-André Lureau
2016-09-12 9:19 ` [Qemu-devel] [PATCH v6 09/18] monitor: use qmp_find_command() (using generated qapi code) Marc-André Lureau
2016-09-12 9:19 ` [Qemu-devel] [PATCH v6 10/18] monitor: implement 'qmp_query_commands' without qmp_cmds Marc-André Lureau
2016-09-12 9:19 ` [Qemu-devel] [PATCH v6 11/18] monitor: remove mhandler.cmd_new Marc-André Lureau
2016-09-12 9:19 ` [Qemu-devel] [PATCH v6 12/18] qapi: remove the "middle" mode Marc-André Lureau
2016-09-12 9:19 ` [Qemu-devel] [PATCH v6 13/18] qapi: check invalid arguments on no-args commands Marc-André Lureau
2016-09-12 9:19 ` [Qemu-devel] [PATCH v6 14/18] tests: add a test to check invalid args Marc-André Lureau
2016-09-12 11:23 ` Markus Armbruster
2016-09-12 9:19 ` [Qemu-devel] [PATCH v6 15/18] monitor: use qmp_dispatch() Marc-André Lureau
2016-09-20 14:48 ` Alberto Garcia
2016-09-20 21:58 ` Marc-André Lureau
2016-09-20 22:00 ` Marc-André Lureau
2016-09-21 6:15 ` Markus Armbruster
2016-09-12 9:19 ` [Qemu-devel] [PATCH v6 16/18] build-sys: remove qmp-commands-old.h Marc-André Lureau
2016-09-12 9:19 ` [Qemu-devel] [PATCH v6 17/18] qmp-commands.hx: fix some styling Marc-André Lureau
2016-09-12 9:19 ` [Qemu-devel] [PATCH v6 18/18] Replace qmp-commands.hx by docs/qmp-commands.txt Marc-André Lureau
2016-09-12 21:22 ` Eric Blake
2016-09-13 7:37 ` Markus Armbruster
2016-09-12 21:52 ` Peter Maydell
2016-09-12 22:37 ` Marc-André Lureau
2016-09-13 7:41 ` Markus Armbruster
2016-09-12 11:46 ` [Qemu-devel] [PATCH v6 00/18] qapi: remove the 'middle' mode Markus Armbruster
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.