diff options
| author | Markus Armbruster | 2015-03-13 17:25:50 +0100 |
|---|---|---|
| committer | Markus Armbruster | 2015-06-22 18:20:40 +0200 |
| commit | 485febc6d1382a82e4e1640729fffbf0c1392a44 (patch) | |
| tree | 04991a2c4a003ea6a7e79eeb3c86cec0f9a43137 /util | |
| parent | tpm: Avoid qerror_report() outside QMP command handlers (diff) | |
| download | qemu-485febc6d1382a82e4e1640729fffbf0c1392a44.tar.gz qemu-485febc6d1382a82e4e1640729fffbf0c1392a44.tar.xz qemu-485febc6d1382a82e4e1640729fffbf0c1392a44.zip | |
qmp: Wean off qerror_report()
The traditional QMP command handler interface
int qmp_FOO(Monitor *mon, const QDict *params, QObject **ret_data);
doesn't provide for returning an Error object. Instead, the handler
is expected to stash it in the monitor with qerror_report().
When we rebased QMP on top of QAPI, we didn't change this interface.
Instead, commit 776574d introduced "middle mode" as a temporary aid
for converting existing QMP commands to QAPI one by one. More than
three years later, we're still using it.
Middle mode has two effects:
* Instead of the native input marshallers
static void qmp_marshal_input_FOO(QDict *, QObject **, Error **)
it generates input marshallers conforming to the traditional QMP
command handler interface.
* It suppresses generation of code to register them with
qmp_register_command()
This permits giving them internal linkage.
As long as we need qmp-commands.hx, we can't use the registry behind
qmp_register_command(), so the latter has to stay for now.
The former has to go to get rid of qerror_report(). Changing all QMP
commands to fit the QAPI mold in one go was impractical back when we
started, but by now there are just a few stragglers left:
do_qmp_capabilities(), qmp_qom_set(), qmp_qom_get(), qmp_object_add(),
qmp_netdev_add(), do_device_add().
Switch middle mode to generate native input marshallers, and adapt the
stragglers. Simplifies both the monitor code and the stragglers.
Rename do_qmp_capabilities() to qmp_capabilities(), and
do_device_add() to qmp_device_add, because that's how QMP command
handlers are named today.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>
Diffstat (limited to 'util')
| -rw-r--r-- | util/qemu-error.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/util/qemu-error.c b/util/qemu-error.c index 9bba5f53d8..16d2d07649 100644 --- a/util/qemu-error.c +++ b/util/qemu-error.c @@ -202,7 +202,7 @@ bool enable_timestamp_msg; * Format arguments like vsprintf(). The result should not contain * newlines. * Prepend the current location and append a newline. - * It's wrong to call this in a QMP monitor. Use qerror_report() there. + * It's wrong to call this in a QMP monitor. Use error_setg() there. */ void error_vreport(const char *fmt, va_list ap) { @@ -226,7 +226,7 @@ void error_vreport(const char *fmt, va_list ap) * Format arguments like sprintf(). The result should not contain * newlines. * Prepend the current location and append a newline. - * It's wrong to call this in a QMP monitor. Use qerror_report() there. + * It's wrong to call this in a QMP monitor. Use error_setg() there. */ void error_report(const char *fmt, ...) { |