Patchwork [FOR,0.12] qdev: improve property error reporting.

login
register
mail settings
Submitter Gerd Hoffmann
Date Dec. 16, 2009, 1:22 p.m.
Message ID <1260969731-26271-1-git-send-email-kraxel@redhat.com>
Download mbox | patch
Permalink /patch/41258/
State New
Headers show

Comments

Gerd Hoffmann - Dec. 16, 2009, 1:22 p.m.
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>
---
 hw/qdev-properties.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

Patch

diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c
index fb07279..217ddc0 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);
         }
     }
 }