From 29d2e1672bab5132296f3a3bb3ad7e42abe9ceb6 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 29 Jan 2010 19:48:59 +0100 Subject: [PATCH] Revert "qdev: Add help for device properties" 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 Signed-off-by: Anthony Liguori --- hw/qdev-properties.c | 15 ++------------- 1 file 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) { -- 2.7.4