From patchwork Fri Jan 29 18:49: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: 44006 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 2052DB7D21 for ; Sat, 30 Jan 2010 05:53:10 +1100 (EST) Received: from localhost ([127.0.0.1]:48123 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Navxr-0006hT-Fg for incoming@patchwork.ozlabs.org; Fri, 29 Jan 2010 13:53:07 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Navu4-0005g2-QG for qemu-devel@nongnu.org; Fri, 29 Jan 2010 13:49:13 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Navu0-0005c9-ST for qemu-devel@nongnu.org; Fri, 29 Jan 2010 13:49:12 -0500 Received: from [199.232.76.173] (port=37792 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Navu0-0005bh-B9 for qemu-devel@nongnu.org; Fri, 29 Jan 2010 13:49:08 -0500 Received: from oxygen.pond.sub.org ([213.239.205.148]:53375) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Navtz-0008A0-IV for qemu-devel@nongnu.org; Fri, 29 Jan 2010 13:49:07 -0500 Received: from blackfin.pond.sub.org (pD9E39E9E.dip.t-dialin.net [217.227.158.158]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 2071A2DD30B; Fri, 29 Jan 2010 19:49:04 +0100 (CET) Received: by blackfin.pond.sub.org (Postfix, from userid 500) id A97E5421; Fri, 29 Jan 2010 19:49:02 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 29 Jan 2010 19:49:00 +0100 Message-Id: <1264790942-15045-6-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.6.6 In-Reply-To: <1264790942-15045-1-git-send-email-armbru@redhat.com> References: <1264790942-15045-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: Subject: [Qemu-devel] [PATCH 5/7] qdev: Add help for device properties 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 Option "-device DRIVER,?" and monitor command "device_add DRIVER,?" print the supported properties instead of creating a device. The former also terminates the program. This is commit 2ba6edf0 (just reverted) done right. Signed-off-by: Markus Armbruster --- hw/qdev.c | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/hw/qdev.c b/hw/qdev.c index f47f0cb..7c3701c 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -158,6 +158,7 @@ int qdev_device_help(QemuOpts *opts) const char *driver; DeviceInfo *info; char msg[256]; + Property *prop; driver = qemu_opt_get(opts, "driver"); if (driver && !strcmp(driver, "?")) { @@ -168,7 +169,19 @@ int qdev_device_help(QemuOpts *opts) return 1; } - return 0; + if (!qemu_opt_get(opts, "?")) { + return 0; + } + + info = qdev_find_info(NULL, driver); + if (!info) { + return 0; + } + + for (prop = info->props; prop && prop->name; prop++) { + qemu_error("%s.%s\n", info->name, prop->name); + } + return 1; } DeviceState *qdev_device_add(QemuOpts *opts)