2012-08-10 21:00:43 +04:00
|
|
|
#ifndef QEMU_QDEV_MONITOR_H
|
|
|
|
|
#define QEMU_QDEV_MONITOR_H
|
|
|
|
|
|
2013-02-04 14:37:52 +04:00
|
|
|
#include "hw/qdev-core.h"
|
2015-03-17 20:16:21 +03:00
|
|
|
#include "qemu/typedefs.h"
|
2012-08-10 21:00:43 +04:00
|
|
|
|
|
|
|
|
/*** monitor commands ***/
|
|
|
|
|
|
2015-02-06 16:18:24 +03:00
|
|
|
void hmp_info_qtree(Monitor *mon, const QDict *qdict);
|
|
|
|
|
void hmp_info_qdm(Monitor *mon, const QDict *qdict);
|
2014-05-07 19:03:18 +04:00
|
|
|
void hmp_info_qom_tree(Monitor *mon, const QDict *dict);
|
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>
2015-03-13 19:25:50 +03:00
|
|
|
void qmp_device_add(QDict *qdict, QObject **ret_data, Error **errp);
|
|
|
|
|
|
2012-08-10 21:00:43 +04:00
|
|
|
int qdev_device_help(QemuOpts *opts);
|
2015-03-12 16:00:41 +03:00
|
|
|
DeviceState *qdev_device_add(QemuOpts *opts, Error **errp);
|
2012-08-10 21:00:43 +04:00
|
|
|
|
|
|
|
|
#endif
|