From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 12DD3C4361B for ; Mon, 14 Dec 2020 14:57:46 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4AE3D225AB for ; Mon, 14 Dec 2020 14:57:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4AE3D225AB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:45724 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kopIG-0003KA-8B for qemu-devel@archiver.kernel.org; Mon, 14 Dec 2020 09:57:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47866) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kopGh-000221-U1 for qemu-devel@nongnu.org; Mon, 14 Dec 2020 09:56:07 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:36061) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kopGc-0001ha-Lu for qemu-devel@nongnu.org; Mon, 14 Dec 2020 09:56:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607957762; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AFj8Qphsj1DvLlA6c+EHeqCWHkgizY5fVaZLxxpViPo=; b=g4OAwSLTQKhX77HK/CpD/u26j0Xlzz/Ol1lM8hLuw8trlGiXvM2DaMfGfjgHmBkZ8j/s+N iDNX9cs8OLTyqHqsv7xwMjvQ4D0gbRSO+gCV+PJXPGe6QQklYHzWzVq0GYXGjS+RXFSvFW 9+lLrDIRVzPmu63CEEXXGD+xxFZaIfo= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-333-vSORlgemOjCyIva5SGouQg-1; Mon, 14 Dec 2020 09:55:58 -0500 X-MC-Unique: vSORlgemOjCyIva5SGouQg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AB08910054FF; Mon, 14 Dec 2020 14:55:55 +0000 (UTC) Received: from localhost (unknown [10.40.208.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id CB03718B5E; Mon, 14 Dec 2020 14:55:32 +0000 (UTC) Date: Mon, 14 Dec 2020 15:55:30 +0100 From: Igor Mammedov To: Eduardo Habkost Subject: Re: [PATCH v4 23/32] qdev: Move dev->realized check to qdev_property_set() Message-ID: <20201214155530.55f80cd6@redhat.com> In-Reply-To: <20201211220529.2290218-24-ehabkost@redhat.com> References: <20201211220529.2290218-1-ehabkost@redhat.com> <20201211220529.2290218-24-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=imammedo@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=216.205.24.124; envelope-from=imammedo@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Matthew Rosato , Paul Durrant , Mark Cave-Ayland , qemu-devel@nongnu.org, Stefano Stabellini , qemu-block@nongnu.org, Stefan Berger , David Hildenbrand , Markus Armbruster , Halil Pasic , Christian Borntraeger , Anthony Perard , =?UTF-8?B?TWFyYy1BbmRyw6k=?= Lureau , Philippe =?UTF-8?B?TWF0aGlldS1EYXVkw6k=?= , Artyom Tarasenko , Thomas Huth , Alex Williamson , xen-devel@lists.xenproject.org, John Snow , Richard Henderson , Kevin Wolf , "Daniel P. Berrange" , Cornelia Huck , qemu-s390x@nongnu.org, Max Reitz , Paolo Bonzini , Stefan Berger Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Fri, 11 Dec 2020 17:05:20 -0500 Eduardo Habkost wrote: > Every single qdev property setter function manually checks > dev->realized. We can just check dev->realized inside > qdev_property_set() instead. >=20 > The check is being added as a separate function > (qdev_prop_allow_set()) because it will become a callback later. is callback added within this series? and I'd add here what's the purpose of it. >=20 > Reviewed-by: Stefan Berger > Signed-off-by: Eduardo Habkost > --- > Changes v1 -> v2: > * Removed unused variable at xen_block_set_vdev() > * Redone patch after changes in the previous patches in the > series > --- > Cc: Stefan Berger > Cc: Stefano Stabellini > Cc: Anthony Perard > Cc: Paul Durrant > Cc: Kevin Wolf > Cc: Max Reitz > Cc: Paolo Bonzini > Cc: "Daniel P. Berrang=C3=A9" > Cc: Eduardo Habkost > Cc: Cornelia Huck > Cc: Halil Pasic > Cc: Christian Borntraeger > Cc: Richard Henderson > Cc: David Hildenbrand > Cc: Thomas Huth > Cc: Matthew Rosato > Cc: Alex Williamson > Cc: Mark Cave-Ayland > Cc: Artyom Tarasenko > Cc: qemu-devel@nongnu.org > Cc: xen-devel@lists.xenproject.org > Cc: qemu-block@nongnu.org > Cc: qemu-s390x@nongnu.org > --- > backends/tpm/tpm_util.c | 6 -- > hw/block/xen-block.c | 6 -- > hw/core/qdev-properties-system.c | 70 ---------------------- > hw/core/qdev-properties.c | 100 ++++++------------------------- > hw/s390x/css.c | 6 -- > hw/s390x/s390-pci-bus.c | 6 -- > hw/vfio/pci-quirks.c | 6 -- > target/sparc/cpu.c | 6 -- > 8 files changed, 18 insertions(+), 188 deletions(-) >=20 > diff --git a/backends/tpm/tpm_util.c b/backends/tpm/tpm_util.c > index a5d997e7dc..39b45fa46d 100644 > --- a/backends/tpm/tpm_util.c > +++ b/backends/tpm/tpm_util.c > @@ -46,16 +46,10 @@ static void get_tpm(Object *obj, Visitor *v, const ch= ar *name, void *opaque, > static void set_tpm(Object *obj, Visitor *v, const char *name, void *opa= que, > Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > TPMBackend *s, **be =3D qdev_get_prop_ptr(obj, prop); > char *str; > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > if (!visit_type_str(v, name, &str, errp)) { > return; > } > diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c > index 905e4acd97..bd1aef63a7 100644 > --- a/hw/block/xen-block.c > +++ b/hw/block/xen-block.c > @@ -395,17 +395,11 @@ static int vbd_name_to_disk(const char *name, const= char **endp, > static void xen_block_set_vdev(Object *obj, Visitor *v, const char *name= , > void *opaque, Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > XenBlockVdev *vdev =3D qdev_get_prop_ptr(obj, prop); > char *str, *p; > const char *end; > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > if (!visit_type_str(v, name, &str, errp)) { > return; > } > diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-s= ystem.c > index 42529c3b65..f31aea3de1 100644 > --- a/hw/core/qdev-properties-system.c > +++ b/hw/core/qdev-properties-system.c > @@ -94,11 +94,6 @@ static void set_drive_helper(Object *obj, Visitor *v, = const char *name, > bool blk_created =3D false; > int ret; > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > if (!visit_type_str(v, name, &str, errp)) { > return; > } > @@ -230,17 +225,11 @@ static void get_chr(Object *obj, Visitor *v, const = char *name, void *opaque, > static void set_chr(Object *obj, Visitor *v, const char *name, void *opa= que, > Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > CharBackend *be =3D qdev_get_prop_ptr(obj, prop); > Chardev *s; > char *str; > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > if (!visit_type_str(v, name, &str, errp)) { > return; > } > @@ -311,18 +300,12 @@ static void get_mac(Object *obj, Visitor *v, const = char *name, void *opaque, > static void set_mac(Object *obj, Visitor *v, const char *name, void *opa= que, > Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > MACAddr *mac =3D qdev_get_prop_ptr(obj, prop); > int i, pos; > char *str; > const char *p; > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > if (!visit_type_str(v, name, &str, errp)) { > return; > } > @@ -390,7 +373,6 @@ static void get_netdev(Object *obj, Visitor *v, const= char *name, > static void set_netdev(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > NICPeers *peers_ptr =3D qdev_get_prop_ptr(obj, prop); > NetClientState **ncs =3D peers_ptr->ncs; > @@ -398,11 +380,6 @@ static void set_netdev(Object *obj, Visitor *v, cons= t char *name, > int queues, err =3D 0, i =3D 0; > char *str; > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > if (!visit_type_str(v, name, &str, errp)) { > return; > } > @@ -469,18 +446,12 @@ static void get_audiodev(Object *obj, Visitor *v, c= onst char* name, > static void set_audiodev(Object *obj, Visitor *v, const char* name, > void *opaque, Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > QEMUSoundCard *card =3D qdev_get_prop_ptr(obj, prop); > AudioState *state; > int err =3D 0; > char *str; > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > if (!visit_type_str(v, name, &str, errp)) { > return; > } > @@ -582,11 +553,6 @@ static void set_blocksize(Object *obj, Visitor *v, c= onst char *name, > uint64_t value; > Error *local_err =3D NULL; > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > if (!visit_type_size(v, name, &value, errp)) { > return; > } > @@ -686,7 +652,6 @@ static void get_reserved_region(Object *obj, Visitor = *v, const char *name, > static void set_reserved_region(Object *obj, Visitor *v, const char *nam= e, > void *opaque, Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > ReservedRegion *rr =3D qdev_get_prop_ptr(obj, prop); > Error *local_err =3D NULL; > @@ -694,11 +659,6 @@ static void set_reserved_region(Object *obj, Visitor= *v, const char *name, > char *str; > int ret; > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > visit_type_str(v, name, &str, &local_err); > if (local_err) { > error_propagate(errp, local_err); > @@ -754,17 +714,11 @@ const PropertyInfo qdev_prop_reserved_region =3D { > static void set_pci_devfn(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > int32_t value, *ptr =3D qdev_get_prop_ptr(obj, prop); > unsigned int slot, fn, n; > char *str; > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > if (!visit_type_str(v, name, &str, NULL)) { > if (!visit_type_int32(v, name, &value, errp)) { > return; > @@ -848,7 +802,6 @@ static void get_pci_host_devaddr(Object *obj, Visitor= *v, const char *name, > static void set_pci_host_devaddr(Object *obj, Visitor *v, const char *na= me, > void *opaque, Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > PCIHostDeviceAddress *addr =3D qdev_get_prop_ptr(obj, prop); > char *str, *p; > @@ -857,11 +810,6 @@ static void set_pci_host_devaddr(Object *obj, Visito= r *v, const char *name, > unsigned long dom =3D 0, bus =3D 0; > unsigned int slot =3D 0, func =3D 0; > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > if (!visit_type_str(v, name, &str, errp)) { > return; > } > @@ -972,16 +920,10 @@ static void get_prop_pcielinkspeed(Object *obj, Vis= itor *v, const char *name, > static void set_prop_pcielinkspeed(Object *obj, Visitor *v, const char *= name, > void *opaque, Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > PCIExpLinkSpeed *p =3D qdev_get_prop_ptr(obj, prop); > int speed; > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > if (!visit_type_enum(v, name, &speed, prop->info->enum_table, > errp)) { > return; > @@ -1057,16 +999,10 @@ static void get_prop_pcielinkwidth(Object *obj, Vi= sitor *v, const char *name, > static void set_prop_pcielinkwidth(Object *obj, Visitor *v, const char *= name, > void *opaque, Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > PCIExpLinkWidth *p =3D qdev_get_prop_ptr(obj, prop); > int width; > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > if (!visit_type_enum(v, name, &width, prop->info->enum_table, > errp)) { > return; > @@ -1129,16 +1065,10 @@ static void get_uuid(Object *obj, Visitor *v, con= st char *name, void *opaque, > static void set_uuid(Object *obj, Visitor *v, const char *name, void *op= aque, > Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > QemuUUID *uuid =3D qdev_get_prop_ptr(obj, prop); > char *str; > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > if (!visit_type_str(v, name, &str, errp)) { > return; > } > diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c > index b924f13d58..92f48ecbf2 100644 > --- a/hw/core/qdev-properties.c > +++ b/hw/core/qdev-properties.c > @@ -24,6 +24,19 @@ void qdev_prop_set_after_realize(DeviceState *dev, con= st char *name, > } > } > =20 > +/* returns: true if property is allowed to be set, false otherwise */ > +static bool qdev_prop_allow_set(Object *obj, const char *name, > + Error **errp) > +{ > + DeviceState *dev =3D DEVICE(obj); > + > + if (dev->realized) { > + qdev_prop_set_after_realize(dev, name, errp); > + return false; > + } > + return true; > +} > + > void qdev_prop_allow_set_link_before_realize(const Object *obj, > const char *name, > Object *val, Error **errp) > @@ -65,6 +78,11 @@ static void field_prop_set(Object *obj, Visitor *v, co= nst char *name, > void *opaque, Error **errp) > { > Property *prop =3D opaque; > + > + if (!qdev_prop_allow_set(obj, name, errp)) { > + return; > + } > + > return prop->info->set(obj, v, name, opaque, errp); > } > =20 > @@ -90,15 +108,9 @@ void qdev_propinfo_get_enum(Object *obj, Visitor *v, = const char *name, > void qdev_propinfo_set_enum(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > int *ptr =3D qdev_get_prop_ptr(obj, prop); > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > visit_type_enum(v, name, ptr, prop->info->enum_table, errp); > } > =20 > @@ -148,15 +160,9 @@ static void prop_get_bit(Object *obj, Visitor *v, co= nst char *name, > static void prop_set_bit(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > bool value; > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > if (!visit_type_bool(v, name, &value, errp)) { > return; > } > @@ -208,15 +214,9 @@ static void prop_get_bit64(Object *obj, Visitor *v, = const char *name, > static void prop_set_bit64(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > bool value; > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > if (!visit_type_bool(v, name, &value, errp)) { > return; > } > @@ -245,15 +245,9 @@ static void get_bool(Object *obj, Visitor *v, const = char *name, void *opaque, > static void set_bool(Object *obj, Visitor *v, const char *name, void *op= aque, > Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > bool *ptr =3D qdev_get_prop_ptr(obj, prop); > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > visit_type_bool(v, name, ptr, errp); > } > =20 > @@ -278,15 +272,9 @@ static void get_uint8(Object *obj, Visitor *v, const= char *name, void *opaque, > static void set_uint8(Object *obj, Visitor *v, const char *name, void *o= paque, > Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > uint8_t *ptr =3D qdev_get_prop_ptr(obj, prop); > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > visit_type_uint8(v, name, ptr, errp); > } > =20 > @@ -323,15 +311,9 @@ static void get_uint16(Object *obj, Visitor *v, cons= t char *name, > static void set_uint16(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > uint16_t *ptr =3D qdev_get_prop_ptr(obj, prop); > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > visit_type_uint16(v, name, ptr, errp); > } > =20 > @@ -356,15 +338,9 @@ static void get_uint32(Object *obj, Visitor *v, cons= t char *name, > static void set_uint32(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > uint32_t *ptr =3D qdev_get_prop_ptr(obj, prop); > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > visit_type_uint32(v, name, ptr, errp); > } > =20 > @@ -380,15 +356,9 @@ void qdev_propinfo_get_int32(Object *obj, Visitor *v= , const char *name, > static void set_int32(Object *obj, Visitor *v, const char *name, void *o= paque, > Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > int32_t *ptr =3D qdev_get_prop_ptr(obj, prop); > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > visit_type_int32(v, name, ptr, errp); > } > =20 > @@ -420,15 +390,9 @@ static void get_uint64(Object *obj, Visitor *v, cons= t char *name, > static void set_uint64(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > uint64_t *ptr =3D qdev_get_prop_ptr(obj, prop); > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > visit_type_uint64(v, name, ptr, errp); > } > =20 > @@ -444,15 +408,9 @@ static void get_int64(Object *obj, Visitor *v, const= char *name, > static void set_int64(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > int64_t *ptr =3D qdev_get_prop_ptr(obj, prop); > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > visit_type_int64(v, name, ptr, errp); > } > =20 > @@ -495,16 +453,10 @@ static void get_string(Object *obj, Visitor *v, con= st char *name, > static void set_string(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > char **ptr =3D qdev_get_prop_ptr(obj, prop); > char *str; > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > if (!visit_type_str(v, name, &str, errp)) { > return; > } > @@ -545,16 +497,10 @@ void qdev_propinfo_get_size32(Object *obj, Visitor = *v, const char *name, > static void set_size32(Object *obj, Visitor *v, const char *name, void *= opaque, > Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > uint32_t *ptr =3D qdev_get_prop_ptr(obj, prop); > uint64_t value; > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > if (!visit_type_size(v, name, &value, errp)) { > return; > } > @@ -621,10 +567,6 @@ static void set_prop_arraylen(Object *obj, Visitor *= v, const char *name, > const char *arrayname; > int i; > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > if (*alenptr) { > error_setg(errp, "array size property %s may not be set more tha= n once", > name); > @@ -864,15 +806,9 @@ static void get_size(Object *obj, Visitor *v, const = char *name, void *opaque, > static void set_size(Object *obj, Visitor *v, const char *name, void *op= aque, > Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > uint64_t *ptr =3D qdev_get_prop_ptr(obj, prop); > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > visit_type_size(v, name, ptr, errp); > } > =20 > diff --git a/hw/s390x/css.c b/hw/s390x/css.c > index 7a44320d12..496e2c5801 100644 > --- a/hw/s390x/css.c > +++ b/hw/s390x/css.c > @@ -2372,18 +2372,12 @@ static void get_css_devid(Object *obj, Visitor *v= , const char *name, > static void set_css_devid(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > CssDevId *dev_id =3D qdev_get_prop_ptr(obj, prop); > char *str; > int num, n1, n2; > unsigned int cssid, ssid, devid; > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > if (!visit_type_str(v, name, &str, errp)) { > return; > } > diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c > index 8b6be1197b..30511f620e 100644 > --- a/hw/s390x/s390-pci-bus.c > +++ b/hw/s390x/s390-pci-bus.c > @@ -1338,16 +1338,10 @@ static void s390_pci_get_fid(Object *obj, Visitor= *v, const char *name, > static void s390_pci_set_fid(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > S390PCIBusDevice *zpci =3D S390_PCI_DEVICE(obj); > Property *prop =3D opaque; > uint32_t *ptr =3D qdev_get_prop_ptr(obj, prop); > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > if (!visit_type_uint32(v, name, ptr, errp)) { > return; > } > diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c > index 53569925a2..802979635c 100644 > --- a/hw/vfio/pci-quirks.c > +++ b/hw/vfio/pci-quirks.c > @@ -1498,15 +1498,9 @@ static void set_nv_gpudirect_clique_id(Object *obj= , Visitor *v, > const char *name, void *opaque, > Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > uint8_t value, *ptr =3D qdev_get_prop_ptr(obj, prop); > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > if (!visit_type_uint8(v, name, &value, errp)) { > return; > } > diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c > index 92534bcd18..b730146bbe 100644 > --- a/target/sparc/cpu.c > +++ b/target/sparc/cpu.c > @@ -798,17 +798,11 @@ static void sparc_get_nwindows(Object *obj, Visitor= *v, const char *name, > static void sparc_set_nwindows(Object *obj, Visitor *v, const char *name= , > void *opaque, Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > const int64_t min =3D MIN_NWINDOWS; > const int64_t max =3D MAX_NWINDOWS; > SPARCCPU *cpu =3D SPARC_CPU(obj); > int64_t value; > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > if (!visit_type_int(v, name, &value, errp)) { > return; > } From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1F842C4361B for ; Mon, 14 Dec 2020 14:56:29 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A2D73225AB for ; Mon, 14 Dec 2020 14:56:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A2D73225AB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.52300.91373 (Exim 4.92) (envelope-from ) id 1kopGe-0004pu-Md; Mon, 14 Dec 2020 14:56:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 52300.91373; Mon, 14 Dec 2020 14:56:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kopGe-0004pn-JL; Mon, 14 Dec 2020 14:56:04 +0000 Received: by outflank-mailman (input) for mailman id 52300; Mon, 14 Dec 2020 14:56:03 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kopGd-0004pi-5U for xen-devel@lists.xenproject.org; Mon, 14 Dec 2020 14:56:03 +0000 Received: from us-smtp-delivery-124.mimecast.com (unknown [216.205.24.124]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTP id e3f625a2-965b-49ae-9099-188c6a461dff; Mon, 14 Dec 2020 14:56:00 +0000 (UTC) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-333-vSORlgemOjCyIva5SGouQg-1; Mon, 14 Dec 2020 09:55:58 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AB08910054FF; Mon, 14 Dec 2020 14:55:55 +0000 (UTC) Received: from localhost (unknown [10.40.208.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id CB03718B5E; Mon, 14 Dec 2020 14:55:32 +0000 (UTC) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: e3f625a2-965b-49ae-9099-188c6a461dff DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607957760; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AFj8Qphsj1DvLlA6c+EHeqCWHkgizY5fVaZLxxpViPo=; b=iLKfFxY1Q0hUMOTv0JEuBaVBaaQzBzmbDMhLNWbYZxwJhj7DUkHiZNiaLuYLrTiv2kykbj u+zH2d0cn1OKsp6DPA1pgdaTShsjzw3ZXX4G2kysTpvF1V6alNQ6ByuL16HcRHT7MnYZOk zmxKw20AYpLkmK0DIt9aHR2BgAl441Q= X-MC-Unique: vSORlgemOjCyIva5SGouQg-1 Date: Mon, 14 Dec 2020 15:55:30 +0100 From: Igor Mammedov To: Eduardo Habkost Cc: qemu-devel@nongnu.org, Markus Armbruster , Stefan Berger , =?UTF-8?B?TWFyYy1BbmRyw6k=?= Lureau , "Daniel P. Berrange" , Philippe =?UTF-8?B?TWF0aGlldS1EYXVkw6k=?= , John Snow , Kevin Wolf , Eric Blake , Paolo Bonzini , Stefan Berger , Stefano Stabellini , Anthony Perard , Paul Durrant , Max Reitz , Cornelia Huck , Halil Pasic , Christian Borntraeger , Richard Henderson , David Hildenbrand , Thomas Huth , Matthew Rosato , Alex Williamson , Mark Cave-Ayland , Artyom Tarasenko , xen-devel@lists.xenproject.org, qemu-block@nongnu.org, qemu-s390x@nongnu.org Subject: Re: [PATCH v4 23/32] qdev: Move dev->realized check to qdev_property_set() Message-ID: <20201214155530.55f80cd6@redhat.com> In-Reply-To: <20201211220529.2290218-24-ehabkost@redhat.com> References: <20201211220529.2290218-1-ehabkost@redhat.com> <20201211220529.2290218-24-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=imammedo@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Fri, 11 Dec 2020 17:05:20 -0500 Eduardo Habkost wrote: > Every single qdev property setter function manually checks > dev->realized. We can just check dev->realized inside > qdev_property_set() instead. >=20 > The check is being added as a separate function > (qdev_prop_allow_set()) because it will become a callback later. is callback added within this series? and I'd add here what's the purpose of it. >=20 > Reviewed-by: Stefan Berger > Signed-off-by: Eduardo Habkost > --- > Changes v1 -> v2: > * Removed unused variable at xen_block_set_vdev() > * Redone patch after changes in the previous patches in the > series > --- > Cc: Stefan Berger > Cc: Stefano Stabellini > Cc: Anthony Perard > Cc: Paul Durrant > Cc: Kevin Wolf > Cc: Max Reitz > Cc: Paolo Bonzini > Cc: "Daniel P. Berrang=C3=A9" > Cc: Eduardo Habkost > Cc: Cornelia Huck > Cc: Halil Pasic > Cc: Christian Borntraeger > Cc: Richard Henderson > Cc: David Hildenbrand > Cc: Thomas Huth > Cc: Matthew Rosato > Cc: Alex Williamson > Cc: Mark Cave-Ayland > Cc: Artyom Tarasenko > Cc: qemu-devel@nongnu.org > Cc: xen-devel@lists.xenproject.org > Cc: qemu-block@nongnu.org > Cc: qemu-s390x@nongnu.org > --- > backends/tpm/tpm_util.c | 6 -- > hw/block/xen-block.c | 6 -- > hw/core/qdev-properties-system.c | 70 ---------------------- > hw/core/qdev-properties.c | 100 ++++++------------------------- > hw/s390x/css.c | 6 -- > hw/s390x/s390-pci-bus.c | 6 -- > hw/vfio/pci-quirks.c | 6 -- > target/sparc/cpu.c | 6 -- > 8 files changed, 18 insertions(+), 188 deletions(-) >=20 > diff --git a/backends/tpm/tpm_util.c b/backends/tpm/tpm_util.c > index a5d997e7dc..39b45fa46d 100644 > --- a/backends/tpm/tpm_util.c > +++ b/backends/tpm/tpm_util.c > @@ -46,16 +46,10 @@ static void get_tpm(Object *obj, Visitor *v, const ch= ar *name, void *opaque, > static void set_tpm(Object *obj, Visitor *v, const char *name, void *opa= que, > Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > TPMBackend *s, **be =3D qdev_get_prop_ptr(obj, prop); > char *str; > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > if (!visit_type_str(v, name, &str, errp)) { > return; > } > diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c > index 905e4acd97..bd1aef63a7 100644 > --- a/hw/block/xen-block.c > +++ b/hw/block/xen-block.c > @@ -395,17 +395,11 @@ static int vbd_name_to_disk(const char *name, const= char **endp, > static void xen_block_set_vdev(Object *obj, Visitor *v, const char *name= , > void *opaque, Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > XenBlockVdev *vdev =3D qdev_get_prop_ptr(obj, prop); > char *str, *p; > const char *end; > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > if (!visit_type_str(v, name, &str, errp)) { > return; > } > diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-s= ystem.c > index 42529c3b65..f31aea3de1 100644 > --- a/hw/core/qdev-properties-system.c > +++ b/hw/core/qdev-properties-system.c > @@ -94,11 +94,6 @@ static void set_drive_helper(Object *obj, Visitor *v, = const char *name, > bool blk_created =3D false; > int ret; > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > if (!visit_type_str(v, name, &str, errp)) { > return; > } > @@ -230,17 +225,11 @@ static void get_chr(Object *obj, Visitor *v, const = char *name, void *opaque, > static void set_chr(Object *obj, Visitor *v, const char *name, void *opa= que, > Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > CharBackend *be =3D qdev_get_prop_ptr(obj, prop); > Chardev *s; > char *str; > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > if (!visit_type_str(v, name, &str, errp)) { > return; > } > @@ -311,18 +300,12 @@ static void get_mac(Object *obj, Visitor *v, const = char *name, void *opaque, > static void set_mac(Object *obj, Visitor *v, const char *name, void *opa= que, > Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > MACAddr *mac =3D qdev_get_prop_ptr(obj, prop); > int i, pos; > char *str; > const char *p; > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > if (!visit_type_str(v, name, &str, errp)) { > return; > } > @@ -390,7 +373,6 @@ static void get_netdev(Object *obj, Visitor *v, const= char *name, > static void set_netdev(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > NICPeers *peers_ptr =3D qdev_get_prop_ptr(obj, prop); > NetClientState **ncs =3D peers_ptr->ncs; > @@ -398,11 +380,6 @@ static void set_netdev(Object *obj, Visitor *v, cons= t char *name, > int queues, err =3D 0, i =3D 0; > char *str; > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > if (!visit_type_str(v, name, &str, errp)) { > return; > } > @@ -469,18 +446,12 @@ static void get_audiodev(Object *obj, Visitor *v, c= onst char* name, > static void set_audiodev(Object *obj, Visitor *v, const char* name, > void *opaque, Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > QEMUSoundCard *card =3D qdev_get_prop_ptr(obj, prop); > AudioState *state; > int err =3D 0; > char *str; > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > if (!visit_type_str(v, name, &str, errp)) { > return; > } > @@ -582,11 +553,6 @@ static void set_blocksize(Object *obj, Visitor *v, c= onst char *name, > uint64_t value; > Error *local_err =3D NULL; > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > if (!visit_type_size(v, name, &value, errp)) { > return; > } > @@ -686,7 +652,6 @@ static void get_reserved_region(Object *obj, Visitor = *v, const char *name, > static void set_reserved_region(Object *obj, Visitor *v, const char *nam= e, > void *opaque, Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > ReservedRegion *rr =3D qdev_get_prop_ptr(obj, prop); > Error *local_err =3D NULL; > @@ -694,11 +659,6 @@ static void set_reserved_region(Object *obj, Visitor= *v, const char *name, > char *str; > int ret; > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > visit_type_str(v, name, &str, &local_err); > if (local_err) { > error_propagate(errp, local_err); > @@ -754,17 +714,11 @@ const PropertyInfo qdev_prop_reserved_region =3D { > static void set_pci_devfn(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > int32_t value, *ptr =3D qdev_get_prop_ptr(obj, prop); > unsigned int slot, fn, n; > char *str; > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > if (!visit_type_str(v, name, &str, NULL)) { > if (!visit_type_int32(v, name, &value, errp)) { > return; > @@ -848,7 +802,6 @@ static void get_pci_host_devaddr(Object *obj, Visitor= *v, const char *name, > static void set_pci_host_devaddr(Object *obj, Visitor *v, const char *na= me, > void *opaque, Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > PCIHostDeviceAddress *addr =3D qdev_get_prop_ptr(obj, prop); > char *str, *p; > @@ -857,11 +810,6 @@ static void set_pci_host_devaddr(Object *obj, Visito= r *v, const char *name, > unsigned long dom =3D 0, bus =3D 0; > unsigned int slot =3D 0, func =3D 0; > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > if (!visit_type_str(v, name, &str, errp)) { > return; > } > @@ -972,16 +920,10 @@ static void get_prop_pcielinkspeed(Object *obj, Vis= itor *v, const char *name, > static void set_prop_pcielinkspeed(Object *obj, Visitor *v, const char *= name, > void *opaque, Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > PCIExpLinkSpeed *p =3D qdev_get_prop_ptr(obj, prop); > int speed; > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > if (!visit_type_enum(v, name, &speed, prop->info->enum_table, > errp)) { > return; > @@ -1057,16 +999,10 @@ static void get_prop_pcielinkwidth(Object *obj, Vi= sitor *v, const char *name, > static void set_prop_pcielinkwidth(Object *obj, Visitor *v, const char *= name, > void *opaque, Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > PCIExpLinkWidth *p =3D qdev_get_prop_ptr(obj, prop); > int width; > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > if (!visit_type_enum(v, name, &width, prop->info->enum_table, > errp)) { > return; > @@ -1129,16 +1065,10 @@ static void get_uuid(Object *obj, Visitor *v, con= st char *name, void *opaque, > static void set_uuid(Object *obj, Visitor *v, const char *name, void *op= aque, > Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > QemuUUID *uuid =3D qdev_get_prop_ptr(obj, prop); > char *str; > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > if (!visit_type_str(v, name, &str, errp)) { > return; > } > diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c > index b924f13d58..92f48ecbf2 100644 > --- a/hw/core/qdev-properties.c > +++ b/hw/core/qdev-properties.c > @@ -24,6 +24,19 @@ void qdev_prop_set_after_realize(DeviceState *dev, con= st char *name, > } > } > =20 > +/* returns: true if property is allowed to be set, false otherwise */ > +static bool qdev_prop_allow_set(Object *obj, const char *name, > + Error **errp) > +{ > + DeviceState *dev =3D DEVICE(obj); > + > + if (dev->realized) { > + qdev_prop_set_after_realize(dev, name, errp); > + return false; > + } > + return true; > +} > + > void qdev_prop_allow_set_link_before_realize(const Object *obj, > const char *name, > Object *val, Error **errp) > @@ -65,6 +78,11 @@ static void field_prop_set(Object *obj, Visitor *v, co= nst char *name, > void *opaque, Error **errp) > { > Property *prop =3D opaque; > + > + if (!qdev_prop_allow_set(obj, name, errp)) { > + return; > + } > + > return prop->info->set(obj, v, name, opaque, errp); > } > =20 > @@ -90,15 +108,9 @@ void qdev_propinfo_get_enum(Object *obj, Visitor *v, = const char *name, > void qdev_propinfo_set_enum(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > int *ptr =3D qdev_get_prop_ptr(obj, prop); > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > visit_type_enum(v, name, ptr, prop->info->enum_table, errp); > } > =20 > @@ -148,15 +160,9 @@ static void prop_get_bit(Object *obj, Visitor *v, co= nst char *name, > static void prop_set_bit(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > bool value; > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > if (!visit_type_bool(v, name, &value, errp)) { > return; > } > @@ -208,15 +214,9 @@ static void prop_get_bit64(Object *obj, Visitor *v, = const char *name, > static void prop_set_bit64(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > bool value; > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > if (!visit_type_bool(v, name, &value, errp)) { > return; > } > @@ -245,15 +245,9 @@ static void get_bool(Object *obj, Visitor *v, const = char *name, void *opaque, > static void set_bool(Object *obj, Visitor *v, const char *name, void *op= aque, > Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > bool *ptr =3D qdev_get_prop_ptr(obj, prop); > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > visit_type_bool(v, name, ptr, errp); > } > =20 > @@ -278,15 +272,9 @@ static void get_uint8(Object *obj, Visitor *v, const= char *name, void *opaque, > static void set_uint8(Object *obj, Visitor *v, const char *name, void *o= paque, > Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > uint8_t *ptr =3D qdev_get_prop_ptr(obj, prop); > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > visit_type_uint8(v, name, ptr, errp); > } > =20 > @@ -323,15 +311,9 @@ static void get_uint16(Object *obj, Visitor *v, cons= t char *name, > static void set_uint16(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > uint16_t *ptr =3D qdev_get_prop_ptr(obj, prop); > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > visit_type_uint16(v, name, ptr, errp); > } > =20 > @@ -356,15 +338,9 @@ static void get_uint32(Object *obj, Visitor *v, cons= t char *name, > static void set_uint32(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > uint32_t *ptr =3D qdev_get_prop_ptr(obj, prop); > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > visit_type_uint32(v, name, ptr, errp); > } > =20 > @@ -380,15 +356,9 @@ void qdev_propinfo_get_int32(Object *obj, Visitor *v= , const char *name, > static void set_int32(Object *obj, Visitor *v, const char *name, void *o= paque, > Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > int32_t *ptr =3D qdev_get_prop_ptr(obj, prop); > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > visit_type_int32(v, name, ptr, errp); > } > =20 > @@ -420,15 +390,9 @@ static void get_uint64(Object *obj, Visitor *v, cons= t char *name, > static void set_uint64(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > uint64_t *ptr =3D qdev_get_prop_ptr(obj, prop); > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > visit_type_uint64(v, name, ptr, errp); > } > =20 > @@ -444,15 +408,9 @@ static void get_int64(Object *obj, Visitor *v, const= char *name, > static void set_int64(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > int64_t *ptr =3D qdev_get_prop_ptr(obj, prop); > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > visit_type_int64(v, name, ptr, errp); > } > =20 > @@ -495,16 +453,10 @@ static void get_string(Object *obj, Visitor *v, con= st char *name, > static void set_string(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > char **ptr =3D qdev_get_prop_ptr(obj, prop); > char *str; > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > if (!visit_type_str(v, name, &str, errp)) { > return; > } > @@ -545,16 +497,10 @@ void qdev_propinfo_get_size32(Object *obj, Visitor = *v, const char *name, > static void set_size32(Object *obj, Visitor *v, const char *name, void *= opaque, > Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > uint32_t *ptr =3D qdev_get_prop_ptr(obj, prop); > uint64_t value; > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > if (!visit_type_size(v, name, &value, errp)) { > return; > } > @@ -621,10 +567,6 @@ static void set_prop_arraylen(Object *obj, Visitor *= v, const char *name, > const char *arrayname; > int i; > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > if (*alenptr) { > error_setg(errp, "array size property %s may not be set more tha= n once", > name); > @@ -864,15 +806,9 @@ static void get_size(Object *obj, Visitor *v, const = char *name, void *opaque, > static void set_size(Object *obj, Visitor *v, const char *name, void *op= aque, > Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > uint64_t *ptr =3D qdev_get_prop_ptr(obj, prop); > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > visit_type_size(v, name, ptr, errp); > } > =20 > diff --git a/hw/s390x/css.c b/hw/s390x/css.c > index 7a44320d12..496e2c5801 100644 > --- a/hw/s390x/css.c > +++ b/hw/s390x/css.c > @@ -2372,18 +2372,12 @@ static void get_css_devid(Object *obj, Visitor *v= , const char *name, > static void set_css_devid(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > CssDevId *dev_id =3D qdev_get_prop_ptr(obj, prop); > char *str; > int num, n1, n2; > unsigned int cssid, ssid, devid; > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > if (!visit_type_str(v, name, &str, errp)) { > return; > } > diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c > index 8b6be1197b..30511f620e 100644 > --- a/hw/s390x/s390-pci-bus.c > +++ b/hw/s390x/s390-pci-bus.c > @@ -1338,16 +1338,10 @@ static void s390_pci_get_fid(Object *obj, Visitor= *v, const char *name, > static void s390_pci_set_fid(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > S390PCIBusDevice *zpci =3D S390_PCI_DEVICE(obj); > Property *prop =3D opaque; > uint32_t *ptr =3D qdev_get_prop_ptr(obj, prop); > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > if (!visit_type_uint32(v, name, ptr, errp)) { > return; > } > diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c > index 53569925a2..802979635c 100644 > --- a/hw/vfio/pci-quirks.c > +++ b/hw/vfio/pci-quirks.c > @@ -1498,15 +1498,9 @@ static void set_nv_gpudirect_clique_id(Object *obj= , Visitor *v, > const char *name, void *opaque, > Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > Property *prop =3D opaque; > uint8_t value, *ptr =3D qdev_get_prop_ptr(obj, prop); > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > if (!visit_type_uint8(v, name, &value, errp)) { > return; > } > diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c > index 92534bcd18..b730146bbe 100644 > --- a/target/sparc/cpu.c > +++ b/target/sparc/cpu.c > @@ -798,17 +798,11 @@ static void sparc_get_nwindows(Object *obj, Visitor= *v, const char *name, > static void sparc_set_nwindows(Object *obj, Visitor *v, const char *name= , > void *opaque, Error **errp) > { > - DeviceState *dev =3D DEVICE(obj); > const int64_t min =3D MIN_NWINDOWS; > const int64_t max =3D MAX_NWINDOWS; > SPARCCPU *cpu =3D SPARC_CPU(obj); > int64_t value; > =20 > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > if (!visit_type_int(v, name, &value, errp)) { > return; > }