From: Stefan Berger <stefanb@linux.ibm.com>
To: Eduardo Habkost <ehabkost@redhat.com>, qemu-devel@nongnu.org
Cc: "Matthew Rosato" <mjrosato@linux.ibm.com>,
"Paul Durrant" <paul@xen.org>,
"Mark Cave-Ayland" <mark.cave-ayland@ilande.co.uk>,
"Stefano Stabellini" <sstabellini@kernel.org>,
qemu-block@nongnu.org,
"Stefan Berger" <stefanb@linux.vnet.ibm.com>,
"David Hildenbrand" <david@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>,
"Halil Pasic" <pasic@linux.ibm.com>,
"Christian Borntraeger" <borntraeger@de.ibm.com>,
"Anthony Perard" <anthony.perard@citrix.com>,
xen-devel@lists.xenproject.org,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Artyom Tarasenko" <atar4qemu@gmail.com>,
"Thomas Huth" <thuth@redhat.com>,
"Alex Williamson" <alex.williamson@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"John Snow" <jsnow@redhat.com>,
"Richard Henderson" <rth@twiddle.net>,
"Kevin Wolf" <kwolf@redhat.com>,
"Daniel P. Berrange" <berrange@redhat.com>,
"Cornelia Huck" <cohuck@redhat.com>,
qemu-s390x@nongnu.org, "Max Reitz" <mreitz@redhat.com>,
"Igor Mammedov" <imammedo@redhat.com>
Subject: Re: [PATCH 14/36] qdev: Move dev->realized check to qdev_property_set()
Date: Thu, 29 Oct 2020 18:43:54 -0400 [thread overview]
Message-ID: <4d1f56fe-c213-0967-2828-8f6a34e02ce5@linux.ibm.com> (raw)
In-Reply-To: <20201029220246.472693-15-ehabkost@redhat.com>
On 10/29/20 6:02 PM, 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 <ehabkost@redhat.com>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
> ---
> Cc: Stefan Berger <stefanb@linux.vnet.ibm.com>
> Cc: Stefano Stabellini <sstabellini@kernel.org>
> Cc: Anthony Perard <anthony.perard@citrix.com>
> Cc: Paul Durrant <paul@xen.org>
> Cc: Kevin Wolf <kwolf@redhat.com>
> Cc: Max Reitz <mreitz@redhat.com>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> Cc: "Daniel P. Berrangé" <berrange@redhat.com>
> Cc: Eduardo Habkost <ehabkost@redhat.com>
> Cc: Cornelia Huck <cohuck@redhat.com>
> Cc: Halil Pasic <pasic@linux.ibm.com>
> Cc: Christian Borntraeger <borntraeger@de.ibm.com>
> Cc: Thomas Huth <thuth@redhat.com>
> Cc: Richard Henderson <rth@twiddle.net>
> Cc: David Hildenbrand <david@redhat.com>
> Cc: Matthew Rosato <mjrosato@linux.ibm.com>
> Cc: Alex Williamson <alex.williamson@redhat.com>
> Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> Cc: Artyom Tarasenko <atar4qemu@gmail.com>
> 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 | 5 --
> hw/core/qdev-properties-system.c | 64 -------------------
> hw/core/qdev-properties.c | 106 ++++++-------------------------
> 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(+), 187 deletions(-)
>
> diff --git a/backends/tpm/tpm_util.c b/backends/tpm/tpm_util.c
> index e91c21dd4a..042cacfcca 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 1ba9981c08..bd1aef63a7 100644
> --- a/hw/block/xen-block.c
> +++ b/hw/block/xen-block.c
> @@ -400,11 +400,6 @@ static void xen_block_set_vdev(Object *obj, Visitor *v, const char *name,
> 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 fca1b694ca..60a45f5620 100644
> --- a/hw/core/qdev-properties-system.c
> +++ b/hw/core/qdev-properties-system.c
> @@ -92,11 +92,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;
> }
> @@ -228,17 +223,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;
> }
> @@ -309,18 +298,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;
> }
> @@ -388,7 +371,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;
> @@ -396,11 +378,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;
> }
> @@ -467,18 +444,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;
> }
> @@ -580,11 +551,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;
> }
> @@ -684,7 +650,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;
> @@ -692,11 +657,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);
> @@ -752,17 +712,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;
> @@ -846,7 +800,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;
> @@ -855,11 +808,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;
> }
> @@ -969,16 +917,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, prop->name, &speed, prop->info->enum_table,
> errp)) {
> return;
> @@ -1054,16 +996,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, prop->name, &width, prop->info->enum_table,
> errp)) {
> return;
> diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
> index aab9e65e97..195bfed6e1 100644
> --- a/hw/core/qdev-properties.c
> +++ b/hw/core/qdev-properties.c
> @@ -25,6 +25,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)
> @@ -66,6 +79,11 @@ static void static_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);
> }
>
> @@ -91,15 +109,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, prop->name, ptr, prop->info->enum_table, errp);
> }
>
> @@ -149,15 +161,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;
> }
> @@ -209,15 +215,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;
> }
> @@ -246,15 +246,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);
> }
>
> @@ -279,15 +273,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);
> }
>
> @@ -324,15 +312,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);
> }
>
> @@ -357,15 +339,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);
> }
>
> @@ -381,15 +357,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);
> }
>
> @@ -421,15 +391,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);
> }
>
> @@ -445,15 +409,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);
> }
>
> @@ -496,16 +454,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;
> }
> @@ -546,16 +498,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;
> }
> @@ -598,16 +544,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;
> }
> @@ -678,10 +618,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);
> @@ -921,15 +857,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 38fd46b9a9..46cab94e2b 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 b59cf0651a..d02e93a192 100644
> --- a/hw/s390x/s390-pci-bus.c
> +++ b/hw/s390x/s390-pci-bus.c
> @@ -1256,16 +1256,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 8ecb20e55f..cf21efd85f 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;
> }
WARNING: multiple messages have this Message-ID (diff)
From: Stefan Berger <stefanb@linux.ibm.com>
To: Eduardo Habkost <ehabkost@redhat.com>, qemu-devel@nongnu.org
Cc: "John Snow" <jsnow@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Eric Blake" <eblake@redhat.com>,
"Daniel P. Berrange" <berrange@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Igor Mammedov" <imammedo@redhat.com>,
"Stefan Berger" <stefanb@linux.vnet.ibm.com>,
"Stefano Stabellini" <sstabellini@kernel.org>,
"Anthony Perard" <anthony.perard@citrix.com>,
"Paul Durrant" <paul@xen.org>, "Kevin Wolf" <kwolf@redhat.com>,
"Max Reitz" <mreitz@redhat.com>,
"Cornelia Huck" <cohuck@redhat.com>,
"Halil Pasic" <pasic@linux.ibm.com>,
"Christian Borntraeger" <borntraeger@de.ibm.com>,
"Thomas Huth" <thuth@redhat.com>,
"Richard Henderson" <rth@twiddle.net>,
"David Hildenbrand" <david@redhat.com>,
"Matthew Rosato" <mjrosato@linux.ibm.com>,
"Alex Williamson" <alex.williamson@redhat.com>,
"Mark Cave-Ayland" <mark.cave-ayland@ilande.co.uk>,
"Artyom Tarasenko" <atar4qemu@gmail.com>,
xen-devel@lists.xenproject.org, qemu-block@nongnu.org,
qemu-s390x@nongnu.org
Subject: Re: [PATCH 14/36] qdev: Move dev->realized check to qdev_property_set()
Date: Thu, 29 Oct 2020 18:43:54 -0400 [thread overview]
Message-ID: <4d1f56fe-c213-0967-2828-8f6a34e02ce5@linux.ibm.com> (raw)
In-Reply-To: <20201029220246.472693-15-ehabkost@redhat.com>
On 10/29/20 6:02 PM, 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 <ehabkost@redhat.com>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
> ---
> Cc: Stefan Berger <stefanb@linux.vnet.ibm.com>
> Cc: Stefano Stabellini <sstabellini@kernel.org>
> Cc: Anthony Perard <anthony.perard@citrix.com>
> Cc: Paul Durrant <paul@xen.org>
> Cc: Kevin Wolf <kwolf@redhat.com>
> Cc: Max Reitz <mreitz@redhat.com>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> Cc: "Daniel P. Berrangé" <berrange@redhat.com>
> Cc: Eduardo Habkost <ehabkost@redhat.com>
> Cc: Cornelia Huck <cohuck@redhat.com>
> Cc: Halil Pasic <pasic@linux.ibm.com>
> Cc: Christian Borntraeger <borntraeger@de.ibm.com>
> Cc: Thomas Huth <thuth@redhat.com>
> Cc: Richard Henderson <rth@twiddle.net>
> Cc: David Hildenbrand <david@redhat.com>
> Cc: Matthew Rosato <mjrosato@linux.ibm.com>
> Cc: Alex Williamson <alex.williamson@redhat.com>
> Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> Cc: Artyom Tarasenko <atar4qemu@gmail.com>
> 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 | 5 --
> hw/core/qdev-properties-system.c | 64 -------------------
> hw/core/qdev-properties.c | 106 ++++++-------------------------
> 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(+), 187 deletions(-)
>
> diff --git a/backends/tpm/tpm_util.c b/backends/tpm/tpm_util.c
> index e91c21dd4a..042cacfcca 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 1ba9981c08..bd1aef63a7 100644
> --- a/hw/block/xen-block.c
> +++ b/hw/block/xen-block.c
> @@ -400,11 +400,6 @@ static void xen_block_set_vdev(Object *obj, Visitor *v, const char *name,
> 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 fca1b694ca..60a45f5620 100644
> --- a/hw/core/qdev-properties-system.c
> +++ b/hw/core/qdev-properties-system.c
> @@ -92,11 +92,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;
> }
> @@ -228,17 +223,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;
> }
> @@ -309,18 +298,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;
> }
> @@ -388,7 +371,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;
> @@ -396,11 +378,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;
> }
> @@ -467,18 +444,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;
> }
> @@ -580,11 +551,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;
> }
> @@ -684,7 +650,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;
> @@ -692,11 +657,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);
> @@ -752,17 +712,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;
> @@ -846,7 +800,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;
> @@ -855,11 +808,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;
> }
> @@ -969,16 +917,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, prop->name, &speed, prop->info->enum_table,
> errp)) {
> return;
> @@ -1054,16 +996,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, prop->name, &width, prop->info->enum_table,
> errp)) {
> return;
> diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
> index aab9e65e97..195bfed6e1 100644
> --- a/hw/core/qdev-properties.c
> +++ b/hw/core/qdev-properties.c
> @@ -25,6 +25,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)
> @@ -66,6 +79,11 @@ static void static_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);
> }
>
> @@ -91,15 +109,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, prop->name, ptr, prop->info->enum_table, errp);
> }
>
> @@ -149,15 +161,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;
> }
> @@ -209,15 +215,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;
> }
> @@ -246,15 +246,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);
> }
>
> @@ -279,15 +273,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);
> }
>
> @@ -324,15 +312,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);
> }
>
> @@ -357,15 +339,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);
> }
>
> @@ -381,15 +357,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);
> }
>
> @@ -421,15 +391,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);
> }
>
> @@ -445,15 +409,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);
> }
>
> @@ -496,16 +454,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;
> }
> @@ -546,16 +498,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;
> }
> @@ -598,16 +544,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;
> }
> @@ -678,10 +618,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);
> @@ -921,15 +857,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 38fd46b9a9..46cab94e2b 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 b59cf0651a..d02e93a192 100644
> --- a/hw/s390x/s390-pci-bus.c
> +++ b/hw/s390x/s390-pci-bus.c
> @@ -1256,16 +1256,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 8ecb20e55f..cf21efd85f 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;
> }
next prev parent reply other threads:[~2020-10-29 22:45 UTC|newest]
Thread overview: 99+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-29 22:02 [PATCH 00/36] Make qdev static property API usable by any QOM type Eduardo Habkost
2020-10-29 22:02 ` [PATCH 01/36] cs4231: Get rid of empty property array Eduardo Habkost
2020-10-30 7:42 ` Marc-André Lureau
2020-10-29 22:02 ` [PATCH 02/36] cpu: Move cpu_common_props to hw/core/cpu.c Eduardo Habkost
2020-10-30 7:42 ` Marc-André Lureau
2020-10-29 22:02 ` [PATCH 03/36] qdev: Move property code to qdev-properties.[ch] Eduardo Habkost
2020-10-30 7:42 ` Marc-André Lureau
2020-10-29 22:02 ` [PATCH 04/36] qdev: Check dev->realized at set_size() Eduardo Habkost
2020-10-30 7:11 ` Marc-André Lureau
2020-10-29 22:02 ` [PATCH 05/36] sparc: Check dev->realized at sparc_set_nwindows() Eduardo Habkost
2020-10-30 7:43 ` Marc-André Lureau
2020-10-29 22:02 ` [PATCH 06/36] qdev: Don't use dev->id on set_size32() error message Eduardo Habkost
2020-10-30 7:42 ` Marc-André Lureau
2020-10-29 22:02 ` [PATCH 07/36] qdev: Make PropertyInfo.print method get Object* argument Eduardo Habkost
2020-10-30 7:43 ` Marc-André Lureau
2020-10-29 22:02 ` [PATCH 08/36] qdev: Make bit_prop_set() " Eduardo Habkost
2020-10-30 7:45 ` Marc-André Lureau
2020-10-29 22:02 ` [PATCH 09/36] qdev: Make qdev_get_prop_ptr() get Object* arg Eduardo Habkost
2020-10-29 22:02 ` Eduardo Habkost
2020-10-29 22:46 ` Stefan Berger
2020-10-29 22:46 ` Stefan Berger
2020-10-30 7:29 ` Marc-André Lureau
2020-10-30 7:29 ` Marc-André Lureau
2020-10-30 7:34 ` Marc-André Lureau
2020-10-30 7:34 ` Marc-André Lureau
2020-10-30 11:35 ` --enable-xen on gitlab CI? (was Re: [PATCH 09/36] qdev: Make qdev_get_prop_ptr() get Object* arg) Eduardo Habkost
2020-10-30 11:35 ` Eduardo Habkost
2020-10-30 17:13 ` Paolo Bonzini
2020-10-30 17:13 ` Paolo Bonzini
2020-10-31 10:25 ` Thomas Huth
2020-10-31 10:25 ` Thomas Huth
2020-11-08 17:45 ` Philippe Mathieu-Daudé
2020-11-08 17:45 ` Philippe Mathieu-Daudé
2020-10-29 22:02 ` [PATCH 10/36] qdev: Make qdev_find_global_prop() get Object* argument Eduardo Habkost
2020-10-30 7:45 ` Marc-André Lureau
2020-10-29 22:02 ` [PATCH 11/36] qdev: Make check_prop_still_unset() " Eduardo Habkost
2020-10-30 7:53 ` Marc-André Lureau
2020-10-29 22:02 ` [PATCH 12/36] qdev: Make error_set_from_qdev_prop_error() " Eduardo Habkost
2020-10-30 8:00 ` Marc-André Lureau
2020-10-30 11:16 ` Eduardo Habkost
2020-10-29 22:02 ` [PATCH 13/36] qdev: Wrap getters and setters in separate helpers Eduardo Habkost
2020-10-30 8:06 ` Marc-André Lureau
2020-10-29 22:02 ` [PATCH 14/36] qdev: Move dev->realized check to qdev_property_set() Eduardo Habkost
2020-10-29 22:02 ` Eduardo Habkost
2020-10-29 22:43 ` Stefan Berger [this message]
2020-10-29 22:43 ` Stefan Berger
2020-10-30 8:05 ` Marc-André Lureau
2020-10-30 8:05 ` Marc-André Lureau
2020-10-29 22:02 ` [PATCH 15/36] qdev: Make PropertyInfo.create return ObjectProperty* Eduardo Habkost
2020-10-30 16:52 ` Marc-André Lureau
2020-10-29 22:02 ` [PATCH 16/36] qdev: Make qdev_class_add_property() more flexible Eduardo Habkost
2020-10-30 9:45 ` Marc-André Lureau
2020-10-29 22:02 ` [PATCH 17/36] qdev: Separate generic and device-specific property registration Eduardo Habkost
2020-10-30 9:56 ` Marc-André Lureau
2020-10-29 22:02 ` [PATCH 18/36] qdev: Avoid unnecessary DeviceState* variable at set_prop_arraylen() Eduardo Habkost
2020-10-30 9:59 ` Marc-André Lureau
2020-10-29 22:02 ` [PATCH 19/36] qdev: Move array property creation/registration to separate functions Eduardo Habkost
2020-10-30 10:03 ` Marc-André Lureau
2020-10-30 10:10 ` Marc-André Lureau
2020-10-30 10:12 ` Daniel P. Berrangé
2020-10-30 11:20 ` Eduardo Habkost
2020-10-29 22:02 ` [PATCH 20/36] qdev: Reuse object_property_add_static() when adding array elements Eduardo Habkost
2020-10-30 11:37 ` Marc-André Lureau
2020-10-29 22:02 ` [PATCH 21/36] qom: Add allow_set callback to ObjectProperty Eduardo Habkost
2020-10-30 16:43 ` Marc-André Lureau
2020-10-29 22:02 ` [PATCH 22/36] qdev: Make qdev_prop_allow_set() a property allow_set callback Eduardo Habkost
2020-10-30 16:42 ` Marc-André Lureau
2020-10-29 22:02 ` [PATCH 23/36] qdev: Make qdev_propinfo_get_uint16() static Eduardo Habkost
2020-10-30 16:51 ` Marc-André Lureau
2020-10-29 22:02 ` [PATCH 24/36] qdev: Rename qdev_propinfo_* to object_propinfo_* Eduardo Habkost
2020-10-30 16:50 ` Marc-André Lureau
2020-10-29 22:02 ` [PATCH 25/36] qdev: Rename qdev_get_prop_ptr() to object_static_prop_ptr() Eduardo Habkost
2020-10-29 22:02 ` Eduardo Habkost
2020-10-29 22:41 ` Stefan Berger
2020-10-29 22:41 ` Stefan Berger
2020-10-29 22:02 ` [PATCH 26/36] qdev: Move softmmu properties to qdev-properties-system.h Eduardo Habkost
2020-10-30 16:51 ` Marc-André Lureau
2020-10-29 22:02 ` [PATCH 27/36] qdev: Reuse DEFINE_PROP in all DEFINE_PROP_* macros Eduardo Habkost
2020-10-30 16:53 ` Marc-André Lureau
2020-10-29 22:02 ` [PATCH 28/36] qdev: Move core static property code to QOM Eduardo Habkost
2020-10-30 16:59 ` Marc-André Lureau
2020-10-29 22:02 ` [PATCH 29/36] qdev: Move qdev_prop_tpm declaration to tpm_prop.h Eduardo Habkost
2020-10-29 22:40 ` Stefan Berger
2020-10-30 17:02 ` Marc-André Lureau
2020-10-29 22:02 ` [PATCH 30/36] qdev: Rename qdev_prop_* to prop_info_* Eduardo Habkost
2020-10-30 17:02 ` Marc-André Lureau
2020-10-29 22:02 ` [PATCH 31/36] qdev: Stop using error_set_from_qdev_prop_error() for UUID property Eduardo Habkost
2020-10-30 17:06 ` Marc-André Lureau
2020-10-29 22:02 ` [PATCH 32/36] qdev: Move base property types to qom/property-types.c Eduardo Habkost
2020-10-31 7:38 ` Marc-André Lureau
2020-10-29 22:02 ` [PATCH 33/36] tests: Use static properties at check-qom-proplist test case Eduardo Habkost
2020-10-31 7:53 ` Marc-André Lureau
2020-10-29 22:02 ` [PATCH 34/36] machine: Use DEFINE_PROP_STRING for string properties Eduardo Habkost
2020-10-30 17:10 ` Paolo Bonzini
2020-10-30 20:03 ` Eduardo Habkost
2020-10-30 20:41 ` Paolo Bonzini
2020-10-30 21:00 ` Eduardo Habkost
2020-10-29 22:02 ` [PATCH 35/36] machine: Use DEFINE_PROP_BOOL for boolean properties Eduardo Habkost
2020-10-29 22:02 ` [PATCH 36/36] qom: Include static property API reference in documentation Eduardo Habkost
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4d1f56fe-c213-0967-2828-8f6a34e02ce5@linux.ibm.com \
--to=stefanb@linux.ibm.com \
--cc=alex.williamson@redhat.com \
--cc=anthony.perard@citrix.com \
--cc=armbru@redhat.com \
--cc=atar4qemu@gmail.com \
--cc=berrange@redhat.com \
--cc=borntraeger@de.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=ehabkost@redhat.com \
--cc=imammedo@redhat.com \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=mark.cave-ayland@ilande.co.uk \
--cc=mjrosato@linux.ibm.com \
--cc=mreitz@redhat.com \
--cc=pasic@linux.ibm.com \
--cc=paul@xen.org \
--cc=pbonzini@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=rth@twiddle.net \
--cc=sstabellini@kernel.org \
--cc=stefanb@linux.vnet.ibm.com \
--cc=thuth@redhat.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.