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>,
"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>,
"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 09/36] qdev: Make qdev_get_prop_ptr() get Object* arg
Date: Thu, 29 Oct 2020 18:46:17 -0400 [thread overview]
Message-ID: <620fbb37-fe1d-36d0-e216-b8cde61954cb@linux.ibm.com> (raw)
In-Reply-To: <20201029220246.472693-10-ehabkost@redhat.com>
On 10/29/20 6:02 PM, Eduardo Habkost wrote:
> Make the code more generic and not specific to TYPE_DEVICE.
>
> 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: Richard Henderson <rth@twiddle.net>
> Cc: David Hildenbrand <david@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: Matthew Rosato <mjrosato@linux.ibm.com>
> Cc: Alex Williamson <alex.williamson@redhat.com>
> Cc: qemu-devel@nongnu.org
> Cc: xen-devel@lists.xenproject.org
> Cc: qemu-block@nongnu.org
> Cc: qemu-s390x@nongnu.org
> ---
> include/hw/qdev-properties.h | 2 +-
> backends/tpm/tpm_util.c | 8 ++--
> hw/block/xen-block.c | 6 +--
> hw/core/qdev-properties-system.c | 57 +++++++++-------------
> hw/core/qdev-properties.c | 82 +++++++++++++-------------------
> hw/s390x/css.c | 5 +-
> hw/s390x/s390-pci-bus.c | 4 +-
> hw/vfio/pci-quirks.c | 5 +-
> 8 files changed, 68 insertions(+), 101 deletions(-)
>
> diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h
> index 0ea822e6a7..0b92cfc761 100644
> --- a/include/hw/qdev-properties.h
> +++ b/include/hw/qdev-properties.h
> @@ -302,7 +302,7 @@ void qdev_prop_set_macaddr(DeviceState *dev, const char *name,
> const uint8_t *value);
> void qdev_prop_set_enum(DeviceState *dev, const char *name, int value);
>
> -void *qdev_get_prop_ptr(DeviceState *dev, Property *prop);
> +void *qdev_get_prop_ptr(Object *obj, Property *prop);
>
> void qdev_prop_register_global(GlobalProperty *prop);
> const GlobalProperty *qdev_find_global_prop(DeviceState *dev,
> diff --git a/backends/tpm/tpm_util.c b/backends/tpm/tpm_util.c
> index b58d298c1a..e91c21dd4a 100644
> --- a/backends/tpm/tpm_util.c
> +++ b/backends/tpm/tpm_util.c
> @@ -35,8 +35,7 @@
> static void get_tpm(Object *obj, Visitor *v, const char *name, void *opaque,
> Error **errp)
> {
> - DeviceState *dev = DEVICE(obj);
> - TPMBackend **be = qdev_get_prop_ptr(dev, opaque);
> + TPMBackend **be = qdev_get_prop_ptr(obj, opaque);
> char *p;
>
> p = g_strdup(*be ? (*be)->id : "");
> @@ -49,7 +48,7 @@ static void set_tpm(Object *obj, Visitor *v, const char *name, void *opaque,
> {
> DeviceState *dev = DEVICE(obj);
> Property *prop = opaque;
> - TPMBackend *s, **be = qdev_get_prop_ptr(dev, prop);
> + TPMBackend *s, **be = qdev_get_prop_ptr(obj, prop);
> char *str;
>
> if (dev->realized) {
> @@ -73,9 +72,8 @@ static void set_tpm(Object *obj, Visitor *v, const char *name, void *opaque,
>
> static void release_tpm(Object *obj, const char *name, void *opaque)
> {
> - DeviceState *dev = DEVICE(obj);
> Property *prop = opaque;
> - TPMBackend **be = qdev_get_prop_ptr(dev, prop);
> + TPMBackend **be = qdev_get_prop_ptr(obj, prop);
>
> if (*be) {
> tpm_backend_reset(*be);
> diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c
> index 8a7a3f5452..1ba9981c08 100644
> --- a/hw/block/xen-block.c
> +++ b/hw/block/xen-block.c
> @@ -335,9 +335,8 @@ static char *disk_to_vbd_name(unsigned int disk)
> static void xen_block_get_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(dev, prop);
> + XenBlockVdev *vdev = qdev_get_prop_ptr(obj, prop);
> char *str;
>
> switch (vdev->type) {
> @@ -396,9 +395,8 @@ 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(dev, prop);
> + XenBlockVdev *vdev = qdev_get_prop_ptr(obj, prop);
> char *str, *p;
> const char *end;
>
> diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c
> index d0fb063a49..c8c73c371b 100644
> --- a/hw/core/qdev-properties-system.c
> +++ b/hw/core/qdev-properties-system.c
> @@ -59,9 +59,8 @@ static bool check_prop_still_unset(DeviceState *dev, const char *name,
> static void get_drive(Object *obj, Visitor *v, const char *name, void *opaque,
> Error **errp)
> {
> - DeviceState *dev = DEVICE(obj);
> Property *prop = opaque;
> - void **ptr = qdev_get_prop_ptr(dev, prop);
> + void **ptr = qdev_get_prop_ptr(obj, prop);
> const char *value;
> char *p;
>
> @@ -87,7 +86,7 @@ static void set_drive_helper(Object *obj, Visitor *v, const char *name,
> {
> DeviceState *dev = DEVICE(obj);
> Property *prop = opaque;
> - void **ptr = qdev_get_prop_ptr(dev, prop);
> + void **ptr = qdev_get_prop_ptr(obj, prop);
> char *str;
> BlockBackend *blk;
> bool blk_created = false;
> @@ -185,7 +184,7 @@ static void release_drive(Object *obj, const char *name, void *opaque)
> {
> DeviceState *dev = DEVICE(obj);
> Property *prop = opaque;
> - BlockBackend **ptr = qdev_get_prop_ptr(dev, prop);
> + BlockBackend **ptr = qdev_get_prop_ptr(obj, prop);
>
> if (*ptr) {
> AioContext *ctx = blk_get_aio_context(*ptr);
> @@ -218,8 +217,7 @@ const PropertyInfo qdev_prop_drive_iothread = {
> static void get_chr(Object *obj, Visitor *v, const char *name, void *opaque,
> Error **errp)
> {
> - DeviceState *dev = DEVICE(obj);
> - CharBackend *be = qdev_get_prop_ptr(dev, opaque);
> + CharBackend *be = qdev_get_prop_ptr(obj, opaque);
> char *p;
>
> p = g_strdup(be->chr && be->chr->label ? be->chr->label : "");
> @@ -232,7 +230,7 @@ static void set_chr(Object *obj, Visitor *v, const char *name, void *opaque,
> {
> DeviceState *dev = DEVICE(obj);
> Property *prop = opaque;
> - CharBackend *be = qdev_get_prop_ptr(dev, prop);
> + CharBackend *be = qdev_get_prop_ptr(obj, prop);
> Chardev *s;
> char *str;
>
> @@ -272,9 +270,8 @@ static void set_chr(Object *obj, Visitor *v, const char *name, void *opaque,
>
> static void release_chr(Object *obj, const char *name, void *opaque)
> {
> - DeviceState *dev = DEVICE(obj);
> Property *prop = opaque;
> - CharBackend *be = qdev_get_prop_ptr(dev, prop);
> + CharBackend *be = qdev_get_prop_ptr(obj, prop);
>
> qemu_chr_fe_deinit(be, false);
> }
> @@ -297,9 +294,8 @@ const PropertyInfo qdev_prop_chr = {
> static void get_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(dev, prop);
> + MACAddr *mac = qdev_get_prop_ptr(obj, prop);
> char buffer[2 * 6 + 5 + 1];
> char *p = buffer;
>
> @@ -315,7 +311,7 @@ static void set_mac(Object *obj, Visitor *v, const char *name, void *opaque,
> {
> DeviceState *dev = DEVICE(obj);
> Property *prop = opaque;
> - MACAddr *mac = qdev_get_prop_ptr(dev, prop);
> + MACAddr *mac = qdev_get_prop_ptr(obj, prop);
> int i, pos;
> char *str;
> const char *p;
> @@ -381,9 +377,8 @@ void qdev_prop_set_macaddr(DeviceState *dev, const char *name,
> static void get_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(dev, prop);
> + NICPeers *peers_ptr = qdev_get_prop_ptr(obj, prop);
> char *p = g_strdup(peers_ptr->ncs[0] ? peers_ptr->ncs[0]->name : "");
>
> visit_type_str(v, name, &p, errp);
> @@ -395,7 +390,7 @@ static void set_netdev(Object *obj, Visitor *v, const char *name,
> {
> DeviceState *dev = DEVICE(obj);
> Property *prop = opaque;
> - NICPeers *peers_ptr = qdev_get_prop_ptr(dev, prop);
> + NICPeers *peers_ptr = qdev_get_prop_ptr(obj, prop);
> NetClientState **ncs = peers_ptr->ncs;
> NetClientState *peers[MAX_QUEUE_NUM];
> int queues, err = 0, i = 0;
> @@ -461,9 +456,8 @@ const PropertyInfo qdev_prop_netdev = {
> static void get_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(dev, prop);
> + QEMUSoundCard *card = qdev_get_prop_ptr(obj, prop);
> char *p = g_strdup(audio_get_id(card));
>
> visit_type_str(v, name, &p, errp);
> @@ -475,7 +469,7 @@ static void set_audiodev(Object *obj, Visitor *v, const char* name,
> {
> DeviceState *dev = DEVICE(obj);
> Property *prop = opaque;
> - QEMUSoundCard *card = qdev_get_prop_ptr(dev, prop);
> + QEMUSoundCard *card = qdev_get_prop_ptr(obj, prop);
> AudioState *state;
> int err = 0;
> char *str;
> @@ -582,7 +576,7 @@ static void set_blocksize(Object *obj, Visitor *v, const char *name,
> {
> DeviceState *dev = DEVICE(obj);
> Property *prop = opaque;
> - uint32_t *ptr = qdev_get_prop_ptr(dev, prop);
> + uint32_t *ptr = qdev_get_prop_ptr(obj, prop);
> uint64_t value;
> Error *local_err = NULL;
>
> @@ -674,9 +668,8 @@ const PropertyInfo qdev_prop_multifd_compression = {
> static void get_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(dev, prop);
> + ReservedRegion *rr = qdev_get_prop_ptr(obj, prop);
> char buffer[64];
> char *p = buffer;
> int rc;
> @@ -693,7 +686,7 @@ static void set_reserved_region(Object *obj, Visitor *v, const char *name,
> {
> DeviceState *dev = DEVICE(obj);
> Property *prop = opaque;
> - ReservedRegion *rr = qdev_get_prop_ptr(dev, prop);
> + ReservedRegion *rr = qdev_get_prop_ptr(obj, prop);
> Error *local_err = NULL;
> const char *endptr;
> char *str;
> @@ -761,7 +754,7 @@ static void set_pci_devfn(Object *obj, Visitor *v, const char *name,
> {
> DeviceState *dev = DEVICE(obj);
> Property *prop = opaque;
> - int32_t value, *ptr = qdev_get_prop_ptr(dev, prop);
> + int32_t value, *ptr = qdev_get_prop_ptr(obj, prop);
> unsigned int slot, fn, n;
> char *str;
>
> @@ -804,8 +797,7 @@ invalid:
> static int print_pci_devfn(Object *obj, Property *prop, char *dest,
> size_t len)
> {
> - DeviceState *dev = DEVICE(obj);
> - int32_t *ptr = qdev_get_prop_ptr(dev, prop);
> + int32_t *ptr = qdev_get_prop_ptr(obj, prop);
>
> if (*ptr == -1) {
> return snprintf(dest, len, "<unset>");
> @@ -828,9 +820,8 @@ const PropertyInfo qdev_prop_pci_devfn = {
> static void get_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(dev, prop);
> + PCIHostDeviceAddress *addr = qdev_get_prop_ptr(obj, prop);
> char buffer[] = "ffff:ff:ff.f";
> char *p = buffer;
> int rc = 0;
> @@ -857,7 +848,7 @@ static void set_pci_host_devaddr(Object *obj, Visitor *v, const char *name,
> {
> DeviceState *dev = DEVICE(obj);
> Property *prop = opaque;
> - PCIHostDeviceAddress *addr = qdev_get_prop_ptr(dev, prop);
> + PCIHostDeviceAddress *addr = qdev_get_prop_ptr(obj, prop);
> char *str, *p;
> const char *e;
> unsigned long val;
> @@ -950,9 +941,8 @@ const PropertyInfo qdev_prop_off_auto_pcibar = {
> static void get_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(dev, prop);
> + PCIExpLinkSpeed *p = qdev_get_prop_ptr(obj, prop);
> int speed;
>
> switch (*p) {
> @@ -981,7 +971,7 @@ static void set_prop_pcielinkspeed(Object *obj, Visitor *v, const char *name,
> {
> DeviceState *dev = DEVICE(obj);
> Property *prop = opaque;
> - PCIExpLinkSpeed *p = qdev_get_prop_ptr(dev, prop);
> + PCIExpLinkSpeed *p = qdev_get_prop_ptr(obj, prop);
> int speed;
>
> if (dev->realized) {
> @@ -1027,9 +1017,8 @@ const PropertyInfo qdev_prop_pcie_link_speed = {
> static void get_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(dev, prop);
> + PCIExpLinkWidth *p = qdev_get_prop_ptr(obj, prop);
> int width;
>
> switch (*p) {
> @@ -1067,7 +1056,7 @@ static void set_prop_pcielinkwidth(Object *obj, Visitor *v, const char *name,
> {
> DeviceState *dev = DEVICE(obj);
> Property *prop = opaque;
> - PCIExpLinkWidth *p = qdev_get_prop_ptr(dev, prop);
> + PCIExpLinkWidth *p = qdev_get_prop_ptr(obj, prop);
> int width;
>
> if (dev->realized) {
> diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
> index 3a4638f4de..0a54a922c8 100644
> --- a/hw/core/qdev-properties.c
> +++ b/hw/core/qdev-properties.c
> @@ -38,9 +38,9 @@ void qdev_prop_allow_set_link_before_realize(const Object *obj,
> }
> }
>
> -void *qdev_get_prop_ptr(DeviceState *dev, Property *prop)
> +void *qdev_get_prop_ptr(Object *obj, Property *prop)
> {
> - void *ptr = dev;
> + void *ptr = obj;
> ptr += prop->offset;
> return ptr;
> }
> @@ -48,9 +48,8 @@ void *qdev_get_prop_ptr(DeviceState *dev, Property *prop)
> void qdev_propinfo_get_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(dev, prop);
> + int *ptr = qdev_get_prop_ptr(obj, prop);
>
> visit_type_enum(v, prop->name, ptr, prop->info->enum_table, errp);
> }
> @@ -60,7 +59,7 @@ void qdev_propinfo_set_enum(Object *obj, Visitor *v, const char *name,
> {
> DeviceState *dev = DEVICE(obj);
> Property *prop = opaque;
> - int *ptr = qdev_get_prop_ptr(dev, prop);
> + int *ptr = qdev_get_prop_ptr(obj, prop);
>
> if (dev->realized) {
> qdev_prop_set_after_realize(dev, name, errp);
> @@ -94,8 +93,7 @@ static uint32_t qdev_get_prop_mask(Property *prop)
>
> static void bit_prop_set(Object *obj, Property *props, bool val)
> {
> - DeviceState *dev = DEVICE(obj);
> - uint32_t *p = qdev_get_prop_ptr(dev, props);
> + uint32_t *p = qdev_get_prop_ptr(obj, props);
> uint32_t mask = qdev_get_prop_mask(props);
> if (val) {
> *p |= mask;
> @@ -107,9 +105,8 @@ static void bit_prop_set(Object *obj, Property *props, bool val)
> static void prop_get_bit(Object *obj, Visitor *v, const char *name,
> void *opaque, Error **errp)
> {
> - DeviceState *dev = DEVICE(obj);
> Property *prop = opaque;
> - uint32_t *p = qdev_get_prop_ptr(dev, prop);
> + uint32_t *p = qdev_get_prop_ptr(obj, prop);
> bool value = (*p & qdev_get_prop_mask(prop)) != 0;
>
> visit_type_bool(v, name, &value, errp);
> @@ -156,8 +153,7 @@ static uint64_t qdev_get_prop_mask64(Property *prop)
>
> static void bit64_prop_set(Object *obj, Property *props, bool val)
> {
> - DeviceState *dev = DEVICE(obj);
> - uint64_t *p = qdev_get_prop_ptr(dev, props);
> + uint64_t *p = qdev_get_prop_ptr(obj, props);
> uint64_t mask = qdev_get_prop_mask64(props);
> if (val) {
> *p |= mask;
> @@ -169,9 +165,8 @@ static void bit64_prop_set(Object *obj, Property *props, bool val)
> static void prop_get_bit64(Object *obj, Visitor *v, const char *name,
> void *opaque, Error **errp)
> {
> - DeviceState *dev = DEVICE(obj);
> Property *prop = opaque;
> - uint64_t *p = qdev_get_prop_ptr(dev, prop);
> + uint64_t *p = qdev_get_prop_ptr(obj, prop);
> bool value = (*p & qdev_get_prop_mask64(prop)) != 0;
>
> visit_type_bool(v, name, &value, errp);
> @@ -208,9 +203,8 @@ const PropertyInfo qdev_prop_bit64 = {
> static void get_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(dev, prop);
> + bool *ptr = qdev_get_prop_ptr(obj, prop);
>
> visit_type_bool(v, name, ptr, errp);
> }
> @@ -220,7 +214,7 @@ static void set_bool(Object *obj, Visitor *v, const char *name, void *opaque,
> {
> DeviceState *dev = DEVICE(obj);
> Property *prop = opaque;
> - bool *ptr = qdev_get_prop_ptr(dev, prop);
> + bool *ptr = qdev_get_prop_ptr(obj, prop);
>
> if (dev->realized) {
> qdev_prop_set_after_realize(dev, name, errp);
> @@ -242,9 +236,8 @@ const PropertyInfo qdev_prop_bool = {
> static void get_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(dev, prop);
> + uint8_t *ptr = qdev_get_prop_ptr(obj, prop);
>
> visit_type_uint8(v, name, ptr, errp);
> }
> @@ -254,7 +247,7 @@ static void set_uint8(Object *obj, Visitor *v, const char *name, void *opaque,
> {
> DeviceState *dev = DEVICE(obj);
> Property *prop = opaque;
> - uint8_t *ptr = qdev_get_prop_ptr(dev, prop);
> + uint8_t *ptr = qdev_get_prop_ptr(obj, prop);
>
> if (dev->realized) {
> qdev_prop_set_after_realize(dev, name, errp);
> @@ -288,9 +281,8 @@ const PropertyInfo qdev_prop_uint8 = {
> void qdev_propinfo_get_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(dev, prop);
> + uint16_t *ptr = qdev_get_prop_ptr(obj, prop);
>
> visit_type_uint16(v, name, ptr, errp);
> }
> @@ -300,7 +292,7 @@ static void set_uint16(Object *obj, Visitor *v, const char *name,
> {
> DeviceState *dev = DEVICE(obj);
> Property *prop = opaque;
> - uint16_t *ptr = qdev_get_prop_ptr(dev, prop);
> + uint16_t *ptr = qdev_get_prop_ptr(obj, prop);
>
> if (dev->realized) {
> qdev_prop_set_after_realize(dev, name, errp);
> @@ -322,9 +314,8 @@ const PropertyInfo qdev_prop_uint16 = {
> static void get_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(dev, prop);
> + uint32_t *ptr = qdev_get_prop_ptr(obj, prop);
>
> visit_type_uint32(v, name, ptr, errp);
> }
> @@ -334,7 +325,7 @@ static void set_uint32(Object *obj, Visitor *v, const char *name,
> {
> DeviceState *dev = DEVICE(obj);
> Property *prop = opaque;
> - uint32_t *ptr = qdev_get_prop_ptr(dev, prop);
> + uint32_t *ptr = qdev_get_prop_ptr(obj, prop);
>
> if (dev->realized) {
> qdev_prop_set_after_realize(dev, name, errp);
> @@ -347,9 +338,8 @@ static void set_uint32(Object *obj, Visitor *v, const char *name,
> void qdev_propinfo_get_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(dev, prop);
> + int32_t *ptr = qdev_get_prop_ptr(obj, prop);
>
> visit_type_int32(v, name, ptr, errp);
> }
> @@ -359,7 +349,7 @@ static void set_int32(Object *obj, Visitor *v, const char *name, void *opaque,
> {
> DeviceState *dev = DEVICE(obj);
> Property *prop = opaque;
> - int32_t *ptr = qdev_get_prop_ptr(dev, prop);
> + int32_t *ptr = qdev_get_prop_ptr(obj, prop);
>
> if (dev->realized) {
> qdev_prop_set_after_realize(dev, name, errp);
> @@ -388,9 +378,8 @@ const PropertyInfo qdev_prop_int32 = {
> static void get_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(dev, prop);
> + uint64_t *ptr = qdev_get_prop_ptr(obj, prop);
>
> visit_type_uint64(v, name, ptr, errp);
> }
> @@ -400,7 +389,7 @@ static void set_uint64(Object *obj, Visitor *v, const char *name,
> {
> DeviceState *dev = DEVICE(obj);
> Property *prop = opaque;
> - uint64_t *ptr = qdev_get_prop_ptr(dev, prop);
> + uint64_t *ptr = qdev_get_prop_ptr(obj, prop);
>
> if (dev->realized) {
> qdev_prop_set_after_realize(dev, name, errp);
> @@ -413,9 +402,8 @@ static void set_uint64(Object *obj, Visitor *v, const char *name,
> static void get_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(dev, prop);
> + int64_t *ptr = qdev_get_prop_ptr(obj, prop);
>
> visit_type_int64(v, name, ptr, errp);
> }
> @@ -425,7 +413,7 @@ static void set_int64(Object *obj, Visitor *v, const char *name,
> {
> DeviceState *dev = DEVICE(obj);
> Property *prop = opaque;
> - int64_t *ptr = qdev_get_prop_ptr(dev, prop);
> + int64_t *ptr = qdev_get_prop_ptr(obj, prop);
>
> if (dev->realized) {
> qdev_prop_set_after_realize(dev, name, errp);
> @@ -454,15 +442,14 @@ const PropertyInfo qdev_prop_int64 = {
> static void release_string(Object *obj, const char *name, void *opaque)
> {
> Property *prop = opaque;
> - g_free(*(char **)qdev_get_prop_ptr(DEVICE(obj), prop));
> + g_free(*(char **)qdev_get_prop_ptr(obj, prop));
> }
>
> static void get_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(dev, prop);
> + char **ptr = qdev_get_prop_ptr(obj, prop);
>
> if (!*ptr) {
> char *str = (char *)"";
> @@ -477,7 +464,7 @@ static void set_string(Object *obj, Visitor *v, const char *name,
> {
> DeviceState *dev = DEVICE(obj);
> Property *prop = opaque;
> - char **ptr = qdev_get_prop_ptr(dev, prop);
> + char **ptr = qdev_get_prop_ptr(obj, prop);
> char *str;
>
> if (dev->realized) {
> @@ -515,9 +502,8 @@ const PropertyInfo qdev_prop_on_off_auto = {
> void qdev_propinfo_get_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(dev, prop);
> + uint32_t *ptr = qdev_get_prop_ptr(obj, prop);
> uint64_t value = *ptr;
>
> visit_type_size(v, name, &value, errp);
> @@ -528,7 +514,7 @@ static void set_size32(Object *obj, Visitor *v, const char *name, void *opaque,
> {
> DeviceState *dev = DEVICE(obj);
> Property *prop = opaque;
> - uint32_t *ptr = qdev_get_prop_ptr(dev, prop);
> + uint32_t *ptr = qdev_get_prop_ptr(obj, prop);
> uint64_t value;
>
> if (dev->realized) {
> @@ -563,9 +549,8 @@ const PropertyInfo qdev_prop_size32 = {
> static void get_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(dev, prop);
> + QemuUUID *uuid = qdev_get_prop_ptr(obj, prop);
> char buffer[UUID_FMT_LEN + 1];
> char *p = buffer;
>
> @@ -581,7 +566,7 @@ static void set_uuid(Object *obj, Visitor *v, const char *name, void *opaque,
> {
> DeviceState *dev = DEVICE(obj);
> Property *prop = opaque;
> - QemuUUID *uuid = qdev_get_prop_ptr(dev, prop);
> + QemuUUID *uuid = qdev_get_prop_ptr(obj, prop);
> char *str;
>
> if (dev->realized) {
> @@ -653,7 +638,7 @@ static void set_prop_arraylen(Object *obj, Visitor *v, const char *name,
> */
> DeviceState *dev = DEVICE(obj);
> Property *prop = opaque;
> - uint32_t *alenptr = qdev_get_prop_ptr(dev, prop);
> + uint32_t *alenptr = qdev_get_prop_ptr(obj, prop);
> void **arrayptr = (void *)dev + prop->arrayoffset;
> void *eltptr;
> const char *arrayname;
> @@ -699,7 +684,7 @@ static void set_prop_arraylen(Object *obj, Visitor *v, const char *name,
> * being inside the device struct.
> */
> arrayprop->prop.offset = eltptr - (void *)dev;
> - assert(qdev_get_prop_ptr(dev, &arrayprop->prop) == eltptr);
> + assert(qdev_get_prop_ptr(obj, &arrayprop->prop) == eltptr);
> object_property_add(obj, propname,
> arrayprop->prop.info->name,
> arrayprop->prop.info->get,
> @@ -893,9 +878,8 @@ void qdev_prop_set_globals(DeviceState *dev)
> static void get_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(dev, prop);
> + uint64_t *ptr = qdev_get_prop_ptr(obj, prop);
>
> visit_type_size(v, name, ptr, errp);
> }
> @@ -905,7 +889,7 @@ static void set_size(Object *obj, Visitor *v, const char *name, void *opaque,
> {
> DeviceState *dev = DEVICE(obj);
> Property *prop = opaque;
> - uint64_t *ptr = qdev_get_prop_ptr(dev, prop);
> + uint64_t *ptr = qdev_get_prop_ptr(obj, prop);
>
> if (dev->realized) {
> qdev_prop_set_after_realize(dev, name, errp);
> diff --git a/hw/s390x/css.c b/hw/s390x/css.c
> index 9961cfe7bf..2b8f33fec2 100644
> --- a/hw/s390x/css.c
> +++ b/hw/s390x/css.c
> @@ -2343,9 +2343,8 @@ void css_reset(void)
> static void get_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(dev, prop);
> + CssDevId *dev_id = qdev_get_prop_ptr(obj, prop);
> char buffer[] = "xx.x.xxxx";
> char *p = buffer;
> int r;
> @@ -2375,7 +2374,7 @@ static void set_css_devid(Object *obj, Visitor *v, const char *name,
> {
> DeviceState *dev = DEVICE(obj);
> Property *prop = opaque;
> - CssDevId *dev_id = qdev_get_prop_ptr(dev, prop);
> + CssDevId *dev_id = qdev_get_prop_ptr(obj, prop);
> char *str;
> int num, n1, n2;
> unsigned int cssid, ssid, devid;
> diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c
> index fb4cee87a4..b59cf0651a 100644
> --- a/hw/s390x/s390-pci-bus.c
> +++ b/hw/s390x/s390-pci-bus.c
> @@ -1248,7 +1248,7 @@ static void s390_pci_get_fid(Object *obj, Visitor *v, const char *name,
> void *opaque, Error **errp)
> {
> Property *prop = opaque;
> - uint32_t *ptr = qdev_get_prop_ptr(DEVICE(obj), prop);
> + uint32_t *ptr = qdev_get_prop_ptr(obj, prop);
>
> visit_type_uint32(v, name, ptr, errp);
> }
> @@ -1259,7 +1259,7 @@ static void s390_pci_set_fid(Object *obj, Visitor *v, const char *name,
> DeviceState *dev = DEVICE(obj);
> S390PCIBusDevice *zpci = S390_PCI_DEVICE(obj);
> Property *prop = opaque;
> - uint32_t *ptr = qdev_get_prop_ptr(dev, prop);
> + uint32_t *ptr = qdev_get_prop_ptr(obj, prop);
>
> if (dev->realized) {
> qdev_prop_set_after_realize(dev, name, errp);
> diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c
> index 57150913b7..53569925a2 100644
> --- a/hw/vfio/pci-quirks.c
> +++ b/hw/vfio/pci-quirks.c
> @@ -1488,9 +1488,8 @@ static void get_nv_gpudirect_clique_id(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(dev, prop);
> + uint8_t *ptr = qdev_get_prop_ptr(obj, prop);
>
> visit_type_uint8(v, name, ptr, errp);
> }
> @@ -1501,7 +1500,7 @@ static void set_nv_gpudirect_clique_id(Object *obj, Visitor *v,
> {
> DeviceState *dev = DEVICE(obj);
> Property *prop = opaque;
> - uint8_t value, *ptr = qdev_get_prop_ptr(dev, prop);
> + uint8_t value, *ptr = qdev_get_prop_ptr(obj, prop);
>
> if (dev->realized) {
> qdev_prop_set_after_realize(dev, name, errp);
next prev parent reply other threads:[~2020-10-29 22:48 UTC|newest]
Thread overview: 86+ 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:46 ` Stefan Berger [this message]
2020-10-30 7:29 ` 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 17:13 ` Paolo Bonzini
2020-10-31 10:25 ` Thomas Huth
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:43 ` Stefan Berger
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: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=620fbb37-fe1d-36d0-e216-b8cde61954cb@linux.ibm.com \
--to=stefanb@linux.ibm.com \
--cc=alex.williamson@redhat.com \
--cc=anthony.perard@citrix.com \
--cc=armbru@redhat.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=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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).