Skip to contentSkip to conversation

monitor: convert do_device_del() to QObject, QError

PATCH Superseded Markus Armbruster 2 participants 3 messages Mar 17, 2010 – Mar 19, 2010

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 monitor: convert do_device_del() to QObject, QError

---
 hw/qdev.c       |    7 ++++---
 hw/qdev.h       |    2 +-
 qemu-monitor.hx |    3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)
hw/qdev.c +4 -3
index 17a46a7..35460eb 100644
@@ -800,15 +800,16 @@ 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 0;
 }
hw/qdev.h +1 -1
index 9475705..40373c8 100644
@@ -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
index 5308f36..d290b4b 100644
@@ -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
#1 lore raw
Quoted 20 lines · On Wed, 17 Mar 2010 17:46:07 +0100 Markus Armbruster <[email protected]> wrote:
---
 hw/qdev.c       |    7 ++++---
 hw/qdev.h       |    2 +-
 qemu-monitor.hx |    3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)
hw/qdev.c +1 -1
index 17a46a7..35460eb 100644
@@ -800,15 +800,16 @@ 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");

hw/qdev.c int do_device_add(Monitor *mon, const QDict *qdict, QObject **ret_data) · line 813

Quoted 10 lines
hw/qdev.c +2 -2
     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);

This function can fail, otherwise looks good.

Quoted 29 lines
hw/qdev.c +1 -0
+    return 0;
 }
hw/qdev.h +1 -1
index 9475705..40373c8 100644
@@ -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
index 5308f36..d290b4b 100644
@@ -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
#2 lore raw
Quoted 25 lines · Luiz Capitulino
Quoted 22 lines · On Wed, 17 Mar 2010 17:46:07 +0100 Markus Armbruster <[email protected]> wrote:
---
 hw/qdev.c       |    7 ++++---
 hw/qdev.h       |    2 +-
 qemu-monitor.hx |    3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)
hw/qdev.c +1 -1
index 17a46a7..35460eb 100644
@@ -800,15 +800,16 @@ 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;
 
Quoted 10 lines

hw/qdev.c int do_device_add(Monitor *mon, const QDict *qdict, QObject **ret_data) · line 813

Quoted 8 lines
hw/qdev.c +2 -2
     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);

This function can fail, otherwise looks good.

Thanks, will fix.

[...]