From eecbb9fe6f9a9cffd8d305f688b1be27d197a253 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 29 Jan 2010 19:48:58 +0100 Subject: [PATCH] Revert "qdev: Add help for property value" 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 Signed-off-by: Anthony Liguori --- hw/qdev-properties.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c index f5ca05fe87..8547ad27d4 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;