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=-11.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 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 C9A71C4741F for ; Wed, 4 Nov 2020 17:33:54 +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 3199120759 for ; Wed, 4 Nov 2020 17:33:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="sqLpSap+" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3199120759 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.ibm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:45276 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaMfR-0003ps-8Z for qemu-devel@archiver.kernel.org; Wed, 04 Nov 2020 12:33:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33490) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaMai-0006ya-T1; Wed, 04 Nov 2020 12:29:05 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:22624 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaMac-00008f-BN; Wed, 04 Nov 2020 12:28:58 -0500 Received: from pps.filterd (m0098413.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 0A4H1jHH087383; Wed, 4 Nov 2020 12:28:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=subject : to : cc : references : from : message-id : date : mime-version : in-reply-to : content-type : content-transfer-encoding; s=pp1; bh=CQaIPTu1V00XFULpDd6hcs3dwTUolPI4jmr/URsyTf8=; b=sqLpSap+DF5NsmQCSX8z0sQORyvWvpk/qvxxRhQF8K305QsvTgacoLGJIZRhCHe9EPy6 tmOkjWaWzxieFJhtBVAa7ZZgY4HCBSzXEhldLbRTNb3FvSppcxZTuagZu+0iFlD62GdO qTPVpCaA06CfbhXmmZvfzpFi6BGAvt33lAeRbQXCXjn1iHwu9KvgbjvTErblaAMOblYX eKwVhM9CYQKJJoBrKsXzWijcSitCVVnB5KkoFTZHf4UL9DAFjWl7t4uwAAb52utjN9CM perBcVSnBiPLIfhZ/bWTNlY4X+ARUUceurbjzpGAv64TAbflci+sBgk3ooKdsgFz8oL8 kQ== Received: from pps.reinject (localhost [127.0.0.1]) by mx0b-001b2d01.pphosted.com with ESMTP id 34kxep56r5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 04 Nov 2020 12:28:40 -0500 Received: from m0098413.ppops.net (m0098413.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.36/8.16.0.36) with SMTP id 0A4HHO74156506; Wed, 4 Nov 2020 12:28:40 -0500 Received: from ppma02wdc.us.ibm.com (aa.5b.37a9.ip4.static.sl-reverse.com [169.55.91.170]) by mx0b-001b2d01.pphosted.com with ESMTP id 34kxep56qk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 04 Nov 2020 12:28:40 -0500 Received: from pps.filterd (ppma02wdc.us.ibm.com [127.0.0.1]) by ppma02wdc.us.ibm.com (8.16.0.42/8.16.0.42) with SMTP id 0A4HO5e3009461; Wed, 4 Nov 2020 17:28:39 GMT Received: from b03cxnp08027.gho.boulder.ibm.com (b03cxnp08027.gho.boulder.ibm.com [9.17.130.19]) by ppma02wdc.us.ibm.com with ESMTP id 34h0ew82ks-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 04 Nov 2020 17:28:39 +0000 Received: from b03ledav004.gho.boulder.ibm.com (b03ledav004.gho.boulder.ibm.com [9.17.130.235]) by b03cxnp08027.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 0A4HSWdS37814678 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 4 Nov 2020 17:28:32 GMT Received: from b03ledav004.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D00BA78064; Wed, 4 Nov 2020 17:28:37 +0000 (GMT) Received: from b03ledav004.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 56BBB7805C; Wed, 4 Nov 2020 17:28:36 +0000 (GMT) Received: from sbct-3.pok.ibm.com (unknown [9.47.158.153]) by b03ledav004.gho.boulder.ibm.com (Postfix) with ESMTP; Wed, 4 Nov 2020 17:28:36 +0000 (GMT) Subject: Re: [PATCH v2 22/44] qdev: Move dev->realized check to qdev_property_set() To: Eduardo Habkost , qemu-devel@nongnu.org References: <20201104160021.2342108-1-ehabkost@redhat.com> <20201104160021.2342108-23-ehabkost@redhat.com> From: Stefan Berger Message-ID: Date: Wed, 4 Nov 2020 12:28:35 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.11.0 MIME-Version: 1.0 In-Reply-To: <20201104160021.2342108-23-ehabkost@redhat.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.312, 18.0.737 definitions=2020-11-04_11:2020-11-04, 2020-11-04 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 mlxlogscore=999 impostorscore=0 malwarescore=0 suspectscore=0 adultscore=0 clxscore=1011 phishscore=0 priorityscore=1501 lowpriorityscore=0 bulkscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2011040123 Received-SPF: pass client-ip=148.163.158.5; envelope-from=stefanb@linux.ibm.com; helo=mx0a-001b2d01.pphosted.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/04 12:25:56 X-ACL-Warn: Detected OS = Linux 3.x [generic] [fuzzy] X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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 , David Hildenbrand , Mark Cave-Ayland , Stefano Stabellini , xen-devel@lists.xenproject.org, qemu-block@nongnu.org, Stefan Berger , Paul Durrant , Markus Armbruster , Halil Pasic , Christian Borntraeger , Anthony Perard , =?UTF-8?Q?Marc-Andr=c3=a9_Lureau?= , =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , Artyom Tarasenko , Thomas Huth , Alex Williamson , Paolo Bonzini , John Snow , Richard Henderson , Kevin Wolf , "Daniel P. Berrange" , Cornelia Huck , qemu-s390x@nongnu.org, Max Reitz , Igor Mammedov Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 11/4/20 10:59 AM, Eduardo Habkost wrote: > Every single qdev property setter function manually checks > dev->realized. We can just check dev->realized inside > qdev_property_set() instead. > > The check is being added as a separate function > (qdev_prop_allow_set()) because it will become a callback later. > > Signed-off-by: Eduardo Habkost Reviewed-by: Stefan Berger > --- > 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é" > 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(-) > > diff --git a/backends/tpm/tpm_util.c b/backends/tpm/tpm_util.c > index dba2f6b04a..0b07cf55ea 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 char *name, void *opaque, > static void set_tpm(Object *obj, Visitor *v, const char *name, void *opaque, > Error **errp) > { > - DeviceState *dev = DEVICE(obj); > Property *prop = opaque; > TPMBackend *s, **be = qdev_get_prop_ptr(obj, prop); > char *str; > > - 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 = DEVICE(obj); > Property *prop = opaque; > XenBlockVdev *vdev = qdev_get_prop_ptr(obj, prop); > char *str, *p; > const char *end; > > - 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-system.c > index 202abd0e4b..0d3e57bba0 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 = false; > int ret; > > - 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 *opaque, > Error **errp) > { > - DeviceState *dev = DEVICE(obj); > Property *prop = opaque; > CharBackend *be = qdev_get_prop_ptr(obj, prop); > Chardev *s; > char *str; > > - 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 *opaque, > Error **errp) > { > - DeviceState *dev = DEVICE(obj); > Property *prop = opaque; > MACAddr *mac = qdev_get_prop_ptr(obj, prop); > int i, pos; > char *str; > const char *p; > > - 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 = DEVICE(obj); > Property *prop = opaque; > NICPeers *peers_ptr = qdev_get_prop_ptr(obj, prop); > NetClientState **ncs = peers_ptr->ncs; > @@ -398,11 +380,6 @@ static void set_netdev(Object *obj, Visitor *v, const char *name, > int queues, err = 0, i = 0; > char *str; > > - 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, const char* name, > static void set_audiodev(Object *obj, Visitor *v, const char* name, > void *opaque, Error **errp) > { > - DeviceState *dev = DEVICE(obj); > Property *prop = opaque; > QEMUSoundCard *card = qdev_get_prop_ptr(obj, prop); > AudioState *state; > int err = 0; > char *str; > > - 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, const char *name, > uint64_t value; > Error *local_err = NULL; > > - 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 *name, > void *opaque, Error **errp) > { > - DeviceState *dev = DEVICE(obj); > Property *prop = opaque; > ReservedRegion *rr = qdev_get_prop_ptr(obj, prop); > Error *local_err = NULL; > @@ -694,11 +659,6 @@ static void set_reserved_region(Object *obj, Visitor *v, const char *name, > char *str; > int ret; > > - 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 = { > static void set_pci_devfn(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > - DeviceState *dev = DEVICE(obj); > Property *prop = opaque; > int32_t value, *ptr = qdev_get_prop_ptr(obj, prop); > unsigned int slot, fn, n; > char *str; > > - 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 *name, > void *opaque, Error **errp) > { > - DeviceState *dev = DEVICE(obj); > Property *prop = opaque; > PCIHostDeviceAddress *addr = qdev_get_prop_ptr(obj, prop); > char *str, *p; > @@ -857,11 +810,6 @@ static void set_pci_host_devaddr(Object *obj, Visitor *v, const char *name, > unsigned long dom = 0, bus = 0; > unsigned int slot = 0, func = 0; > > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > if (!visit_type_str(v, name, &str, errp)) { > return; > } > @@ -971,16 +919,10 @@ static void get_prop_pcielinkspeed(Object *obj, Visitor *v, const char *name, > static void set_prop_pcielinkspeed(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > - DeviceState *dev = DEVICE(obj); > Property *prop = opaque; > PCIExpLinkSpeed *p = qdev_get_prop_ptr(obj, prop); > int speed; > > - 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; > @@ -1056,16 +998,10 @@ static void get_prop_pcielinkwidth(Object *obj, Visitor *v, const char *name, > static void set_prop_pcielinkwidth(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > - DeviceState *dev = DEVICE(obj); > Property *prop = opaque; > PCIExpLinkWidth *p = qdev_get_prop_ptr(obj, prop); > int width; > > - 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; > @@ -1128,16 +1064,10 @@ static void get_uuid(Object *obj, Visitor *v, const char *name, void *opaque, > static void set_uuid(Object *obj, Visitor *v, const char *name, void *opaque, > Error **errp) > { > - DeviceState *dev = DEVICE(obj); > Property *prop = opaque; > QemuUUID *uuid = qdev_get_prop_ptr(obj, prop); > char *str; > > - 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 0e5ff81da8..ff36eb250e 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, const char *name, > } > } > > +/* 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 = 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, const char *name, > void *opaque, Error **errp) > { > Property *prop = opaque; > + > + if (!qdev_prop_allow_set(obj, name, errp)) { > + return; > + } > + > return prop->info->set(obj, v, name, opaque, errp); > } > > @@ -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 = DEVICE(obj); > Property *prop = opaque; > int *ptr = qdev_get_prop_ptr(obj, prop); > > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > visit_type_enum(v, name, ptr, prop->info->enum_table, errp); > } > > @@ -148,15 +160,9 @@ static void prop_get_bit(Object *obj, Visitor *v, const char *name, > static void prop_set_bit(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > - DeviceState *dev = DEVICE(obj); > Property *prop = opaque; > bool value; > > - 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 = DEVICE(obj); > Property *prop = opaque; > bool value; > > - 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 *opaque, > Error **errp) > { > - DeviceState *dev = DEVICE(obj); > Property *prop = opaque; > bool *ptr = qdev_get_prop_ptr(obj, prop); > > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > visit_type_bool(v, name, ptr, errp); > } > > @@ -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 *opaque, > Error **errp) > { > - DeviceState *dev = DEVICE(obj); > Property *prop = opaque; > uint8_t *ptr = qdev_get_prop_ptr(obj, prop); > > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > visit_type_uint8(v, name, ptr, errp); > } > > @@ -323,15 +311,9 @@ void qdev_propinfo_get_uint16(Object *obj, Visitor *v, const char *name, > static void set_uint16(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > - DeviceState *dev = DEVICE(obj); > Property *prop = opaque; > uint16_t *ptr = qdev_get_prop_ptr(obj, prop); > > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > visit_type_uint16(v, name, ptr, errp); > } > > @@ -356,15 +338,9 @@ static void get_uint32(Object *obj, Visitor *v, const char *name, > static void set_uint32(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > - DeviceState *dev = DEVICE(obj); > Property *prop = opaque; > uint32_t *ptr = qdev_get_prop_ptr(obj, prop); > > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > visit_type_uint32(v, name, ptr, errp); > } > > @@ -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 *opaque, > Error **errp) > { > - DeviceState *dev = DEVICE(obj); > Property *prop = opaque; > int32_t *ptr = qdev_get_prop_ptr(obj, prop); > > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > visit_type_int32(v, name, ptr, errp); > } > > @@ -420,15 +390,9 @@ static void get_uint64(Object *obj, Visitor *v, const char *name, > static void set_uint64(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > - DeviceState *dev = DEVICE(obj); > Property *prop = opaque; > uint64_t *ptr = qdev_get_prop_ptr(obj, prop); > > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > visit_type_uint64(v, name, ptr, errp); > } > > @@ -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 = DEVICE(obj); > Property *prop = opaque; > int64_t *ptr = qdev_get_prop_ptr(obj, prop); > > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > visit_type_int64(v, name, ptr, errp); > } > > @@ -495,16 +453,10 @@ static void get_string(Object *obj, Visitor *v, const char *name, > static void set_string(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > - DeviceState *dev = DEVICE(obj); > Property *prop = opaque; > char **ptr = qdev_get_prop_ptr(obj, prop); > char *str; > > - 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 = DEVICE(obj); > Property *prop = opaque; > uint32_t *ptr = qdev_get_prop_ptr(obj, prop); > uint64_t value; > > - 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; > > - 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 than 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 *opaque, > Error **errp) > { > - DeviceState *dev = DEVICE(obj); > Property *prop = opaque; > uint64_t *ptr = qdev_get_prop_ptr(obj, prop); > > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > visit_type_size(v, name, ptr, errp); > } > > 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 = DEVICE(obj); > Property *prop = opaque; > CssDevId *dev_id = qdev_get_prop_ptr(obj, prop); > char *str; > int num, n1, n2; > unsigned int cssid, ssid, devid; > > - 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 ab27b6e848..54fac3851d 100644 > --- a/hw/s390x/s390-pci-bus.c > +++ b/hw/s390x/s390-pci-bus.c > @@ -1331,16 +1331,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 = DEVICE(obj); > S390PCIBusDevice *zpci = S390_PCI_DEVICE(obj); > Property *prop = opaque; > uint32_t *ptr = qdev_get_prop_ptr(obj, prop); > > - 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 = DEVICE(obj); > Property *prop = opaque; > uint8_t value, *ptr = qdev_get_prop_ptr(obj, prop); > > - 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 f5cff4103b..3375fffb38 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 = DEVICE(obj); > const int64_t min = MIN_NWINDOWS; > const int64_t max = MAX_NWINDOWS; > SPARCCPU *cpu = SPARC_CPU(obj); > int64_t value; > > - 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=-11.2 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 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 36495C2D0A3 for ; Wed, 4 Nov 2020 17:29:05 +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 A2B6A20759 for ; Wed, 4 Nov 2020 17:29:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="sqLpSap+" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A2B6A20759 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.ibm.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.19451.44660 (Exim 4.92) (envelope-from ) id 1kaMab-0005Ix-RP; Wed, 04 Nov 2020 17:28:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 19451.44660; Wed, 04 Nov 2020 17:28:53 +0000 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" Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kaMab-0005Iq-OR; Wed, 04 Nov 2020 17:28:53 +0000 Received: by outflank-mailman (input) for mailman id 19451; Wed, 04 Nov 2020 17:28:53 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kaMaa-0005Il-VO for xen-devel@lists.xenproject.org; Wed, 04 Nov 2020 17:28:53 +0000 Received: from mx0a-001b2d01.pphosted.com (unknown [148.163.158.5]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 235287bf-62c5-468d-9765-a112a8370f2c; Wed, 04 Nov 2020 17:28:51 +0000 (UTC) Received: from pps.filterd (m0098413.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 0A4H1jHH087383; Wed, 4 Nov 2020 12:28:41 -0500 Received: from pps.reinject (localhost [127.0.0.1]) by mx0b-001b2d01.pphosted.com with ESMTP id 34kxep56r5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 04 Nov 2020 12:28:40 -0500 Received: from m0098413.ppops.net (m0098413.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.36/8.16.0.36) with SMTP id 0A4HHO74156506; Wed, 4 Nov 2020 12:28:40 -0500 Received: from ppma02wdc.us.ibm.com (aa.5b.37a9.ip4.static.sl-reverse.com [169.55.91.170]) by mx0b-001b2d01.pphosted.com with ESMTP id 34kxep56qk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 04 Nov 2020 12:28:40 -0500 Received: from pps.filterd (ppma02wdc.us.ibm.com [127.0.0.1]) by ppma02wdc.us.ibm.com (8.16.0.42/8.16.0.42) with SMTP id 0A4HO5e3009461; Wed, 4 Nov 2020 17:28:39 GMT Received: from b03cxnp08027.gho.boulder.ibm.com (b03cxnp08027.gho.boulder.ibm.com [9.17.130.19]) by ppma02wdc.us.ibm.com with ESMTP id 34h0ew82ks-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 04 Nov 2020 17:28:39 +0000 Received: from b03ledav004.gho.boulder.ibm.com (b03ledav004.gho.boulder.ibm.com [9.17.130.235]) by b03cxnp08027.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 0A4HSWdS37814678 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 4 Nov 2020 17:28:32 GMT Received: from b03ledav004.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D00BA78064; Wed, 4 Nov 2020 17:28:37 +0000 (GMT) Received: from b03ledav004.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 56BBB7805C; Wed, 4 Nov 2020 17:28:36 +0000 (GMT) Received: from sbct-3.pok.ibm.com (unknown [9.47.158.153]) by b03ledav004.gho.boulder.ibm.com (Postfix) with ESMTP; Wed, 4 Nov 2020 17:28:36 +0000 (GMT) Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kaMaa-0005Il-VO for xen-devel@lists.xenproject.org; Wed, 04 Nov 2020 17:28:53 +0000 X-Inumbo-ID: 235287bf-62c5-468d-9765-a112a8370f2c Received: from mx0a-001b2d01.pphosted.com (unknown [148.163.158.5]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 235287bf-62c5-468d-9765-a112a8370f2c; Wed, 04 Nov 2020 17:28:51 +0000 (UTC) Received: from pps.filterd (m0098413.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 0A4H1jHH087383; Wed, 4 Nov 2020 12:28:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=subject : to : cc : references : from : message-id : date : mime-version : in-reply-to : content-type : content-transfer-encoding; s=pp1; bh=CQaIPTu1V00XFULpDd6hcs3dwTUolPI4jmr/URsyTf8=; b=sqLpSap+DF5NsmQCSX8z0sQORyvWvpk/qvxxRhQF8K305QsvTgacoLGJIZRhCHe9EPy6 tmOkjWaWzxieFJhtBVAa7ZZgY4HCBSzXEhldLbRTNb3FvSppcxZTuagZu+0iFlD62GdO qTPVpCaA06CfbhXmmZvfzpFi6BGAvt33lAeRbQXCXjn1iHwu9KvgbjvTErblaAMOblYX eKwVhM9CYQKJJoBrKsXzWijcSitCVVnB5KkoFTZHf4UL9DAFjWl7t4uwAAb52utjN9CM perBcVSnBiPLIfhZ/bWTNlY4X+ARUUceurbjzpGAv64TAbflci+sBgk3ooKdsgFz8oL8 kQ== Received: from pps.reinject (localhost [127.0.0.1]) by mx0b-001b2d01.pphosted.com with ESMTP id 34kxep56r5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 04 Nov 2020 12:28:40 -0500 Received: from m0098413.ppops.net (m0098413.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.36/8.16.0.36) with SMTP id 0A4HHO74156506; Wed, 4 Nov 2020 12:28:40 -0500 Received: from ppma02wdc.us.ibm.com (aa.5b.37a9.ip4.static.sl-reverse.com [169.55.91.170]) by mx0b-001b2d01.pphosted.com with ESMTP id 34kxep56qk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 04 Nov 2020 12:28:40 -0500 Received: from pps.filterd (ppma02wdc.us.ibm.com [127.0.0.1]) by ppma02wdc.us.ibm.com (8.16.0.42/8.16.0.42) with SMTP id 0A4HO5e3009461; Wed, 4 Nov 2020 17:28:39 GMT Received: from b03cxnp08027.gho.boulder.ibm.com (b03cxnp08027.gho.boulder.ibm.com [9.17.130.19]) by ppma02wdc.us.ibm.com with ESMTP id 34h0ew82ks-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 04 Nov 2020 17:28:39 +0000 Received: from b03ledav004.gho.boulder.ibm.com (b03ledav004.gho.boulder.ibm.com [9.17.130.235]) by b03cxnp08027.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 0A4HSWdS37814678 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 4 Nov 2020 17:28:32 GMT Received: from b03ledav004.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D00BA78064; Wed, 4 Nov 2020 17:28:37 +0000 (GMT) Received: from b03ledav004.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 56BBB7805C; Wed, 4 Nov 2020 17:28:36 +0000 (GMT) Received: from sbct-3.pok.ibm.com (unknown [9.47.158.153]) by b03ledav004.gho.boulder.ibm.com (Postfix) with ESMTP; Wed, 4 Nov 2020 17:28:36 +0000 (GMT) Subject: Re: [PATCH v2 22/44] qdev: Move dev->realized check to qdev_property_set() To: Eduardo Habkost , qemu-devel@nongnu.org Cc: "Daniel P. Berrange" , Paolo Bonzini , Igor Mammedov , Eric Blake , Markus Armbruster , =?UTF-8?Q?Marc-Andr=c3=a9_Lureau?= , John Snow , =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , Stefan Berger , Stefano Stabellini , Anthony Perard , Paul Durrant , Kevin Wolf , 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 References: <20201104160021.2342108-1-ehabkost@redhat.com> <20201104160021.2342108-23-ehabkost@redhat.com> From: Stefan Berger Message-ID: Date: Wed, 4 Nov 2020 12:28:35 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.11.0 MIME-Version: 1.0 In-Reply-To: <20201104160021.2342108-23-ehabkost@redhat.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.312,18.0.737 definitions=2020-11-04_11:2020-11-04,2020-11-04 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 mlxlogscore=999 impostorscore=0 malwarescore=0 suspectscore=0 adultscore=0 clxscore=1011 phishscore=0 priorityscore=1501 lowpriorityscore=0 bulkscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2011040123 On 11/4/20 10:59 AM, Eduardo Habkost wrote: > Every single qdev property setter function manually checks > dev->realized. We can just check dev->realized inside > qdev_property_set() instead. > > The check is being added as a separate function > (qdev_prop_allow_set()) because it will become a callback later. > > Signed-off-by: Eduardo Habkost Reviewed-by: Stefan Berger > --- > 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é" > 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(-) > > diff --git a/backends/tpm/tpm_util.c b/backends/tpm/tpm_util.c > index dba2f6b04a..0b07cf55ea 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 char *name, void *opaque, > static void set_tpm(Object *obj, Visitor *v, const char *name, void *opaque, > Error **errp) > { > - DeviceState *dev = DEVICE(obj); > Property *prop = opaque; > TPMBackend *s, **be = qdev_get_prop_ptr(obj, prop); > char *str; > > - 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 = DEVICE(obj); > Property *prop = opaque; > XenBlockVdev *vdev = qdev_get_prop_ptr(obj, prop); > char *str, *p; > const char *end; > > - 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-system.c > index 202abd0e4b..0d3e57bba0 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 = false; > int ret; > > - 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 *opaque, > Error **errp) > { > - DeviceState *dev = DEVICE(obj); > Property *prop = opaque; > CharBackend *be = qdev_get_prop_ptr(obj, prop); > Chardev *s; > char *str; > > - 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 *opaque, > Error **errp) > { > - DeviceState *dev = DEVICE(obj); > Property *prop = opaque; > MACAddr *mac = qdev_get_prop_ptr(obj, prop); > int i, pos; > char *str; > const char *p; > > - 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 = DEVICE(obj); > Property *prop = opaque; > NICPeers *peers_ptr = qdev_get_prop_ptr(obj, prop); > NetClientState **ncs = peers_ptr->ncs; > @@ -398,11 +380,6 @@ static void set_netdev(Object *obj, Visitor *v, const char *name, > int queues, err = 0, i = 0; > char *str; > > - 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, const char* name, > static void set_audiodev(Object *obj, Visitor *v, const char* name, > void *opaque, Error **errp) > { > - DeviceState *dev = DEVICE(obj); > Property *prop = opaque; > QEMUSoundCard *card = qdev_get_prop_ptr(obj, prop); > AudioState *state; > int err = 0; > char *str; > > - 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, const char *name, > uint64_t value; > Error *local_err = NULL; > > - 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 *name, > void *opaque, Error **errp) > { > - DeviceState *dev = DEVICE(obj); > Property *prop = opaque; > ReservedRegion *rr = qdev_get_prop_ptr(obj, prop); > Error *local_err = NULL; > @@ -694,11 +659,6 @@ static void set_reserved_region(Object *obj, Visitor *v, const char *name, > char *str; > int ret; > > - 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 = { > static void set_pci_devfn(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > - DeviceState *dev = DEVICE(obj); > Property *prop = opaque; > int32_t value, *ptr = qdev_get_prop_ptr(obj, prop); > unsigned int slot, fn, n; > char *str; > > - 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 *name, > void *opaque, Error **errp) > { > - DeviceState *dev = DEVICE(obj); > Property *prop = opaque; > PCIHostDeviceAddress *addr = qdev_get_prop_ptr(obj, prop); > char *str, *p; > @@ -857,11 +810,6 @@ static void set_pci_host_devaddr(Object *obj, Visitor *v, const char *name, > unsigned long dom = 0, bus = 0; > unsigned int slot = 0, func = 0; > > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > if (!visit_type_str(v, name, &str, errp)) { > return; > } > @@ -971,16 +919,10 @@ static void get_prop_pcielinkspeed(Object *obj, Visitor *v, const char *name, > static void set_prop_pcielinkspeed(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > - DeviceState *dev = DEVICE(obj); > Property *prop = opaque; > PCIExpLinkSpeed *p = qdev_get_prop_ptr(obj, prop); > int speed; > > - 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; > @@ -1056,16 +998,10 @@ static void get_prop_pcielinkwidth(Object *obj, Visitor *v, const char *name, > static void set_prop_pcielinkwidth(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > - DeviceState *dev = DEVICE(obj); > Property *prop = opaque; > PCIExpLinkWidth *p = qdev_get_prop_ptr(obj, prop); > int width; > > - 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; > @@ -1128,16 +1064,10 @@ static void get_uuid(Object *obj, Visitor *v, const char *name, void *opaque, > static void set_uuid(Object *obj, Visitor *v, const char *name, void *opaque, > Error **errp) > { > - DeviceState *dev = DEVICE(obj); > Property *prop = opaque; > QemuUUID *uuid = qdev_get_prop_ptr(obj, prop); > char *str; > > - 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 0e5ff81da8..ff36eb250e 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, const char *name, > } > } > > +/* 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 = 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, const char *name, > void *opaque, Error **errp) > { > Property *prop = opaque; > + > + if (!qdev_prop_allow_set(obj, name, errp)) { > + return; > + } > + > return prop->info->set(obj, v, name, opaque, errp); > } > > @@ -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 = DEVICE(obj); > Property *prop = opaque; > int *ptr = qdev_get_prop_ptr(obj, prop); > > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > visit_type_enum(v, name, ptr, prop->info->enum_table, errp); > } > > @@ -148,15 +160,9 @@ static void prop_get_bit(Object *obj, Visitor *v, const char *name, > static void prop_set_bit(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > - DeviceState *dev = DEVICE(obj); > Property *prop = opaque; > bool value; > > - 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 = DEVICE(obj); > Property *prop = opaque; > bool value; > > - 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 *opaque, > Error **errp) > { > - DeviceState *dev = DEVICE(obj); > Property *prop = opaque; > bool *ptr = qdev_get_prop_ptr(obj, prop); > > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > visit_type_bool(v, name, ptr, errp); > } > > @@ -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 *opaque, > Error **errp) > { > - DeviceState *dev = DEVICE(obj); > Property *prop = opaque; > uint8_t *ptr = qdev_get_prop_ptr(obj, prop); > > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > visit_type_uint8(v, name, ptr, errp); > } > > @@ -323,15 +311,9 @@ void qdev_propinfo_get_uint16(Object *obj, Visitor *v, const char *name, > static void set_uint16(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > - DeviceState *dev = DEVICE(obj); > Property *prop = opaque; > uint16_t *ptr = qdev_get_prop_ptr(obj, prop); > > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > visit_type_uint16(v, name, ptr, errp); > } > > @@ -356,15 +338,9 @@ static void get_uint32(Object *obj, Visitor *v, const char *name, > static void set_uint32(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > - DeviceState *dev = DEVICE(obj); > Property *prop = opaque; > uint32_t *ptr = qdev_get_prop_ptr(obj, prop); > > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > visit_type_uint32(v, name, ptr, errp); > } > > @@ -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 *opaque, > Error **errp) > { > - DeviceState *dev = DEVICE(obj); > Property *prop = opaque; > int32_t *ptr = qdev_get_prop_ptr(obj, prop); > > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > visit_type_int32(v, name, ptr, errp); > } > > @@ -420,15 +390,9 @@ static void get_uint64(Object *obj, Visitor *v, const char *name, > static void set_uint64(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > - DeviceState *dev = DEVICE(obj); > Property *prop = opaque; > uint64_t *ptr = qdev_get_prop_ptr(obj, prop); > > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > visit_type_uint64(v, name, ptr, errp); > } > > @@ -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 = DEVICE(obj); > Property *prop = opaque; > int64_t *ptr = qdev_get_prop_ptr(obj, prop); > > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > visit_type_int64(v, name, ptr, errp); > } > > @@ -495,16 +453,10 @@ static void get_string(Object *obj, Visitor *v, const char *name, > static void set_string(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > - DeviceState *dev = DEVICE(obj); > Property *prop = opaque; > char **ptr = qdev_get_prop_ptr(obj, prop); > char *str; > > - 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 = DEVICE(obj); > Property *prop = opaque; > uint32_t *ptr = qdev_get_prop_ptr(obj, prop); > uint64_t value; > > - 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; > > - 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 than 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 *opaque, > Error **errp) > { > - DeviceState *dev = DEVICE(obj); > Property *prop = opaque; > uint64_t *ptr = qdev_get_prop_ptr(obj, prop); > > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > visit_type_size(v, name, ptr, errp); > } > > 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 = DEVICE(obj); > Property *prop = opaque; > CssDevId *dev_id = qdev_get_prop_ptr(obj, prop); > char *str; > int num, n1, n2; > unsigned int cssid, ssid, devid; > > - 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 ab27b6e848..54fac3851d 100644 > --- a/hw/s390x/s390-pci-bus.c > +++ b/hw/s390x/s390-pci-bus.c > @@ -1331,16 +1331,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 = DEVICE(obj); > S390PCIBusDevice *zpci = S390_PCI_DEVICE(obj); > Property *prop = opaque; > uint32_t *ptr = qdev_get_prop_ptr(obj, prop); > > - 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 = DEVICE(obj); > Property *prop = opaque; > uint8_t value, *ptr = qdev_get_prop_ptr(obj, prop); > > - 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 f5cff4103b..3375fffb38 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 = DEVICE(obj); > const int64_t min = MIN_NWINDOWS; > const int64_t max = MAX_NWINDOWS; > SPARCCPU *cpu = SPARC_CPU(obj); > int64_t value; > > - if (dev->realized) { > - qdev_prop_set_after_realize(dev, name, errp); > - return; > - } > - > if (!visit_type_int(v, name, &value, errp)) { > return; > }