From patchwork Mon Mar 25 13:15:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 15595 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 B8FDF23E00 for ; Mon, 25 Mar 2013 13:15:22 +0000 (UTC) Received: from mail-la0-f50.google.com (mail-la0-f50.google.com [209.85.215.50]) by fiordland.canonical.com (Postfix) with ESMTP id 8CCE2A19394 for ; Mon, 25 Mar 2013 13:15:22 +0000 (UTC) Received: by mail-la0-f50.google.com with SMTP id ec20so11094561lab.23 for ; Mon, 25 Mar 2013 06:15:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=oHLPBbvrYeSzccIWwuVDVNpZc5jKkZrX5pv8W8uazJ0=; b=WanFrZBzmeZRTNrdGRhrGAJZNmpRZ09jmQPvTgs0hOr+Ix2fIS53GP5xl5XmVwfwBR ALQw84Pw+eBbQtXdQWFMZKsxZ+BxclhSCanTqF3NaHHV/9Tyk8pLM+0Sv/Sv+nL1XWgS flkY9UtshZdLMCUCvZ5hEr6Argt5cdgdmbPpk73c9dvi4O7jtPYCcHvFKG8+5tKlvsA4 6o9TKXLfJbGFsq16U4nIo/utmEWerE9IkMr5R8eYlOQh2kqwkmjqYW2TsA1RLeTzqsl6 GbcXlSuyvM+U6IaY/R7cvRoZrxPIbyp4FZCqn+tbhX6lPMPH/5h9UulWcgQK81fbEeZ8 r1nQ== X-Received: by 10.152.114.164 with SMTP id jh4mr6024400lab.1.1364217322136; Mon, 25 Mar 2013 06:15:22 -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.112.147.5 with SMTP id tg5csp47205lbb; Mon, 25 Mar 2013 06:15:21 -0700 (PDT) X-Received: by 10.194.158.161 with SMTP id wv1mr17965108wjb.38.1364217318988; Mon, 25 Mar 2013 06:15:18 -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 3si19954915eeb.258.2013.03.25.06.15.18 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 25 Mar 2013 06:15:18 -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 1UK7F4-0001vr-BY; Mon, 25 Mar 2013 13:15:14 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= , Paolo Bonzini , Anthony Liguori Subject: [PATCH v7 2/2] hw/qdev: Abort rather than ignoring errors adding device properties Date: Mon, 25 Mar 2013 13:15:14 +0000 Message-Id: <1364217314-7400-3-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1364217314-7400-1-git-send-email-peter.maydell@linaro.org> References: <1364217314-7400-1-git-send-email-peter.maydell@linaro.org> X-Gm-Message-State: ALoCoQnFDsxmHqURhr5l2M3FiDL3KUpm2wrM32XkkiZsSnGgaoBqCHZDbOhFxd6vTaXCTgjK5fa7 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 Acked-by: Paolo Bonzini --- hw/qdev.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/hw/qdev.c b/hw/qdev.c index 708a058..909c405 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -710,6 +710,7 @@ static void device_initfn(Object *obj) DeviceState *dev = DEVICE(obj); ObjectClass *class; Property *prop; + Error *err = NULL; if (qdev_hotplug) { dev->hotplugged = 1; @@ -725,15 +726,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. */