From patchwork Thu Mar 4 15:57:10 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 46943 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 A6BF6B7DC8 for ; Fri, 5 Mar 2010 03:53:00 +1100 (EST) Received: from localhost ([127.0.0.1]:53581 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NnEIB-0003aJ-Uh for incoming@patchwork.ozlabs.org; Thu, 04 Mar 2010 11:52:56 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NnDQw-0000oM-QV for qemu-devel@nongnu.org; Thu, 04 Mar 2010 10:57:54 -0500 Received: from [199.232.76.173] (port=35977 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NnDQs-0000l8-HR for qemu-devel@nongnu.org; Thu, 04 Mar 2010 10:57:50 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NnDQd-0000Nh-7E for qemu-devel@nongnu.org; Thu, 04 Mar 2010 10:57:50 -0500 Received: from oxygen.pond.sub.org ([213.239.205.148]:39656) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NnDQb-0000L1-Bx for qemu-devel@nongnu.org; Thu, 04 Mar 2010 10:57:33 -0500 Received: from blackfin.pond.sub.org (pD9E38041.dip.t-dialin.net [217.227.128.65]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 93F872DD329 for ; Thu, 4 Mar 2010 16:57:17 +0100 (CET) Received: by blackfin.pond.sub.org (Postfix, from userid 500) id 1340133B; Thu, 4 Mar 2010 16:57:14 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Thu, 4 Mar 2010 16:57:10 +0100 Message-Id: <1267718231-13303-50-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <1267718231-13303-1-git-send-email-armbru@redhat.com> References: <1267718231-13303-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: Luiz Capitulino Subject: [Qemu-devel] [PATCH 49/50] monitor: Use argument type 'O' for device_add 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 While there, improve the params help text. Signed-off-by: Markus Armbruster --- hw/qdev.c | 3 +-- qemu-monitor.hx | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/qdev.c b/hw/qdev.c index 1edfce8..241f204 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -766,8 +766,7 @@ void do_device_add(Monitor *mon, const QDict *qdict) { QemuOpts *opts; - opts = qemu_opts_parse(&qemu_device_opts, - qdict_get_str(qdict, "config"), 1); + 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); diff --git a/qemu-monitor.hx b/qemu-monitor.hx index 7f9d261..45e5fd1 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -570,8 +570,8 @@ ETEXI { .name = "device_add", - .args_type = "config:s", - .params = "device", + .args_type = "device:O", + .params = "driver[,prop=value][,...]", .help = "add device, like -device on the command line", .mhandler.cmd = do_device_add, },