diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2009-12-16 14:22:11 +0100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-12-19 08:26:22 -0600 |
| commit | 078517421f7df65fae9266a79165707383f4b310 (patch) | |
| tree | 852d5b039183ef1bb9e59b41d4e82c79dae1cdf9 | |
| parent | afc7055619064e558dc747a2ada0f3d68076aa90 (diff) | |
qdev: improve property error reporting.
Add a error message in case we fail to parse a qdev property.
Also make qemu not abort() in case setting a global property can't be
set. This used to be a clear programming error. The introduction of
the -global switch changed that though, so better exit instead (after
printing the new error message).
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
(cherry picked from commit 9ef5c4bf8132eb72db2dd83fce3fa0005a6dd13f)
| -rw-r--r-- | hw/qdev-properties.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c index fb07279ba1..217ddc0b74 100644 --- a/hw/qdev-properties.c +++ b/hw/qdev-properties.c @@ -500,7 +500,12 @@ int qdev_prop_parse(DeviceState *dev, const char *name, const char *value) dev->info->name, name); return -1; } - return prop->info->parse(dev, prop, value); + if (prop->info->parse(dev, prop, value) != 0) { + fprintf(stderr, "property \"%s.%s\": failed to parse \"%s\"\n", + dev->info->name, name, value); + return -1; + } + return 0; } void qdev_prop_set(DeviceState *dev, const char *name, void *src, enum PropertyType type) @@ -619,7 +624,7 @@ void qdev_prop_set_globals(DeviceState *dev) continue; } if (qdev_prop_parse(dev, prop->property, prop->value) != 0) { - abort(); + exit(1); } } } |