From patchwork Fri Oct 26 17:29:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 12549 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 582B223F6F for ; Fri, 26 Oct 2012 17:29:38 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id ED240A183AF for ; Fri, 26 Oct 2012 17:29:37 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so3954680iej.11 for ; Fri, 26 Oct 2012 10:29:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=WFn5af8FDZv4JchDGhRIS3T9ZUGgOKrtjsEuBNq7Rlc=; b=flALRWp845KCIyC0KG5Ibq6jL5dwspgNSchnaurhokIp2YQ9hbb9Vhf/d55lUfIBG6 QYae1Vto0tKV6/mErsH5lTD3bXqx44QGNtnEK6uPvcpaTF1zz7WXXI784Bj6ZDvhMW0S wbE3ykjYF645JfXzFPFgTDi7s4GTUbtVefuNT8w0bU95y6niTmCoC2GVMUqocKSkDYX1 Ovt6ItBaN+U9vcw90cd/CWJN1cVvIFkmYDVoQSuFjU4C6BYNGys0XqO9qv7cqM6v7KiS XL1NaJeSBbC3K1T3Z6g4ncBsuUm7+Pj30qN4vcSbJ3q6wdBe8y5dbOqXxPYDO4C4USP6 2avA== Received: by 10.50.91.195 with SMTP id cg3mr2835962igb.57.1351272577729; Fri, 26 Oct 2012 10:29:37 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp285500igt; Fri, 26 Oct 2012 10:29:36 -0700 (PDT) Received: by 10.204.12.197 with SMTP id y5mr7530934bky.77.1351272574903; Fri, 26 Oct 2012 10:29:34 -0700 (PDT) Received: from mnementh.archaic.org.uk (1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id hq15si3012799bkc.109.2012.10.26.10.29.33 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 26 Oct 2012 10:29:34 -0700 (PDT) Received-SPF: neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) client-ip=2001:8b0:1d0::1; Authentication-Results: mx.google.com; spf=neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1TRnir-0003eS-K3; Fri, 26 Oct 2012 18:29:29 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Anthony Liguori , Paolo Bonzini Subject: [PATCH v5 2/2] hw/qdev: Abort rather than ignoring errors adding device properties Date: Fri, 26 Oct 2012 18:29:29 +0100 Message-Id: <1351272569-14009-3-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1351272569-14009-1-git-send-email-peter.maydell@linaro.org> References: <1351272569-14009-1-git-send-email-peter.maydell@linaro.org> X-Gm-Message-State: ALoCoQkiLx7CMABgcJP2lclF5h3SVgat45fqcO5jjpSKhrZZ0sl60gtEAYD/erXDPmYEBPOl+Y+u 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. */