From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Navu6-0005gv-3U for qemu-devel@nongnu.org; Fri, 29 Jan 2010 13:49:14 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Navty-0005aA-VE for qemu-devel@nongnu.org; Fri, 29 Jan 2010 13:49:11 -0500 Received: from [199.232.76.173] (port=37785 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Navty-0005Zv-Op for qemu-devel@nongnu.org; Fri, 29 Jan 2010 13:49:06 -0500 Received: from oxygen.pond.sub.org ([213.239.205.148]:53365) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Navtx-000892-J7 for qemu-devel@nongnu.org; Fri, 29 Jan 2010 13:49:05 -0500 From: Markus Armbruster Date: Fri, 29 Jan 2010 19:48:59 +0100 Message-Id: <1264790942-15045-5-git-send-email-armbru@redhat.com> In-Reply-To: <1264790942-15045-1-git-send-email-armbru@redhat.com> References: <1264790942-15045-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 4/7] Revert "qdev: Add help for device properties" List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org This reverts commit 2ba6edf0dd740166632df80caa85992b20791a68. The commit has two issues: * When it runs from the monitor, e.g. "device_add e1000,?", it prints to stderr instead of the monitor. * Help looks to callers just like failed device creation. This makes main() exit unsuccessfully on "-device e1000,?". We need to do this differently. Signed-off-by: Markus Armbruster --- hw/qdev-properties.c | 15 ++------------- 1 files changed, 2 insertions(+), 13 deletions(-) diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c index 8547ad2..277ff9e 100644 --- a/hw/qdev-properties.c +++ b/hw/qdev-properties.c @@ -544,19 +544,8 @@ int qdev_prop_parse(DeviceState *dev, const char *name, const char *value) prop = qdev_prop_find(dev, name); if (!prop) { - if (strcmp(name, "?") != 0) { - fprintf(stderr, "property \"%s.%s\" not found\n", - dev->info->name, name); - } else { - fprintf(stderr, "supported properties:\n"); - if (dev->info->props != NULL) { - Property *props = dev->info->props; - while (props->name) { - fprintf(stderr, "%s.%s\n", dev->info->name, props->name); - props++; - } - } - } + fprintf(stderr, "property \"%s.%s\" not found\n", + dev->info->name, name); return -1; } if (!prop->info->parse) { -- 1.6.6