From patchwork Wed May 23 15:44:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 160945 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 86C7CB6FB6 for ; Thu, 24 May 2012 01:46:16 +1000 (EST) Received: from localhost ([::1]:45237 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SXDlO-0001OB-By for incoming@patchwork.ozlabs.org; Wed, 23 May 2012 11:46:14 -0400 Received: from eggs.gnu.org ([208.118.235.92]:49541) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SXDkt-0000bZ-TY for qemu-devel@nongnu.org; Wed, 23 May 2012 11:45:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SXDkl-0007g9-Tf for qemu-devel@nongnu.org; Wed, 23 May 2012 11:45:43 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:54937) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SXDkl-0007Og-Lx for qemu-devel@nongnu.org; Wed, 23 May 2012 11:45:35 -0400 Received: by mail-pb0-f45.google.com with SMTP id ro12so12013210pbb.4 for ; Wed, 23 May 2012 08:45:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=Q2GDafFukn511j0VhMMwRLrI96TUeGp8S40+tnytJg4=; b=m6pfiqr30XtddNZyM772W24MydAcpcULPT+P+NJ9+KBjEhZnrBOVBF12fIwQAstSPq Z9LUbP+ZHilI76WcKFpfdLNYVligp/6XUFIzWQ4EbQ4o/GmQbcqbJdKkuXFf7qy8HxQI 7azkEMO3or1UPLz18PZURFLEtfwVJzoO/qdC6acBl6BtF1vWXBXkN7d5uob2AbELISH/ knuKA+dHs8pl1Nemp3p4XC8FLAZ9uzUR302qjkYGalZS/uevtSCUx94zB+HQDCqjNfxh J0wzcVGqk+S3r5CJfLCih7WWBjGhRrAoQElBvqSN3srvkf4/TVPlgZAkDNAIAygs3GBA t3eg== Received: by 10.68.192.5 with SMTP id hc5mr4587404pbc.49.1337787931414; Wed, 23 May 2012 08:45:31 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-182-16.ip50.fastwebnet.it. [93.34.182.16]) by mx.google.com with ESMTPS id ru4sm2193475pbc.66.2012.05.23.08.45.28 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 23 May 2012 08:45:30 -0700 (PDT) From: Paolo Bonzini To: afaerber@suse.de, qemu-devel@nongnu.org Date: Wed, 23 May 2012 17:44:41 +0200 Message-Id: <1337787881-3579-11-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.10.1 In-Reply-To: <1337787881-3579-1-git-send-email-pbonzini@redhat.com> References: <1337787881-3579-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: imammedo@redhat.com, peter.maydell@linaro.org Subject: [Qemu-devel] [PATCH 10/10] qom: Add QERR_PROPERTY_SET_AFTER_REALIZE 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 From: Peter Maydell 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 Signed-off-by: Paolo Bonzini --- hw/qdev-properties.c | 15 ++++++++++----- qerror.c | 4 ++++ qerror.h | 3 +++ qom/object.c | 30 ++++++++++++++++++++---------- 4 files changed, 37 insertions(+), 15 deletions(-) diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c index 6766abc..29499bf 100644 --- a/hw/qdev-properties.c +++ b/hw/qdev-properties.c @@ -76,7 +76,8 @@ static void set_pointer(Object *obj, Visitor *v, Property *prop, int ret; if (object_is_realized(obj)) { - error_set(errp, QERR_PERMISSION_DENIED); + error_set(errp, QERR_PROPERTY_SET_AFTER_REALIZE, + object_get_id(obj), name); return; } @@ -242,7 +243,8 @@ static void set_vlan(Object *obj, Visitor *v, void *opaque, VLANState *vlan; if (object_is_realized(obj)) { - error_set(errp, QERR_PERMISSION_DENIED); + error_set(errp, QERR_PROPERTY_SET_AFTER_REALIZE, + object_get_id(obj), name); return; } @@ -303,7 +305,8 @@ static void set_mac(Object *obj, Visitor *v, void *opaque, char *str, *p; if (object_is_realized(obj)) { - error_set(errp, QERR_PERMISSION_DENIED); + error_set(errp, QERR_PROPERTY_SET_AFTER_REALIZE, + object_get_id(obj), name); return; } @@ -389,7 +392,8 @@ static void set_pci_devfn(Object *obj, Visitor *v, void *opaque, char *str = (char *)""; if (object_is_realized(obj)) { - error_set(errp, QERR_PERMISSION_DENIED); + error_set(errp, QERR_PROPERTY_SET_AFTER_REALIZE, + object_get_id(obj), name); return; } @@ -463,7 +467,8 @@ static void set_blocksize(Object *obj, Visitor *v, void *opaque, Error *local_err = NULL; if (object_is_realized(obj)) { - error_set(errp, QERR_PERMISSION_DENIED); + error_set(errp, QERR_PROPERTY_SET_AFTER_REALIZE, + object_get_id(obj), name); return; } diff --git a/qerror.c b/qerror.c index 5092fe7..860b3cb 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 4cbba48..6f7b1fb 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 } }" diff --git a/qom/object.c b/qom/object.c index b113e66..e131366 100644 --- a/qom/object.c +++ b/qom/object.c @@ -809,7 +809,8 @@ void object_property_get(Object *obj, Visitor *v, const char *name, } if (!prop->get) { - error_set(errp, QERR_PERMISSION_DENIED); + error_set(errp, QERR_PROPERTY_SET_AFTER_REALIZE, + object_get_id(obj), name); } else { prop->get(obj, v, prop->opaque, name, errp); } @@ -824,7 +825,8 @@ void object_property_set(Object *obj, Visitor *v, const char *name, } if (!prop->set) { - error_set(errp, QERR_PERMISSION_DENIED); + error_set(errp, QERR_PROPERTY_SET_AFTER_REALIZE, + object_get_id(obj), name); } else { prop->set(obj, v, prop->opaque, name, errp); } @@ -1445,7 +1447,8 @@ static void set_bit(Object *obj, Visitor *v, void *opaque, bool value; if (object_is_realized(obj)) { - error_set(errp, QERR_PERMISSION_DENIED); + error_set(errp, QERR_PROPERTY_SET_AFTER_REALIZE, + object_get_id(obj), name); return; } @@ -1483,7 +1486,8 @@ static void set_uint8(Object *obj, Visitor *v, void *opaque, uint8_t *ptr = object_get_prop_ptr(obj, prop); if (object_is_realized(obj)) { - error_set(errp, QERR_PERMISSION_DENIED); + error_set(errp, QERR_PROPERTY_SET_AFTER_REALIZE, + object_get_id(obj), name); return; } @@ -1548,7 +1552,8 @@ static void set_uint16(Object *obj, Visitor *v, void *opaque, uint16_t *ptr = object_get_prop_ptr(obj, prop); if (object_is_realized(obj)) { - error_set(errp, QERR_PERMISSION_DENIED); + error_set(errp, QERR_PROPERTY_SET_AFTER_REALIZE, + object_get_id(obj), name); return; } @@ -1579,7 +1584,8 @@ static void set_uint32(Object *obj, Visitor *v, void *opaque, uint32_t *ptr = object_get_prop_ptr(obj, prop); if (object_is_realized(obj)) { - error_set(errp, QERR_PERMISSION_DENIED); + error_set(errp, QERR_PROPERTY_SET_AFTER_REALIZE, + object_get_id(obj), name); return; } @@ -1602,7 +1608,8 @@ static void set_int32(Object *obj, Visitor *v, void *opaque, int32_t *ptr = object_get_prop_ptr(obj, prop); if (object_is_realized(obj)) { - error_set(errp, QERR_PERMISSION_DENIED); + error_set(errp, QERR_PROPERTY_SET_AFTER_REALIZE, + object_get_id(obj), name); return; } @@ -1673,7 +1680,8 @@ static void set_uint64(Object *obj, Visitor *v, void *opaque, uint64_t *ptr = object_get_prop_ptr(obj, prop); if (object_is_realized(obj)) { - error_set(errp, QERR_PERMISSION_DENIED); + error_set(errp, QERR_PROPERTY_SET_AFTER_REALIZE, + object_get_id(obj), name); return; } @@ -1759,7 +1767,8 @@ static void set_string(Object *obj, Visitor *v, void *opaque, char *str; if (object_is_realized(obj)) { - error_set(errp, QERR_PERMISSION_DENIED); + error_set(errp, QERR_PROPERTY_SET_AFTER_REALIZE, + object_get_id(obj), name); return; } @@ -1802,7 +1811,8 @@ void property_set_enum(Object *obj, Visitor *v, void *opaque, int *ptr = object_get_prop_ptr(obj, prop); if (object_is_realized(obj)) { - error_set(errp, QERR_PERMISSION_DENIED); + error_set(errp, QERR_PROPERTY_SET_AFTER_REALIZE, + object_get_id(obj), name); return; }