From patchwork Wed Feb 24 17:56:00 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 46163 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D2895B6F11 for ; Thu, 25 Feb 2010 05:30:10 +1100 (EST) Received: from localhost ([127.0.0.1]:54746 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NkLzr-0004rc-Ha for incoming@patchwork.ozlabs.org; Wed, 24 Feb 2010 13:30:07 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NkLbA-0001hi-1v for qemu-devel@nongnu.org; Wed, 24 Feb 2010 13:04:36 -0500 Received: from [199.232.76.173] (port=52936 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NkLb9-0001hP-D0 for qemu-devel@nongnu.org; Wed, 24 Feb 2010 13:04:35 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NkLb6-0008WI-KE for qemu-devel@nongnu.org; Wed, 24 Feb 2010 13:04:34 -0500 Received: from oxygen.pond.sub.org ([213.239.205.148]:55050) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NkLb6-0008UR-0R for qemu-devel@nongnu.org; Wed, 24 Feb 2010 13:04:32 -0500 Received: from blackfin.pond.sub.org (pD9E38C12.dip.t-dialin.net [217.227.140.18]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 1EF4D276DA1 for ; Wed, 24 Feb 2010 19:04:30 +0100 (CET) Received: by blackfin.pond.sub.org (Postfix, from userid 500) id BC9EFE8; Wed, 24 Feb 2010 18:56:03 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Wed, 24 Feb 2010 18:56:00 +0100 Message-Id: <1267034160-3517-49-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.6.6 In-Reply-To: <1267034160-3517-1-git-send-email-armbru@redhat.com> References: <1267034160-3517-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Subject: [Qemu-devel] [PATCH RFC 48/48] monitor: convert do_device_add() to QObject X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Markus Armbruster --- hw/qdev.c | 29 +++++++++++++++++++++-------- hw/qdev.h | 2 +- qemu-monitor.hx | 3 ++- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/hw/qdev.c b/hw/qdev.c index bcd989c..a631492 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -586,7 +586,9 @@ static BusState *qbus_find(const char *path) dev = qbus_find_dev(bus, elem); if (!dev) { qemu_error_new(QERR_DEVICE_NOT_FOUND, elem); - qbus_list_dev(bus); + if (!in_qmp_mon()) { + qbus_list_dev(bus); + } return NULL; } @@ -605,7 +607,9 @@ static BusState *qbus_find(const char *path) return QLIST_FIRST(&dev->child_bus); default: qemu_error_new(QERR_DEVICE_MULTIPLE_BUSSES, elem); - qbus_list_bus(dev); + if (!in_qmp_mon()) { + qbus_list_bus(dev); + } return NULL; } } @@ -619,7 +623,9 @@ static BusState *qbus_find(const char *path) bus = qbus_find_bus(dev, elem); if (!bus) { qemu_error_new(QERR_BUS_NOT_FOUND, elem); - qbus_list_bus(dev); + if (!in_qmp_mon()) { + qbus_list_bus(dev); + } return NULL; } } @@ -762,16 +768,23 @@ void do_info_qdm(Monitor *mon) } } -void do_device_add(Monitor *mon, const QDict *qdict) +int do_device_add(Monitor *mon, const QDict *qdict, QObject **ret_data) { QemuOpts *opts; opts = qemu_opts_from_qdict(&qemu_device_opts, qdict); - if (opts) { - if (qdev_device_help(opts) || qdev_device_add(opts) == NULL) { - qemu_opts_del(opts); - } + if (!opts) { + return -1; } + if (!in_qmp_mon() && qdev_device_help(opts)) { + qemu_opts_del(opts); + return 0; + } + if (!qdev_device_add(opts)) { + qemu_opts_del(opts); + return -1; + } + return 0; } void do_device_del(Monitor *mon, const QDict *qdict) diff --git a/hw/qdev.h b/hw/qdev.h index 0eb45b0..c86a59d 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -171,7 +171,7 @@ void qbus_free(BusState *bus); void do_info_qtree(Monitor *mon); void do_info_qdm(Monitor *mon); -void do_device_add(Monitor *mon, const QDict *qdict); +int do_device_add(Monitor *mon, const QDict *qdict, QObject **ret_data); void do_device_del(Monitor *mon, const QDict *qdict); /*** qdev-properties.c ***/ diff --git a/qemu-monitor.hx b/qemu-monitor.hx index 641a8ef..e67ab20 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -573,7 +573,8 @@ ETEXI .args_type = "device:O", .params = "driver[,prop=value],[,...]", .help = "add device, like -device on the command line", - .mhandler.cmd = do_device_add, + .user_print = monitor_user_noop, + .mhandler.cmd_new = do_device_add, }, STEXI