From patchwork Mon Mar 26 15:30:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 7469 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 48EF823E0E for ; Mon, 26 Mar 2012 15:31:02 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id D9B57A188BD for ; Mon, 26 Mar 2012 15:31:01 +0000 (UTC) Received: by iage36 with SMTP id e36so11083304iag.11 for ; Mon, 26 Mar 2012 08:31:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-forwarded-to:x-forwarded-for:delivered-to :received-spf:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=BwPUlGyK/3MEkI8uHTD8hSsYr84BjR1tvYY4FIBNPO8=; b=TnNonDI+JB8xL8TlJ6+7hStHn2RKWDEdyGOlPTbz79GBrqoYxgNybGqJM0zGExpFig IqS6xtVmGPKKtLnUu9ntDeEsKEE8MPX4gV/gL0P1HNYXSEoIL2vLs8s0PpVTVyEWu/7X DFmScQPd1R1gWRNXmGNRDKbNjyOvv6WZscCqc0DJXAxgJLZfEmbmDG94zFnOdiCnOfSn eG9S9zV5ao4E0reCVprcV//Z9cDqpvnSlThYxl1yY7hZ1Fb74OEo8UpzQQASldf1oALp RI4RVe+4ld1GUxnv+A0iD9gqnoxFaJwhImNi5ropc7JxP9Ez3OpS46HkH76m6ElBiX9w YZNA== MIME-Version: 1.0 Received: by 10.50.194.226 with SMTP id hz2mr5910344igc.44.1332775861111; Mon, 26 Mar 2012 08:31:01 -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.231.5.205 with SMTP id 13csp23080ibw; Mon, 26 Mar 2012 08:30:57 -0700 (PDT) Received: by 10.216.139.25 with SMTP id b25mr12248688wej.41.1332775856167; Mon, 26 Mar 2012 08:30:56 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [81.2.115.146]) by mx.google.com with ESMTPS id l22si17513482weq.135.2012.03.26.08.30.55 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 26 Mar 2012 08:30:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) client-ip=81.2.115.146; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1SCBsd-0007bR-5K; Mon, 26 Mar 2012 16:30:47 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Anthony Liguori Subject: [PATCH] qerror: Add QERR_PROPERTY_SET_AFTER_REALIZE Date: Mon, 26 Mar 2012 16:30:47 +0100 Message-Id: <1332775847-29202-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 X-Gm-Message-State: ALoCoQkrt/E1Gzv0R4z8npJEbb2VxSnhb9zM/Rm6mRDV4QJhfr9rL0e6ty5ObdPeS1yLZ84w/hIj Add a new QError QERR_PROPERTY_SET_AFTER_REALIZE for attempts to set a QOM or qdev property after the object/device has been realized. This allows a slightly more informative diagnostic than the previous "Insufficient permission" message. Signed-off-by: Peter Maydell --- We've talked about the rather unhelpful nature of the "Insufficient permission" diagnostic before: http://lists.gnu.org/archive/html/qemu-devel/2012-02/msg02368.html and I finally got round to writing a patch to improve it... hw/qdev-properties.c | 22 +++++++++++----------- qerror.c | 4 ++++ qerror.h | 3 +++ 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c index bff9152..627c6ba 100644 --- a/hw/qdev-properties.c +++ b/hw/qdev-properties.c @@ -54,7 +54,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); + error_set(errp, QERR_PROPERTY_SET_AFTER_REALIZE, dev->id?:"", name); return; } @@ -98,7 +98,7 @@ static void set_int8(Object *obj, Visitor *v, void *opaque, int64_t value; if (dev->state != DEV_STATE_CREATED) { - error_set(errp, QERR_PERMISSION_DENIED); + error_set(errp, QERR_PROPERTY_SET_AFTER_REALIZE, dev->id?:"", name); return; } @@ -184,7 +184,7 @@ static void set_int16(Object *obj, Visitor *v, void *opaque, int64_t value; if (dev->state != DEV_STATE_CREATED) { - error_set(errp, QERR_PERMISSION_DENIED); + error_set(errp, QERR_PROPERTY_SET_AFTER_REALIZE, dev->id?:"", name); return; } @@ -234,7 +234,7 @@ static void set_int32(Object *obj, Visitor *v, void *opaque, int64_t value; if (dev->state != DEV_STATE_CREATED) { - error_set(errp, QERR_PERMISSION_DENIED); + error_set(errp, QERR_PROPERTY_SET_AFTER_REALIZE, dev->id?:"", name); return; } @@ -324,7 +324,7 @@ static void set_int64(Object *obj, Visitor *v, void *opaque, int64_t *ptr = qdev_get_prop_ptr(dev, prop); if (dev->state != DEV_STATE_CREATED) { - error_set(errp, QERR_PERMISSION_DENIED); + error_set(errp, QERR_PROPERTY_SET_AFTER_REALIZE, dev->id?:"", name); return; } @@ -412,7 +412,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); + error_set(errp, QERR_PROPERTY_SET_AFTER_REALIZE, dev->id?:"", name); return; } @@ -490,7 +490,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); + error_set(errp, QERR_PROPERTY_SET_AFTER_REALIZE, dev->id?:"", name); return; } @@ -659,7 +659,7 @@ static void set_vlan(Object *obj, Visitor *v, void *opaque, VLANState *vlan; if (dev->state != DEV_STATE_CREATED) { - error_set(errp, QERR_PERMISSION_DENIED); + error_set(errp, QERR_PROPERTY_SET_AFTER_REALIZE, dev->id?:"", name); return; } @@ -729,7 +729,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); + error_set(errp, QERR_PROPERTY_SET_AFTER_REALIZE, dev->id?:"", name); return; } @@ -797,7 +797,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); + error_set(errp, QERR_PROPERTY_SET_AFTER_REALIZE, dev->id?:"", name); return; } @@ -828,7 +828,7 @@ static void set_pci_devfn(Object *obj, Visitor *v, void *opaque, char *str = (char *)""; if (dev->state != DEV_STATE_CREATED) { - error_set(errp, QERR_PERMISSION_DENIED); + error_set(errp, QERR_PROPERTY_SET_AFTER_REALIZE, dev->id?:"", name); return; } diff --git a/qerror.c b/qerror.c index 41c729a..7d9aa4f 100644 --- a/qerror.c +++ b/qerror.c @@ -229,6 +229,10 @@ static const QErrorStringTable qerror_table[] = { .desc = "Property '%(device).%(property)' not found", }, { + .error_fmt = QERR_PROPERTY_SET_AFTER_REALIZE, + .desc = "Property '%(device).%(property)' cannot be set after realize", + }, + { .error_fmt = QERR_PROPERTY_VALUE_BAD, .desc = "Property '%(device).%(property)' doesn't take value '%(value)'", }, diff --git a/qerror.h b/qerror.h index e16f9c2..266a04a 100644 --- a/qerror.h +++ b/qerror.h @@ -193,6 +193,9 @@ QError *qobject_to_qerror(const QObject *obj); #define QERR_PROPERTY_NOT_FOUND \ "{ 'class': 'PropertyNotFound', 'data': { 'device': %s, 'property': %s } }" +#define QERR_PROPERTY_SET_AFTER_REALIZE \ + "{ 'class': 'PropertySetAfterRealize', 'data': { 'device': %s, 'property': %s } }" + #define QERR_PROPERTY_VALUE_BAD \ "{ 'class': 'PropertyValueBad', 'data': { 'device': %s, 'property': %s, 'value': %s } }"