From patchwork Fri Sep 7 13:55:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 182381 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D9A562C009D for ; Fri, 7 Sep 2012 23:56:12 +1000 (EST) Received: from localhost ([::1]:38727 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T9z2Y-0007oR-Ey for incoming@patchwork.ozlabs.org; Fri, 07 Sep 2012 09:56:10 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57043) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T9z2R-0007o0-Uz for qemu-devel@nongnu.org; Fri, 07 Sep 2012 09:56:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T9z2L-0006df-V8 for qemu-devel@nongnu.org; Fri, 07 Sep 2012 09:56:03 -0400 Received: from 38.0.169.217.in-addr.arpa ([217.169.0.38]:49102 helo=mnementh.archaic.org.uk) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T9z2L-0006cr-C2 for qemu-devel@nongnu.org; Fri, 07 Sep 2012 09:55:57 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1T9z28-0003vx-AU; Fri, 07 Sep 2012 14:55:44 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 7 Sep 2012 14:55:44 +0100 Message-Id: <1347026144-15098-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 217.169.0.38 Cc: Paolo Bonzini , Anthony Liguori , Markus Armbruster , patches@linaro.org Subject: [Qemu-devel] [PATCH v2] qom: Reject attempts to add a property that already exists X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Reject attempts to add a property to an object if one of that name already exists. This is always a bug in the caller; this is merely diagnosing it gracefully rather than behaving oddly later. Signed-off-by: Peter Maydell Reviewed-by: Andreas Färber --- Changes v1->v2: * use abort() rather than assert(0), as suggested by Paolo * make the diagnostic message a little more helpful by including the type name, and adding '' around names * the patches fixing bugs which this patch makes fatal errors have both now been committed to master, so there's no barrier to committing it now qom/object.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/qom/object.c b/qom/object.c index e3e9242..3da4c0e 100644 --- a/qom/object.c +++ b/qom/object.c @@ -620,7 +620,18 @@ void object_property_add(Object *obj, const char *name, const char *type, ObjectPropertyRelease *release, void *opaque, Error **errp) { - ObjectProperty *prop = g_malloc0(sizeof(*prop)); + ObjectProperty *prop; + + QTAILQ_FOREACH(prop, &obj->properties, node) { + if (strcmp(prop->name, name) == 0) { + /* This is always a bug in the caller */ + fprintf(stderr, "attempt to add duplicate property '%s'" + " to object (type '%s')\n", name, object_get_typename(obj)); + abort(); + } + } + + prop = g_malloc0(sizeof(*prop)); prop->name = g_strdup(name); prop->type = g_strdup(type);