mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qdev: Collect HMP handlers command handlers in qdev-monitor.c

Browse Source 
Move hmp_device_add(), hmp_device_del() from monitor/hmp-cmds.c to
qdev-monitor.c, where they are covered by MAINTAINERS section "QOM",
just like qapi/qdev.json.  hmp_info_qtree() and hmp_info_qdm() are
already there.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20190709185936.31335-1-armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
This commit is contained in:
Markus Armbruster 2019-07-09 20:59:36 +02:00
parent ffaee83bcb
commit d94bd0927e
2 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
monitor/hmp-cmds.c
View File

@ -25,7 +25,6 @@
#include "qemu/timer.h" #include "qemu/timer.h"
#include "qemu/sockets.h" #include "qemu/sockets.h"
#include "monitor/monitor-internal.h" #include "monitor/monitor-internal.h"
#include "monitor/qdev.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/clone-visitor.h" #include "qapi/clone-visitor.h"
#include "qapi/opts-visitor.h" #include "qapi/opts-visitor.h"
@ -35,7 +34,6 @@
#include "qapi/qapi-commands-migration.h" #include "qapi/qapi-commands-migration.h"
#include "qapi/qapi-commands-misc.h" #include "qapi/qapi-commands-misc.h"
#include "qapi/qapi-commands-net.h" #include "qapi/qapi-commands-net.h"
#include "qapi/qapi-commands-qdev.h"
#include "qapi/qapi-commands-rocker.h" #include "qapi/qapi-commands-rocker.h"
#include "qapi/qapi-commands-run-state.h" #include "qapi/qapi-commands-run-state.h"
#include "qapi/qapi-commands-tpm.h" #include "qapi/qapi-commands-tpm.h"
@ -2167,23 +2165,6 @@ void hmp_migrate(Monitor *mon, const QDict *qdict)
} }
} }
void hmp_device_add(Monitor *mon, const QDict *qdict)
{
Error *err = NULL;
qmp_device_add((QDict *)qdict, NULL, &err);
hmp_handle_error(mon, &err);
}
void hmp_device_del(Monitor *mon, const QDict *qdict)
{
const char *id = qdict_get_str(qdict, "id");
Error *err = NULL;
qmp_device_del(id, &err);
hmp_handle_error(mon, &err);
}
void hmp_netdev_add(Monitor *mon, const QDict *qdict) void hmp_netdev_add(Monitor *mon, const QDict *qdict)
{ {
Error *err = NULL; Error *err = NULL;

18
qdev-monitor.c
View File

@ -19,6 +19,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "monitor/hmp.h"
#include "monitor/monitor.h" #include "monitor/monitor.h"
#include "monitor/qdev.h" #include "monitor/qdev.h"
#include "sysemu/arch_init.h" #include "sysemu/arch_init.h"
@ -844,6 +845,23 @@ void qmp_device_del(const char *id, Error **errp)
} }
} }
void hmp_device_add(Monitor *mon, const QDict *qdict)
{
Error *err = NULL;
qmp_device_add((QDict *)qdict, NULL, &err);
hmp_handle_error(mon, &err);
}
void hmp_device_del(Monitor *mon, const QDict *qdict)
{
const char *id = qdict_get_str(qdict, "id");
Error *err = NULL;
qmp_device_del(id, &err);
hmp_handle_error(mon, &err);
}
BlockBackend *blk_by_qdev_id(const char *id, Error **errp) BlockBackend *blk_by_qdev_id(const char *id, Error **errp)
{ {
DeviceState *dev; DeviceState *dev;