From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Navu4-0005fq-O4 for qemu-devel@nongnu.org; Fri, 29 Jan 2010 13:49:12 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Navty-0005aG-VF for qemu-devel@nongnu.org; Fri, 29 Jan 2010 13:49:11 -0500 Received: from [199.232.76.173] (port=37784 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Navty-0005Zu-Ol for qemu-devel@nongnu.org; Fri, 29 Jan 2010 13:49:06 -0500 Received: from oxygen.pond.sub.org ([213.239.205.148]:53368) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Navtx-000894-J0 for qemu-devel@nongnu.org; Fri, 29 Jan 2010 13:49:05 -0500 From: Markus Armbruster Date: Fri, 29 Jan 2010 19:48:58 +0100 Message-Id: <1264790942-15045-4-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 3/7] Revert "qdev: Add help for property value" List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org This reverts commit 922910ce42d15bdb7c2347436b1b5798b5401de4. The commit has four issues: * When it runs from the monitor, e.g. "device_add e1000,mac=?", 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,mac=?". * It has an undocumented side effect on -global: "-global e1000.mac=?" prints help, but only when we actually add an e1000 device. * It does not work for properties that accept the value "?". We need to do this differently. Signed-off-by: Markus Armbruster --- hw/qdev-properties.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c index f5ca05f..8547ad2 100644 --- a/hw/qdev-properties.c +++ b/hw/qdev-properties.c @@ -565,13 +565,8 @@ int qdev_prop_parse(DeviceState *dev, const char *name, const char *value) return -1; } if (prop->info->parse(dev, prop, value) != 0) { - if (strcmp(value, "?") != 0) { - fprintf(stderr, "property \"%s.%s\": failed to parse \"%s\"\n", - dev->info->name, name, value); - } else { - fprintf(stderr, "%s.%s=%s\n", - dev->info->name, name, prop->info->name); - } + fprintf(stderr, "property \"%s.%s\": failed to parse \"%s\"\n", + dev->info->name, name, value); return -1; } return 0; -- 1.6.6