Patchwork [v4,2/2] hw/qdev: Abort rather than ignoring errors adding device properties

login
register
mail settings
Submitter Peter Maydell
Date Oct. 25, 2012, 3:22 p.m.
Message ID <1351178549-5699-3-git-send-email-peter.maydell@linaro.org>
Download mbox | patch
Permalink /patch/194236/
State New
Headers show

Comments

Peter Maydell - Oct. 25, 2012, 3:22 p.m.
Instead of ignoring any errors that occur when adding properties
to a new device in device_initfn(), check for them and abort if any
occur. The most likely cause is accidentally adding a duplicate
property, which is a programming error by the device author.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 hw/qdev.c |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
Anthony Liguori - Oct. 25, 2012, 6:39 p.m.
Peter Maydell <peter.maydell@linaro.org> writes:

> Instead of ignoring any errors that occur when adding properties
> to a new device in device_initfn(), check for them and abort if any
> occur. The most likely cause is accidentally adding a duplicate
> property, which is a programming error by the device author.
>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>

Regards,

Anthony Liguori

> ---
>  hw/qdev.c |   10 +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/hw/qdev.c b/hw/qdev.c
> index 9b9aba3..b34d80a 100644
> --- a/hw/qdev.c
> +++ b/hw/qdev.c
> @@ -659,6 +659,7 @@ static void device_initfn(Object *obj)
>      DeviceState *dev = DEVICE(obj);
>      ObjectClass *class;
>      Property *prop;
> +    Error *err = NULL;
>  
>      if (qdev_hotplug) {
>          dev->hotplugged = 1;
> @@ -671,15 +672,18 @@ static void device_initfn(Object *obj)
>      class = object_get_class(OBJECT(dev));
>      do {
>          for (prop = DEVICE_CLASS(class)->props; prop && prop->name; prop++) {
> -            qdev_property_add_legacy(dev, prop, NULL);
> -            qdev_property_add_static(dev, prop, NULL);
> +            qdev_property_add_legacy(dev, prop, &err);
> +            assert_no_error(err);
> +            qdev_property_add_static(dev, prop, &err);
> +            assert_no_error(err);
>          }
>          class = object_class_get_parent(class);
>      } while (class != object_class_by_name(TYPE_DEVICE));
>      qdev_prop_set_globals(dev);
>  
>      object_property_add_link(OBJECT(dev), "parent_bus", TYPE_BUS,
> -                             (Object **)&dev->parent_bus, NULL);
> +                             (Object **)&dev->parent_bus, &err);
> +    assert_no_error(err);
>  }
>  
>  /* Unlink device from bus and free the structure.  */
> -- 
> 1.7.9.5

Patch

diff --git a/hw/qdev.c b/hw/qdev.c
index 9b9aba3..b34d80a 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -659,6 +659,7 @@  static void device_initfn(Object *obj)
     DeviceState *dev = DEVICE(obj);
     ObjectClass *class;
     Property *prop;
+    Error *err = NULL;
 
     if (qdev_hotplug) {
         dev->hotplugged = 1;
@@ -671,15 +672,18 @@  static void device_initfn(Object *obj)
     class = object_get_class(OBJECT(dev));
     do {
         for (prop = DEVICE_CLASS(class)->props; prop && prop->name; prop++) {
-            qdev_property_add_legacy(dev, prop, NULL);
-            qdev_property_add_static(dev, prop, NULL);
+            qdev_property_add_legacy(dev, prop, &err);
+            assert_no_error(err);
+            qdev_property_add_static(dev, prop, &err);
+            assert_no_error(err);
         }
         class = object_class_get_parent(class);
     } while (class != object_class_by_name(TYPE_DEVICE));
     qdev_prop_set_globals(dev);
 
     object_property_add_link(OBJECT(dev), "parent_bus", TYPE_BUS,
-                             (Object **)&dev->parent_bus, NULL);
+                             (Object **)&dev->parent_bus, &err);
+    assert_no_error(err);
 }
 
 /* Unlink device from bus and free the structure.  */