From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:56145) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SCBt4-0001zs-BI for qemu-devel@nongnu.org; Mon, 26 Mar 2012 11:31:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SCBss-0005Eb-Nh for qemu-devel@nongnu.org; Mon, 26 Mar 2012 11:31:13 -0400 Received: from mnementh.archaic.org.uk ([81.2.115.146]:43009) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SCBss-0005DL-B0 for qemu-devel@nongnu.org; Mon, 26 Mar 2012 11:31:02 -0400 From: Peter Maydell Date: Mon, 26 Mar 2012 16:30:47 +0100 Message-Id: <1332775847-29202-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH] qerror: Add QERR_PROPERTY_SET_AFTER_REALIZE List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Anthony Liguori , =?UTF-8?q?Andreas=20F=C3=A4rber?= , patches@linaro.org 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 } }" -- 1.7.1