monitor: convert do_device_del() to QObject, QError
v2 cover monitor: convert do_device_del() to QObject, QError
v2: Supply a missing error conversion pointed out by Luiz
Markus Armbruster (2):
qdev: Convert qdev_unplug() to QError
monitor: convert do_device_del() to QObject, QError
hw/qdev.c | 11 +++++------ hw/qdev.h | 2 +- qemu-monitor.hx | 3 ++- 3 files changed, 8 insertions(+), 8 deletions(-)
PATCH v2 1/2 qdev: Convert qdev_unplug() to QError
Note: our device unplug methods don't need conversion work, because they can't currently fail.
Signed-off-by Markus Armbruster <[email protected]>
--- hw/qdev.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
hw/qdev.c +1 -2
@@ -287,8 +287,7 @@ int qdev_init(DeviceState *dev)int qdev_unplug (DeviceState *dev) {if (!dev->parent_bus->allow_hotplug) { -error_report ("Bus %s does not support hotplugging" , - dev->parent_bus->name); +qerror_report (QERR_BUS_NO_HOTPLUG , dev->parent_bus->name);return -1 ; }assert (dev->info->unplug !=NULL );
Signature · 1 line
1.6.6.1
PATCH v2 2/2 monitor: convert do_device_del() to QObject, QError
In reply to Markus ArmbrusterSigned-off-by Markus Armbruster <[email protected]>
--- hw/qdev.c | 8 ++++---- hw/qdev.h | 2 +- qemu-monitor.hx | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-)
hw/qdev.c +4 -4
@@ -799,15 +799,15 @@ int do_device_add(Monitor *mon, const QDict *qdict, QObject **ret_data)return 0 ; } -void do_device_del (Monitor *mon,const QDict *qdict) +int do_device_del (Monitor *mon,const QDict *qdict,QObject **ret_data) {const char *id =qdict_get_str (qdict,"id" );DeviceState *dev; dev =qdev_find_recursive (main_system_bus, id);if (NULL == dev) { -error_report ("Device '%s' not found" , id); -return ; +qerror_report (QERR_DEVICE_NOT_FOUND , id); +return -1 ; } -qdev_unplug (dev); +return qdev_unplug (dev); }
hw/qdev.h +1 -1
@@ -176,7 +176,7 @@ void qbus_free(BusState *bus);void do_info_qtree (Monitor *mon);void do_info_qdm (Monitor *mon);int do_device_add (Monitor *mon,const QDict *qdict,QObject **ret_data); -void do_device_del (Monitor *mon,const QDict *qdict); +int do_device_del (Monitor *mon,const QDict *qdict,QObject **ret_data);/*** qdev-properties.c ***/
qemu-monitor.hx +2 -1
@@ -589,7 +589,8 @@ ETEXI .args_type = "id:s", .params = "device", .help = "remove device", - .mhandler.cmd = do_device_del, + .user_print = monitor_user_noop, + .mhandler.cmd_new = do_device_del, }, STEXI
Signature · 1 line
1.6.6.1
Quoted 1 line · On Mon, 22 Mar 2010 11:38:12 +0100 Markus Armbruster <[email protected]> wrote:
v2: Supply a missing error conversion pointed out by Luiz
It looks ok now.
Quoted 10 lines
Markus Armbruster (2):
qdev: Convertqdev_unplug()to QError
monitor: convertdo_device_del()to QObject, QErrorhw/qdev.c | 11 +++++------ hw/qdev.h | 2 +- qemu-monitor.hx | 3 ++- 3 files changed, 8 insertions(+), 8 deletions(-)