qdev: Collect HMP handlers command handlers in qdev-monitor.c
PATCH 1/1 qdev: Collect HMP handlers command handlers in qdev-monitor.c
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.
---
This is a follow-up to my "Move QOM, qdev, machine core and dump code" series, merged in commit 374f63f6810.
monitor/hmp-cmds.c | 19 ------------------- qdev-monitor.c | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 19 deletions(-)
monitor/hmp-cmds.c +0 -19
@@ -25,7 +25,6 @@#include "qemu/timer.h" #include "qemu/sockets.h" #include "monitor/monitor-internal.h" -#include "monitor/qdev.h" #include "qapi/error.h" #include "qapi/clone-visitor.h" #include "qapi/opts-visitor.h"
@@ -35,7 +34,6 @@#include "qapi/qapi-commands-migration.h" #include "qapi/qapi-commands-misc.h" #include "qapi/qapi-commands-net.h" -#include "qapi/qapi-commands-qdev.h" #include "qapi/qapi-commands-rocker.h" #include "qapi/qapi-commands-run-state.h" #include "qapi/qapi-commands-tpm.h"
@@ -2181,23 +2179,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) {Error *err =NULL ;
qdev-monitor.c +18 -0
@@ -20,6 +20,7 @@#include "qemu/osdep.h" #include "hw/qdev.h" #include "hw/sysbus.h" +#include "monitor/hmp.h" #include "monitor/monitor.h" #include "monitor/qdev.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) {DeviceState *dev;
Signature · 1 line
2.21.0
Quoted 85 lines · Markus Armbruster
Move
hmp_device_add(),hmp_device_del()frommonitor/hmp-cmds.ctoqdev-monitor.c, where they are covered byMAINTAINERSsection "QOM", just likeqapi/qdev.json.hmp_info_qtree()andhmp_info_qdm()are already there.Signed-off-by Markus Armbruster <[email protected]>---
This is a follow-up to my "Move QOM, qdev, machine core and dump code" series, merged in commit374f63f6810.monitor/hmp-cmds.c | 19 ------------------- qdev-monitor.c | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 19 deletions(-)monitor/hmp-cmds.c +0
-19@@ -25,7 +25,6 @@#include "qemu/timer.h" #include "qemu/sockets.h" #include "monitor/monitor-internal.h" -#include "monitor/qdev.h" #include "qapi/error.h" #include "qapi/clone-visitor.h" #include "qapi/opts-visitor.h" @@ -35,7 +34,6 @@#include "qapi/qapi-commands-migration.h" #include "qapi/qapi-commands-misc.h" #include "qapi/qapi-commands-net.h" -#include "qapi/qapi-commands-qdev.h" #include "qapi/qapi-commands-rocker.h" #include "qapi/qapi-commands-run-state.h" #include "qapi/qapi-commands-tpm.h" @@ -2181,23 +2179,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) {Error *err =NULL ;qdev-monitor.c +11
-0@@ -20,6 +20,7 @@#include "qemu/osdep.h" #include "hw/qdev.h" #include "hw/sysbus.h" +#include "monitor/hmp.h" #include "monitor/monitor.h" #include "monitor/qdev.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) +{
qdev-monitor.c void qmp_device_del(const char *id, Error **errp) · line 867
Quoted 10 lines
qdev-monitor.c +7
-0+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) {DeviceState *dev;
Quoted 6 lines · Markus Armbruster
Move
hmp_device_add(),hmp_device_del()frommonitor/hmp-cmds.ctoqdev-monitor.c, where they are covered byMAINTAINERSsection "QOM", just likeqapi/qdev.json.hmp_info_qtree()andhmp_info_qdm()are already there.Signed-off-by Markus Armbruster <[email protected]>
Queued for 4.2.