From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nm1si-0001ui-JV for qemu-devel@nongnu.org; Mon, 01 Mar 2010 04:25:40 -0500 Received: from [199.232.76.173] (port=52317 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nm1si-0001uS-5Y for qemu-devel@nongnu.org; Mon, 01 Mar 2010 04:25:40 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1Nm1sg-0008T8-Nk for qemu-devel@nongnu.org; Mon, 01 Mar 2010 04:25:39 -0500 Received: from mx1.redhat.com ([209.132.183.28]:51094) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Nm1sg-0008T0-9x for qemu-devel@nongnu.org; Mon, 01 Mar 2010 04:25:38 -0500 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o219Pb0O006083 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 1 Mar 2010 04:25:37 -0500 From: Markus Armbruster Subject: Re: [Qemu-devel] [PATCH RFC 48/48] monitor: convert do_device_add() to QObject References: <1267034160-3517-1-git-send-email-armbru@redhat.com> <1267034160-3517-49-git-send-email-armbru@redhat.com> <20100226164725.1b60299b@redhat.com> Date: Mon, 01 Mar 2010 10:25:35 +0100 In-Reply-To: <20100226164725.1b60299b@redhat.com> (Luiz Capitulino's message of "Fri, 26 Feb 2010 16:47:25 -0300") Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Luiz Capitulino Cc: qemu-devel@nongnu.org Luiz Capitulino writes: > On Wed, 24 Feb 2010 18:56:00 +0100 > Markus Armbruster wrote: > >> >> 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; >> } > > We need at least basic documentation of the accepted parameters and > an example, just like all others QMP-enabled handlers. Fair enough. [...]