[Qemu-devel] [PATCH v2 0/2] monitor: convert do_device_del() to QObject, QError

[Qemu-devel] [PATCH v2 0/2] monitor: convert do_device_del() to QObject, QError

[Markus Armbruster]

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(-)

[Qemu-devel] [PATCH v2 1/2] qdev: Convert qdev_unplug() to QError

[Markus Armbruster]

Note: our device unplug methods don't need conversion work, because
they can't currently fail.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 hw/qdev.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/hw/qdev.c b/hw/qdev.c
index f45ed0f..c521115 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -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);
-- 
1.6.6.1

[Qemu-devel] [PATCH v2 2/2] monitor: convert do_device_del() to QObject, QError

[Markus Armbruster]

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 hw/qdev.c       |    8 ++++----
 hw/qdev.h       |    2 +-
 qemu-monitor.hx |    3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/hw/qdev.c b/hw/qdev.c
index c521115..d3bf0fa 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -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);
 }
diff --git a/hw/qdev.h b/hw/qdev.h
index 9475705..40373c8 100644
--- a/hw/qdev.h
+++ b/hw/qdev.h
@@ -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 ***/
 
diff --git a/qemu-monitor.hx b/qemu-monitor.hx
index ff5f099..31087bd 100644
--- a/qemu-monitor.hx
+++ b/qemu-monitor.hx
@@ -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
-- 
1.6.6.1

[Qemu-devel] Re: [PATCH v2 0/2] monitor: convert do_device_del() to QObject, QError

[Luiz Capitulino]

On Mon, 22 Mar 2010 11:38:12 +0100
Markus Armbruster <armbru@redhat.com> wrote:

> v2: Supply a missing error conversion pointed out by Luiz

 It looks ok now.

> 
> 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(-)
>