From patchwork Fri Oct 19 17:57:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 12382 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 8378B23E29 for ; Fri, 19 Oct 2012 17:57:16 +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 EEFBBA18591 for ; Fri, 19 Oct 2012 17:57:15 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so977720iej.11 for ; Fri, 19 Oct 2012 10:57:15 -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:x-gm-message-state; bh=Tnun0G5bQ8PAPMHPyKyf+hYVH3tMewGKZwRKekN1j7E=; b=O8oB1waTKOPTqnd4fB23+WPukNC513keIojk1GWtU7rx7RVmgwJxHLHVSW00gsyixo z6uFRut9mFUhoDKVV9y0ETCmKiq4+6lk9b2qvTqHw3Ysvncat+YCft/wbCyqBstLJeoF 24EAKPZBszmYgdkGssIsooeRy1GWaHgaKxcVAhEW8KA1BK4qgV1Y5RujtnWYDXj+CbHF MHJ7FKADfHCFMP3qjIGlxx02u/SbEcizQTPEDsOGvK+FKYVXnsF19vehlbrvDjmcVNs3 djdtg40X+DK1o4hqAGbFx957CRsObrqHOAVyD1JS3Z94AEgKyPFa23hhNoV8OI4i2eeW faVg== Received: by 10.50.88.233 with SMTP id bj9mr2246179igb.70.1350669435341; Fri, 19 Oct 2012 10:57:15 -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 n20csp130326igt; Fri, 19 Oct 2012 10:57:14 -0700 (PDT) Received: by 10.216.142.102 with SMTP id h80mr1104873wej.179.1350669433300; Fri, 19 Oct 2012 10:57:13 -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 fl3si39595176wib.25.2012.10.19.10.57.12 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 19 Oct 2012 10:57:13 -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 1TPGon-0006rV-1F; Fri, 19 Oct 2012 18:57:09 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Anthony Liguori , Paolo Bonzini Subject: [PATCH v3] hw/qdev-properties.c: Improve diagnostic for setting property after realize Date: Fri, 19 Oct 2012 18:57:09 +0100 Message-Id: <1350669429-26354-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 X-Gm-Message-State: ALoCoQlG+IMxedp+ibRQ4KDrSSA/feUBA27qBslGCC3SPCyRzHU/hOxWECcraGNyYgwvR2BZjT9z Now we have error_setg() we can improve the error message emitted if you attempt to set a property of a device after the device is realized (the previous message was "permission denied" which was not very informative). Signed-off-by: Peter Maydell --- This is v3 of this patch (v2 was sent back in July); I think the error_setg() version is nicer and allows us to be a bit more helpful with the message text... hw/qdev-properties.c | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c index 8aca0d4..b7aa386 100644 --- a/hw/qdev-properties.c +++ b/hw/qdev-properties.c @@ -5,6 +5,20 @@ #include "hw/block-common.h" #include "net/hub.h" +static void report_already_realized(Error **errp, DeviceState *dev, + const char *name) +{ + if (dev->id) { + error_setg(errp, "Attempt to set property '%s' on device '%s' " + "(type '%s') after it was realized", name, dev->id, + object_get_typename(OBJECT(dev))); + } else { + error_setg(errp, "Attempt to set property '%s' on anonymous device " + "(type '%s') after it was realized", name, + object_get_typename(OBJECT(dev))); + } +} + void *qdev_get_prop_ptr(DeviceState *dev, Property *prop) { void *ptr = dev; @@ -36,7 +50,7 @@ static void set_pointer(Object *obj, Visitor *v, Property *prop, int ret; if (dev->state != DEV_STATE_CREATED) { - error_set(errp, QERR_PERMISSION_DENIED); + report_already_realized(errp, dev, name); return; } @@ -74,7 +88,7 @@ static void set_enum(Object *obj, Visitor *v, void *opaque, int *ptr = qdev_get_prop_ptr(dev, prop); if (dev->state != DEV_STATE_CREATED) { - error_set(errp, QERR_PERMISSION_DENIED); + report_already_realized(errp, dev, name); return; } @@ -126,7 +140,7 @@ static void set_bit(Object *obj, Visitor *v, void *opaque, bool value; if (dev->state != DEV_STATE_CREATED) { - error_set(errp, QERR_PERMISSION_DENIED); + report_already_realized(errp, dev, name); return; } @@ -166,7 +180,7 @@ static void set_uint8(Object *obj, Visitor *v, void *opaque, uint8_t *ptr = qdev_get_prop_ptr(dev, prop); if (dev->state != DEV_STATE_CREATED) { - error_set(errp, QERR_PERMISSION_DENIED); + report_already_realized(errp, dev, name); return; } @@ -233,7 +247,7 @@ static void set_uint16(Object *obj, Visitor *v, void *opaque, uint16_t *ptr = qdev_get_prop_ptr(dev, prop); if (dev->state != DEV_STATE_CREATED) { - error_set(errp, QERR_PERMISSION_DENIED); + report_already_realized(errp, dev, name); return; } @@ -266,7 +280,7 @@ static void set_uint32(Object *obj, Visitor *v, void *opaque, uint32_t *ptr = qdev_get_prop_ptr(dev, prop); if (dev->state != DEV_STATE_CREATED) { - error_set(errp, QERR_PERMISSION_DENIED); + report_already_realized(errp, dev, name); return; } @@ -291,7 +305,7 @@ static void set_int32(Object *obj, Visitor *v, void *opaque, int32_t *ptr = qdev_get_prop_ptr(dev, prop); if (dev->state != DEV_STATE_CREATED) { - error_set(errp, QERR_PERMISSION_DENIED); + report_already_realized(errp, dev, name); return; } @@ -364,7 +378,7 @@ static void set_uint64(Object *obj, Visitor *v, void *opaque, uint64_t *ptr = qdev_get_prop_ptr(dev, prop); if (dev->state != DEV_STATE_CREATED) { - error_set(errp, QERR_PERMISSION_DENIED); + report_already_realized(errp, dev, name); return; } @@ -452,7 +466,7 @@ static void set_string(Object *obj, Visitor *v, void *opaque, char *str; if (dev->state != DEV_STATE_CREATED) { - error_set(errp, QERR_PERMISSION_DENIED); + report_already_realized(errp, dev, name); return; } @@ -666,7 +680,7 @@ static void set_vlan(Object *obj, Visitor *v, void *opaque, NetClientState *hubport; if (dev->state != DEV_STATE_CREATED) { - error_set(errp, QERR_PERMISSION_DENIED); + report_already_realized(errp, dev, name); return; } @@ -737,7 +751,7 @@ static void set_mac(Object *obj, Visitor *v, void *opaque, char *str, *p; if (dev->state != DEV_STATE_CREATED) { - error_set(errp, QERR_PERMISSION_DENIED); + report_already_realized(errp, dev, name); return; } @@ -825,7 +839,7 @@ static void set_pci_devfn(Object *obj, Visitor *v, void *opaque, char *str; if (dev->state != DEV_STATE_CREATED) { - error_set(errp, QERR_PERMISSION_DENIED); + report_already_realized(errp, dev, name); return; } @@ -895,7 +909,7 @@ static void set_blocksize(Object *obj, Visitor *v, void *opaque, const int64_t max = 32768; if (dev->state != DEV_STATE_CREATED) { - error_set(errp, QERR_PERMISSION_DENIED); + report_already_realized(errp, dev, name); return; } @@ -963,7 +977,7 @@ static void set_pci_host_devaddr(Object *obj, Visitor *v, void *opaque, unsigned int slot = 0, func = 0; if (dev->state != DEV_STATE_CREATED) { - error_set(errp, QERR_PERMISSION_DENIED); + report_already_realized(errp, dev, name); return; }