From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nyt1Y-0001rF-JF for qemu-devel@nongnu.org; Mon, 05 Apr 2010 16:35:56 -0400 Received: from [140.186.70.92] (port=49416 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nyt1G-0001WQ-Vg for qemu-devel@nongnu.org; Mon, 05 Apr 2010 16:35:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Nyszy-0001aC-9z for qemu-devel@nongnu.org; Mon, 05 Apr 2010 16:34:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:14067) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Nyszx-0001a4-VS for qemu-devel@nongnu.org; Mon, 05 Apr 2010 16:34:18 -0400 From: Luiz Capitulino Date: Mon, 5 Apr 2010 17:33:43 -0300 Message-Id: <1270499642-31543-3-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1270499642-31543-1-git-send-email-lcapitulino@redhat.com> References: <1270499642-31543-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 02/21] monitor: convert do_device_del() to QObject, QError List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: aliguori@us.ibm.com Cc: Luiz Capitulino , qemu-devel@nongnu.org, Markus Armbruster From: Markus Armbruster Signed-off-by: Markus Armbruster Signed-off-by: Luiz Capitulino --- 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 0612dc0..5ca126b 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 5308f36..d290b4b 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.7.0.4.297.g6555b1