From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:55873) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TRo7H-0002Sx-JA for qemu-devel@nongnu.org; Fri, 26 Oct 2012 13:54:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TRo7G-0006WS-K1 for qemu-devel@nongnu.org; Fri, 26 Oct 2012 13:54:43 -0400 Received: from 38.0.169.217.in-addr.arpa ([217.169.0.38]:42951 helo=mnementh.archaic.org.uk) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TRo7G-0006WK-Co for qemu-devel@nongnu.org; Fri, 26 Oct 2012 13:54:42 -0400 From: Peter Maydell Date: Fri, 26 Oct 2012 18:29:29 +0100 Message-Id: <1351272569-14009-3-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1351272569-14009-1-git-send-email-peter.maydell@linaro.org> References: <1351272569-14009-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH v5 2/2] hw/qdev: Abort rather than ignoring errors adding device properties List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Anthony Liguori , patches@linaro.org 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 Reviewed-by: 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