From patchwork Wed Nov 4 17:25:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 11881717 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A58CE15E6 for ; Wed, 4 Nov 2020 17:26:12 +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 585E420782 for ; Wed, 4 Nov 2020 17:26:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Q6SJsWvv" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 585E420782 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.19440.44636 (Exim 4.92) (envelope-from ) id 1kaMXW-0004yW-O1; Wed, 04 Nov 2020 17:25:42 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 19440.44636; Wed, 04 Nov 2020 17:25:42 +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 1kaMXW-0004yP-Kt; Wed, 04 Nov 2020 17:25:42 +0000 Received: by outflank-mailman (input) for mailman id 19440; Wed, 04 Nov 2020 17:25:41 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kaMXV-0004yK-0m for xen-devel@lists.xenproject.org; Wed, 04 Nov 2020 17:25:41 +0000 Received: from us-smtp-delivery-124.mimecast.com (unknown [63.128.21.124]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTP id 38d4fb6b-17e7-4f7b-aae3-b74dfee7aad7; Wed, 04 Nov 2020 17:25:36 +0000 (UTC) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-206-BliftGsjOkqSm4-6LQDSYg-1; Wed, 04 Nov 2020 12:25:31 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 488668049CB; Wed, 4 Nov 2020 17:25:29 +0000 (UTC) Received: from localhost (ovpn-114-68.rdu2.redhat.com [10.10.114.68]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4A6315C5DE; Wed, 4 Nov 2020 17:25:21 +0000 (UTC) Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kaMXV-0004yK-0m for xen-devel@lists.xenproject.org; Wed, 04 Nov 2020 17:25:41 +0000 X-Inumbo-ID: 38d4fb6b-17e7-4f7b-aae3-b74dfee7aad7 Received: from us-smtp-delivery-124.mimecast.com (unknown [63.128.21.124]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTP id 38d4fb6b-17e7-4f7b-aae3-b74dfee7aad7; Wed, 04 Nov 2020 17:25:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604510736; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qH+Ft2xr8oMmaql/QpsL3d2WQdY3tolquMseQzbcMBo=; b=Q6SJsWvvVfwUxbPJ+GeFpNT1OqX3Ek8gG8m/Ht3CmiDLQLp/3+MtklHRZb6U0sJOVQBGB8 udaOPbtYX1035iDVckbRvArURWgq/hT4y9g2wLOKgAQXywtHMj1T2GeSuOohlZkFG+lldH LjX9mW8VV1wm5uc+/J4q3/jNz8xq9UI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-206-BliftGsjOkqSm4-6LQDSYg-1; Wed, 04 Nov 2020 12:25:31 -0500 X-MC-Unique: BliftGsjOkqSm4-6LQDSYg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 488668049CB; Wed, 4 Nov 2020 17:25:29 +0000 (UTC) Received: from localhost (ovpn-114-68.rdu2.redhat.com [10.10.114.68]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4A6315C5DE; Wed, 4 Nov 2020 17:25:21 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Cc: Igor Mammedov , "Daniel P. Berrange" , Paolo Bonzini , Stefan Berger , Stefano Stabellini , Anthony Perard , Paul Durrant , Kevin Wolf , Max Reitz , Richard Henderson , David Hildenbrand , Cornelia Huck , Thomas Huth , Halil Pasic , Christian Borntraeger , Matthew Rosato , Alex Williamson , Mark Cave-Ayland , Artyom Tarasenko , xen-devel@lists.xenproject.org, qemu-block@nongnu.org, qemu-s390x@nongnu.org Subject: [PATCH 4/7] qom: Replace void* parameter with Property* on field getters/setters Date: Wed, 4 Nov 2020 12:25:09 -0500 Message-Id: <20201104172512.2381656-5-ehabkost@redhat.com> In-Reply-To: <20201104172512.2381656-1-ehabkost@redhat.com> References: <20201104172512.2381656-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com All field property getters and setters must interpret the fourth argument as Property*. Change the function signature of field property getters and setters to indicate that. Signed-off-by: Eduardo Habkost Acked-by: Cornelia Huck --- 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: Richard Henderson Cc: David Hildenbrand Cc: Cornelia Huck Cc: Thomas Huth Cc: Halil Pasic Cc: Christian Borntraeger 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 --- include/qom/field-property-internal.h | 8 +- include/qom/field-property.h | 26 ++++--- backends/tpm/tpm_util.c | 11 ++- hw/block/xen-block.c | 6 +- hw/core/qdev-properties-system.c | 86 +++++++++------------- hw/s390x/css.c | 6 +- hw/s390x/s390-pci-bus.c | 6 +- hw/vfio/pci-quirks.c | 10 +-- qom/property-types.c | 102 +++++++++----------------- target/sparc/cpu.c | 4 +- 10 files changed, 105 insertions(+), 160 deletions(-) diff --git a/include/qom/field-property-internal.h b/include/qom/field-property-internal.h index 7aa27ce836..bc7d25033d 100644 --- a/include/qom/field-property-internal.h +++ b/include/qom/field-property-internal.h @@ -9,9 +9,9 @@ #define QOM_STATIC_PROPERTY_INTERNAL_H void field_prop_get_enum(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp); + Property *prop, Error **errp); void field_prop_set_enum(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp); + Property *prop, Error **errp); void field_prop_set_default_value_enum(ObjectProperty *op, const Property *prop); @@ -21,9 +21,9 @@ void field_prop_set_default_value_uint(ObjectProperty *op, const Property *prop); void field_prop_get_int32(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp); + Property *prop, Error **errp); void field_prop_get_size32(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp); + Property *prop, Error **errp); /** * object_property_add_field: Add a field property to an object instance diff --git a/include/qom/field-property.h b/include/qom/field-property.h index e64a2b3c07..438bb25896 100644 --- a/include/qom/field-property.h +++ b/include/qom/field-property.h @@ -54,6 +54,18 @@ struct Property { const char *link_type; }; +/** + * typedef FieldAccessor: a field property getter or setter function + * @obj: the object instance + * @v: the visitor that contains the property data + * @name: the name of the property + * @prop: Field property definition + * @errp: pointer to error information + */ +typedef void FieldAccessor(Object *obj, Visitor *v, + const char *name, Property *prop, + Error **errp); + /** * struct PropertyInfo: information on a specific QOM property type */ @@ -71,16 +83,10 @@ struct PropertyInfo { /** @create: Optional callback for creation of property */ ObjectProperty *(*create)(ObjectClass *oc, const char *name, Property *prop); - /** - * @get: Property getter. The opaque parameter will point to - * the &Property struct for the property. - */ - ObjectPropertyAccessor *get; - /** - * @set: Property setter. The opaque parameter will point to - * the &Property struct for the property. - */ - ObjectPropertyAccessor *set; + /** @get: Property getter */ + FieldAccessor *get; + /** @set: Property setter */ + FieldAccessor *set; /** * @release: Optional release function, called when the object * is destroyed diff --git a/backends/tpm/tpm_util.c b/backends/tpm/tpm_util.c index bb1ab34a75..e8837938e5 100644 --- a/backends/tpm/tpm_util.c +++ b/backends/tpm/tpm_util.c @@ -32,10 +32,10 @@ /* tpm backend property */ -static void get_tpm(Object *obj, Visitor *v, const char *name, void *opaque, - Error **errp) +static void get_tpm(Object *obj, Visitor *v, const char *name, + Property *prop, Error **errp) { - TPMBackend **be = object_field_prop_ptr(obj, opaque); + TPMBackend **be = object_field_prop_ptr(obj, prop); char *p; p = g_strdup(*be ? (*be)->id : ""); @@ -43,10 +43,9 @@ static void get_tpm(Object *obj, Visitor *v, const char *name, void *opaque, g_free(p); } -static void set_tpm(Object *obj, Visitor *v, const char *name, void *opaque, - Error **errp) +static void set_tpm(Object *obj, Visitor *v, const char *name, + Property *prop, Error **errp) { - Property *prop = opaque; TPMBackend *s, **be = object_field_prop_ptr(obj, prop); char *str; diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c index 718d886e5c..c1ee634639 100644 --- a/hw/block/xen-block.c +++ b/hw/block/xen-block.c @@ -333,9 +333,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) + Property *prop, Error **errp) { - Property *prop = opaque; XenBlockVdev *vdev = object_field_prop_ptr(obj, prop); char *str; @@ -393,9 +392,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) + Property *prop, Error **errp) { - Property *prop = opaque; XenBlockVdev *vdev = object_field_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 8da68f076c..4c649cb4b2 100644 --- a/hw/core/qdev-properties-system.c +++ b/hw/core/qdev-properties-system.c @@ -58,10 +58,9 @@ static bool check_prop_still_unset(Object *obj, const char *name, /* --- drive --- */ -static void get_drive(Object *obj, Visitor *v, const char *name, void *opaque, - Error **errp) +static void get_drive(Object *obj, Visitor *v, const char *name, + Property *prop, Error **errp) { - Property *prop = opaque; void **ptr = object_field_prop_ptr(obj, prop); const char *value; char *p; @@ -165,16 +164,16 @@ fail: g_free(str); } -static void set_drive(Object *obj, Visitor *v, const char *name, void *opaque, +static void set_drive(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - set_drive_helper(obj, v, name, opaque, false, errp); + set_drive_helper(obj, v, name, prop, false, errp); } static void set_drive_iothread(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) + Property *prop, Error **errp) { - set_drive_helper(obj, v, name, opaque, true, errp); + set_drive_helper(obj, v, name, prop, true, errp); } static void release_drive(Object *obj, const char *name, void *opaque) @@ -211,10 +210,10 @@ const PropertyInfo qdev_prop_drive_iothread = { /* --- character device --- */ -static void get_chr(Object *obj, Visitor *v, const char *name, void *opaque, - Error **errp) +static void get_chr(Object *obj, Visitor *v, const char *name, + Property *prop, Error **errp) { - CharBackend *be = object_field_prop_ptr(obj, opaque); + CharBackend *be = object_field_prop_ptr(obj, prop); char *p; p = g_strdup(be->chr && be->chr->label ? be->chr->label : ""); @@ -222,10 +221,9 @@ static void get_chr(Object *obj, Visitor *v, const char *name, void *opaque, g_free(p); } -static void set_chr(Object *obj, Visitor *v, const char *name, void *opaque, - Error **errp) +static void set_chr(Object *obj, Visitor *v, const char *name, + Property *prop, Error **errp) { - Property *prop = opaque; CharBackend *be = object_field_prop_ptr(obj, prop); Chardev *s; char *str; @@ -282,10 +280,9 @@ const PropertyInfo qdev_prop_chr = { * 01:02:03:04:05:06 * 01-02-03-04-05-06 */ -static void get_mac(Object *obj, Visitor *v, const char *name, void *opaque, - Error **errp) +static void get_mac(Object *obj, Visitor *v, const char *name, + Property *prop, Error **errp) { - Property *prop = opaque; MACAddr *mac = object_field_prop_ptr(obj, prop); char buffer[2 * 6 + 5 + 1]; char *p = buffer; @@ -297,10 +294,9 @@ static void get_mac(Object *obj, Visitor *v, const char *name, void *opaque, visit_type_str(v, name, &p, errp); } -static void set_mac(Object *obj, Visitor *v, const char *name, void *opaque, - Error **errp) +static void set_mac(Object *obj, Visitor *v, const char *name, + Property *prop, Error **errp) { - Property *prop = opaque; MACAddr *mac = object_field_prop_ptr(obj, prop); int i, pos; char *str; @@ -360,9 +356,8 @@ void qdev_prop_set_macaddr(DeviceState *dev, const char *name, /* --- netdev device --- */ static void get_netdev(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) + Property *prop, Error **errp) { - Property *prop = opaque; NICPeers *peers_ptr = object_field_prop_ptr(obj, prop); char *p = g_strdup(peers_ptr->ncs[0] ? peers_ptr->ncs[0]->name : ""); @@ -371,9 +366,8 @@ 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) + Property *prop, Error **errp) { - Property *prop = opaque; NICPeers *peers_ptr = object_field_prop_ptr(obj, prop); NetClientState **ncs = peers_ptr->ncs; NetClientState *peers[MAX_QUEUE_NUM]; @@ -433,9 +427,8 @@ const PropertyInfo qdev_prop_netdev = { /* --- audiodev --- */ static void get_audiodev(Object *obj, Visitor *v, const char* name, - void *opaque, Error **errp) + Property *prop, Error **errp) { - Property *prop = opaque; QEMUSoundCard *card = object_field_prop_ptr(obj, prop); char *p = g_strdup(audio_get_id(card)); @@ -444,9 +437,8 @@ 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) + Property *prop, Error **errp) { - Property *prop = opaque; QEMUSoundCard *card = object_field_prop_ptr(obj, prop); AudioState *state; int err = 0; @@ -545,10 +537,9 @@ const PropertyInfo qdev_prop_losttickpolicy = { /* --- blocksize --- */ static void set_blocksize(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) + Property *prop, Error **errp) { DeviceState *dev = DEVICE(obj); - Property *prop = opaque; uint32_t *ptr = object_field_prop_ptr(obj, prop); uint64_t value; Error *local_err = NULL; @@ -634,9 +625,8 @@ const PropertyInfo qdev_prop_multifd_compression = { * and type is a non-negative decimal integer */ static void get_reserved_region(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) + Property *prop, Error **errp) { - Property *prop = opaque; ReservedRegion *rr = object_field_prop_ptr(obj, prop); char buffer[64]; char *p = buffer; @@ -650,9 +640,8 @@ 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) + Property *prop, Error **errp) { - Property *prop = opaque; ReservedRegion *rr = object_field_prop_ptr(obj, prop); Error *local_err = NULL; const char *endptr; @@ -712,9 +701,8 @@ const PropertyInfo qdev_prop_reserved_region = { * bus-local address, i.e. "$slot" or "$slot.$fn" */ static void set_pci_devfn(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) + Property *prop, Error **errp) { - Property *prop = opaque; int32_t value, *ptr = object_field_prop_ptr(obj, prop); unsigned int slot, fn, n; char *str; @@ -774,9 +762,8 @@ const PropertyInfo qdev_prop_pci_devfn = { /* --- pci host address --- */ static void get_pci_host_devaddr(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) + Property *prop, Error **errp) { - Property *prop = opaque; PCIHostDeviceAddress *addr = object_field_prop_ptr(obj, prop); char buffer[] = "ffff:ff:ff.f"; char *p = buffer; @@ -800,9 +787,8 @@ static void get_pci_host_devaddr(Object *obj, Visitor *v, const char *name, * if is not supplied, it's assumed to be 0. */ static void set_pci_host_devaddr(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) + Property *prop, Error **errp) { - Property *prop = opaque; PCIHostDeviceAddress *addr = object_field_prop_ptr(obj, prop); char *str, *p; const char *e; @@ -889,9 +875,8 @@ const PropertyInfo qdev_prop_off_auto_pcibar = { /* --- PCIELinkSpeed 2_5/5/8/16 -- */ static void get_prop_pcielinkspeed(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) + Property *prop, Error **errp) { - Property *prop = opaque; PCIExpLinkSpeed *p = object_field_prop_ptr(obj, prop); int speed; @@ -917,9 +902,8 @@ 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) + Property *prop, Error **errp) { - Property *prop = opaque; PCIExpLinkSpeed *p = object_field_prop_ptr(obj, prop); int speed; @@ -959,9 +943,8 @@ const PropertyInfo qdev_prop_pcie_link_speed = { /* --- PCIELinkWidth 1/2/4/8/12/16/32 -- */ static void get_prop_pcielinkwidth(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) + Property *prop, Error **errp) { - Property *prop = opaque; PCIExpLinkWidth *p = object_field_prop_ptr(obj, prop); int width; @@ -996,9 +979,8 @@ 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) + Property *prop, Error **errp) { - Property *prop = opaque; PCIExpLinkWidth *p = object_field_prop_ptr(obj, prop); int width; @@ -1046,10 +1028,9 @@ const PropertyInfo qdev_prop_pcie_link_width = { /* --- UUID --- */ -static void get_uuid(Object *obj, Visitor *v, const char *name, void *opaque, - Error **errp) +static void get_uuid(Object *obj, Visitor *v, const char *name, + Property *prop, Error **errp) { - Property *prop = opaque; QemuUUID *uuid = object_field_prop_ptr(obj, prop); char buffer[UUID_FMT_LEN + 1]; char *p = buffer; @@ -1061,10 +1042,9 @@ static void get_uuid(Object *obj, Visitor *v, const char *name, void *opaque, #define UUID_VALUE_AUTO "auto" -static void set_uuid(Object *obj, Visitor *v, const char *name, void *opaque, - Error **errp) +static void set_uuid(Object *obj, Visitor *v, const char *name, + Property *prop, Error **errp) { - Property *prop = opaque; QemuUUID *uuid = object_field_prop_ptr(obj, prop); char *str; diff --git a/hw/s390x/css.c b/hw/s390x/css.c index fe47751df4..1400d80689 100644 --- a/hw/s390x/css.c +++ b/hw/s390x/css.c @@ -2341,9 +2341,8 @@ void css_reset(void) } static void get_css_devid(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) + Property *prop, Error **errp) { - Property *prop = opaque; CssDevId *dev_id = object_field_prop_ptr(obj, prop); char buffer[] = "xx.x.xxxx"; char *p = buffer; @@ -2370,9 +2369,8 @@ static void get_css_devid(Object *obj, Visitor *v, const char *name, * parse .. and assert valid range for cssid/ssid */ static void set_css_devid(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) + Property *prop, Error **errp) { - Property *prop = opaque; CssDevId *dev_id = object_field_prop_ptr(obj, prop); char *str; int num, n1, n2; diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c index 99b18d56ba..a29bba17b4 100644 --- a/hw/s390x/s390-pci-bus.c +++ b/hw/s390x/s390-pci-bus.c @@ -1320,19 +1320,17 @@ static void s390_pci_device_reset(DeviceState *dev) } static void s390_pci_get_fid(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) + Property *prop, Error **errp) { - Property *prop = opaque; uint32_t *ptr = object_field_prop_ptr(obj, prop); visit_type_uint32(v, name, ptr, errp); } static void s390_pci_set_fid(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) + Property *prop, Error **errp) { S390PCIBusDevice *zpci = S390_PCI_DEVICE(obj); - Property *prop = opaque; uint32_t *ptr = object_field_prop_ptr(obj, prop); if (!visit_type_uint32(v, name, ptr, errp)) { diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c index fc8d63c850..34f5f5dce2 100644 --- a/hw/vfio/pci-quirks.c +++ b/hw/vfio/pci-quirks.c @@ -1485,20 +1485,18 @@ void vfio_setup_resetfn_quirk(VFIOPCIDevice *vdev) * https://lists.gnu.org/archive/html/qemu-devel/2017-08/pdfUda5iEpgOS.pdf */ static void get_nv_gpudirect_clique_id(Object *obj, Visitor *v, - const char *name, void *opaque, - Error **errp) + const char *name, + Property *prop, Error **errp) { - Property *prop = opaque; uint8_t *ptr = object_field_prop_ptr(obj, prop); visit_type_uint8(v, name, ptr, errp); } static void set_nv_gpudirect_clique_id(Object *obj, Visitor *v, - const char *name, void *opaque, - Error **errp) + const char *name, + Property *prop, Error **errp) { - Property *prop = opaque; uint8_t value, *ptr = object_field_prop_ptr(obj, prop); if (!visit_type_uint8(v, name, &value, errp)) { diff --git a/qom/property-types.c b/qom/property-types.c index 856b5ae76d..82a5932f4a 100644 --- a/qom/property-types.c +++ b/qom/property-types.c @@ -8,18 +8,16 @@ #include "qemu/uuid.h" void field_prop_get_enum(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) + Property *prop, Error **errp) { - Property *prop = opaque; int *ptr = object_field_prop_ptr(obj, prop); visit_type_enum(v, name, ptr, prop->info->enum_table, errp); } void field_prop_set_enum(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) + Property *prop, Error **errp) { - Property *prop = opaque; int *ptr = object_field_prop_ptr(obj, prop); visit_type_enum(v, name, ptr, prop->info->enum_table, errp); @@ -59,9 +57,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) + Property *prop, Error **errp) { - Property *prop = opaque; uint32_t *p = object_field_prop_ptr(obj, prop); bool value = (*p & qdev_get_prop_mask(prop)) != 0; @@ -69,9 +66,8 @@ 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) + Property *prop, Error **errp) { - Property *prop = opaque; bool value; if (!visit_type_bool(v, name, &value, errp)) { @@ -113,9 +109,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) + Property *prop, Error **errp) { - Property *prop = opaque; uint64_t *p = object_field_prop_ptr(obj, prop); bool value = (*p & qdev_get_prop_mask64(prop)) != 0; @@ -123,9 +118,8 @@ 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) + Property *prop, Error **errp) { - Property *prop = opaque; bool value; if (!visit_type_bool(v, name, &value, errp)) { @@ -144,19 +138,17 @@ const PropertyInfo prop_info_bit64 = { /* --- bool --- */ -static void get_bool(Object *obj, Visitor *v, const char *name, void *opaque, - Error **errp) +static void get_bool(Object *obj, Visitor *v, const char *name, + Property *prop, Error **errp) { - Property *prop = opaque; bool *ptr = object_field_prop_ptr(obj, prop); visit_type_bool(v, name, ptr, errp); } -static void set_bool(Object *obj, Visitor *v, const char *name, void *opaque, - Error **errp) +static void set_bool(Object *obj, Visitor *v, const char *name, + Property *prop, Error **errp) { - Property *prop = opaque; bool *ptr = object_field_prop_ptr(obj, prop); visit_type_bool(v, name, ptr, errp); @@ -171,19 +163,17 @@ const PropertyInfo prop_info_bool = { /* --- 8bit integer --- */ -static void get_uint8(Object *obj, Visitor *v, const char *name, void *opaque, - Error **errp) +static void get_uint8(Object *obj, Visitor *v, const char *name, + Property *prop, Error **errp) { - Property *prop = opaque; uint8_t *ptr = object_field_prop_ptr(obj, prop); visit_type_uint8(v, name, ptr, errp); } -static void set_uint8(Object *obj, Visitor *v, const char *name, void *opaque, - Error **errp) +static void set_uint8(Object *obj, Visitor *v, const char *name, + Property *prop, Error **errp) { - Property *prop = opaque; uint8_t *ptr = object_field_prop_ptr(obj, prop); visit_type_uint8(v, name, ptr, errp); @@ -211,18 +201,16 @@ const PropertyInfo prop_info_uint8 = { /* --- 16bit integer --- */ static void get_uint16(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) + Property *prop, Error **errp) { - Property *prop = opaque; uint16_t *ptr = object_field_prop_ptr(obj, prop); visit_type_uint16(v, name, ptr, errp); } static void set_uint16(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) + Property *prop, Error **errp) { - Property *prop = opaque; uint16_t *ptr = object_field_prop_ptr(obj, prop); visit_type_uint16(v, name, ptr, errp); @@ -238,36 +226,32 @@ const PropertyInfo prop_info_uint16 = { /* --- 32bit integer --- */ static void get_uint32(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) + Property *prop, Error **errp) { - Property *prop = opaque; uint32_t *ptr = object_field_prop_ptr(obj, prop); visit_type_uint32(v, name, ptr, errp); } static void set_uint32(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) + Property *prop, Error **errp) { - Property *prop = opaque; uint32_t *ptr = object_field_prop_ptr(obj, prop); visit_type_uint32(v, name, ptr, errp); } void field_prop_get_int32(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) + Property *prop, Error **errp) { - Property *prop = opaque; int32_t *ptr = object_field_prop_ptr(obj, prop); visit_type_int32(v, name, ptr, errp); } -static void set_int32(Object *obj, Visitor *v, const char *name, void *opaque, - Error **errp) +static void set_int32(Object *obj, Visitor *v, const char *name, + Property *prop, Error **errp) { - Property *prop = opaque; int32_t *ptr = object_field_prop_ptr(obj, prop); visit_type_int32(v, name, ptr, errp); @@ -290,36 +274,32 @@ const PropertyInfo prop_info_int32 = { /* --- 64bit integer --- */ static void get_uint64(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) + Property *prop, Error **errp) { - Property *prop = opaque; uint64_t *ptr = object_field_prop_ptr(obj, prop); visit_type_uint64(v, name, ptr, errp); } static void set_uint64(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) + Property *prop, Error **errp) { - Property *prop = opaque; uint64_t *ptr = object_field_prop_ptr(obj, prop); visit_type_uint64(v, name, ptr, errp); } static void get_int64(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) + Property *prop, Error **errp) { - Property *prop = opaque; int64_t *ptr = object_field_prop_ptr(obj, prop); visit_type_int64(v, name, ptr, errp); } static void set_int64(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) + Property *prop, Error **errp) { - Property *prop = opaque; int64_t *ptr = object_field_prop_ptr(obj, prop); visit_type_int64(v, name, ptr, errp); @@ -348,9 +328,8 @@ static void release_string(Object *obj, const char *name, void *opaque) } static void get_string(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) + Property *prop, Error **errp) { - Property *prop = opaque; char **ptr = object_field_prop_ptr(obj, prop); if (!*ptr) { @@ -362,9 +341,8 @@ 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) + Property *prop, Error **errp) { - Property *prop = opaque; char **ptr = object_field_prop_ptr(obj, prop); char *str; @@ -396,19 +374,17 @@ const PropertyInfo prop_info_on_off_auto = { /* --- 32bit unsigned int 'size' type --- */ void field_prop_get_size32(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) + Property *prop, Error **errp) { - Property *prop = opaque; uint32_t *ptr = object_field_prop_ptr(obj, prop); uint64_t value = *ptr; visit_type_size(v, name, &value, errp); } -static void set_size32(Object *obj, Visitor *v, const char *name, void *opaque, - Error **errp) +static void set_size32(Object *obj, Visitor *v, const char *name, + Property *prop, Error **errp) { - Property *prop = opaque; uint32_t *ptr = object_field_prop_ptr(obj, prop); uint64_t value; @@ -437,14 +413,8 @@ const PropertyInfo prop_info_size32 = { /* --- support for array properties --- */ static void set_prop_arraylen(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) + Property *prop, Error **errp) { - /* Setter for the property which defines the length of a - * variable-sized property array. As well as actually setting the - * array-length field in the device struct, we have to create the - * array itself and dynamically add the corresponding properties. - */ - Property *prop = opaque; ObjectProperty *op = object_property_find_err(obj, name, &error_abort); uint32_t *alenptr = object_field_prop_ptr(obj, prop); void **arrayptr = (void *)obj + prop->arrayoffset; @@ -500,19 +470,17 @@ const PropertyInfo prop_info_arraylen = { /* --- 64bit unsigned int 'size' type --- */ -static void get_size(Object *obj, Visitor *v, const char *name, void *opaque, - Error **errp) +static void get_size(Object *obj, Visitor *v, const char *name, + Property *prop, Error **errp) { - Property *prop = opaque; uint64_t *ptr = object_field_prop_ptr(obj, prop); visit_type_size(v, name, ptr, errp); } -static void set_size(Object *obj, Visitor *v, const char *name, void *opaque, - Error **errp) +static void set_size(Object *obj, Visitor *v, const char *name, + Property *prop, Error **errp) { - Property *prop = opaque; uint64_t *ptr = object_field_prop_ptr(obj, prop); visit_type_size(v, name, ptr, errp); diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c index 5a9397f19a..3acc99c29c 100644 --- a/target/sparc/cpu.c +++ b/target/sparc/cpu.c @@ -787,7 +787,7 @@ static void sparc_cpu_initfn(Object *obj) } static void sparc_get_nwindows(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) + Property *prop, Error **errp) { SPARCCPU *cpu = SPARC_CPU(obj); int64_t value = cpu->env.def.nwindows; @@ -796,7 +796,7 @@ 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) + Property *prop, Error **errp) { const int64_t min = MIN_NWINDOWS; const int64_t max = MAX_NWINDOWS; From patchwork Wed Nov 4 17:25:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 11881723 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C140214B4 for ; Wed, 4 Nov 2020 17:26:37 +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 7889F2067C for ; Wed, 4 Nov 2020 17:26:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="WhaUsOVn" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7889F2067C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.19441.44649 (Exim 4.92) (envelope-from ) id 1kaMXc-00051B-5T; Wed, 04 Nov 2020 17:25:48 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 19441.44649; Wed, 04 Nov 2020 17:25:48 +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 1kaMXc-000513-1m; Wed, 04 Nov 2020 17:25:48 +0000 Received: by outflank-mailman (input) for mailman id 19441; Wed, 04 Nov 2020 17:25:46 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kaMXa-00050W-Fg for xen-devel@lists.xenproject.org; Wed, 04 Nov 2020 17:25:46 +0000 Received: from us-smtp-delivery-124.mimecast.com (unknown [216.205.24.124]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTP id dff89702-31e5-4c84-b6f6-48a8ba53bbbd; Wed, 04 Nov 2020 17:25:43 +0000 (UTC) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-333-Ue3Ir6wOOOWpdg8TaOCtAA-1; Wed, 04 Nov 2020 12:25:41 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D20F411BD342; Wed, 4 Nov 2020 17:25:38 +0000 (UTC) Received: from localhost (ovpn-114-68.rdu2.redhat.com [10.10.114.68]) by smtp.corp.redhat.com (Postfix) with ESMTP id E97BE65F5E; Wed, 4 Nov 2020 17:25:31 +0000 (UTC) Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kaMXa-00050W-Fg for xen-devel@lists.xenproject.org; Wed, 04 Nov 2020 17:25:46 +0000 X-Inumbo-ID: dff89702-31e5-4c84-b6f6-48a8ba53bbbd Received: from us-smtp-delivery-124.mimecast.com (unknown [216.205.24.124]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTP id dff89702-31e5-4c84-b6f6-48a8ba53bbbd; Wed, 04 Nov 2020 17:25:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604510742; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Q5BeNYOZ4RDTFOfuNV6EvBOecZflftp3s5pV01xgFqI=; b=WhaUsOVnDkpsIxNfLQzar1rNZwy/plNMQavYBea5cAJG2vlTjKx1pG37JZzMkM93EenxBM 29d+9a5MsGnorTl3PpoiMluMO0oqIcs+c5YSDv1OV84qKxcdNBhoDObBAZHpNtEFrj5TAc WDzVjOVtrHBpb3J1PtJHYydVdXNNubs= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-333-Ue3Ir6wOOOWpdg8TaOCtAA-1; Wed, 04 Nov 2020 12:25:41 -0500 X-MC-Unique: Ue3Ir6wOOOWpdg8TaOCtAA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D20F411BD342; Wed, 4 Nov 2020 17:25:38 +0000 (UTC) Received: from localhost (ovpn-114-68.rdu2.redhat.com [10.10.114.68]) by smtp.corp.redhat.com (Postfix) with ESMTP id E97BE65F5E; Wed, 4 Nov 2020 17:25:31 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Cc: Igor Mammedov , "Daniel P. Berrange" , Paolo Bonzini , Stefan Berger , Stefano Stabellini , Anthony Perard , Paul Durrant , Kevin Wolf , Max Reitz , Cornelia Huck , Thomas Huth , Halil Pasic , Christian Borntraeger , Richard Henderson , David Hildenbrand , Matthew Rosato , Alex Williamson , xen-devel@lists.xenproject.org, qemu-block@nongnu.org, qemu-s390x@nongnu.org Subject: [PATCH 6/7] qom: Add FIELD_PTR, a type-safe wrapper for object_field_prop_ptr() Date: Wed, 4 Nov 2020 12:25:11 -0500 Message-Id: <20201104172512.2381656-7-ehabkost@redhat.com> In-Reply-To: <20201104172512.2381656-1-ehabkost@redhat.com> References: <20201104172512.2381656-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Introduce a FIELD_PTR macro that will ensure the size of the area we are accessing has the correct size, and will return a pointer of the correct type. Signed-off-by: Eduardo Habkost Acked-by: Cornelia Huck --- 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: Thomas Huth Cc: Halil Pasic Cc: Christian Borntraeger Cc: Richard Henderson Cc: David Hildenbrand Cc: Matthew Rosato Cc: Alex Williamson Cc: qemu-devel@nongnu.org Cc: xen-devel@lists.xenproject.org Cc: qemu-block@nongnu.org Cc: qemu-s390x@nongnu.org --- include/qom/field-property.h | 21 ++++++++++- backends/tpm/tpm_util.c | 6 ++-- hw/block/xen-block.c | 4 +-- hw/core/qdev-properties-system.c | 50 +++++++++++++------------- hw/s390x/css.c | 4 +-- hw/s390x/s390-pci-bus.c | 4 +-- hw/vfio/pci-quirks.c | 4 +-- qom/field-property.c | 3 +- qom/property-types.c | 60 +++++++++++++++++--------------- 9 files changed, 89 insertions(+), 67 deletions(-) diff --git a/include/qom/field-property.h b/include/qom/field-property.h index 1d3bf9699b..58baaca160 100644 --- a/include/qom/field-property.h +++ b/include/qom/field-property.h @@ -125,6 +125,25 @@ object_class_property_add_field(ObjectClass *oc, const char *name, Property *prop, ObjectPropertyAllowSet allow_set); -void *object_field_prop_ptr(Object *obj, Property *prop); +/** + * object_field_prop_ptr: Get pointer to property field + * @obj: the object instance + * @prop: field property definition + * @expected_size: expected size of struct field + * + * Don't use this function directly, use the FIELD_PTR() macro instead. + */ +void *object_field_prop_ptr(Object *obj, Property *prop, size_t expected_size); + +/** + * FIELD_PTR: Get pointer to struct field for property + * + * This returns a pointer to type @type, pointing to the struct + * field containing the property value. + * + * @type must match the expected type for the property. + */ +#define FIELD_PTR(obj, prop, type) \ + ((type *)object_field_prop_ptr((obj), (prop), sizeof(type))) #endif diff --git a/backends/tpm/tpm_util.c b/backends/tpm/tpm_util.c index 556e21388c..da80379404 100644 --- a/backends/tpm/tpm_util.c +++ b/backends/tpm/tpm_util.c @@ -35,7 +35,7 @@ static void get_tpm(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - TPMBackend **be = object_field_prop_ptr(obj, prop); + TPMBackend **be = FIELD_PTR(obj, prop, TPMBackend *); char *p; p = g_strdup(*be ? (*be)->id : ""); @@ -46,7 +46,7 @@ static void get_tpm(Object *obj, Visitor *v, const char *name, static void set_tpm(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - TPMBackend *s, **be = object_field_prop_ptr(obj, prop); + TPMBackend *s, **be = FIELD_PTR(obj, prop, TPMBackend *); char *str; if (!visit_type_str(v, name, &str, errp)) { @@ -65,7 +65,7 @@ static void set_tpm(Object *obj, Visitor *v, const char *name, static void release_tpm(Object *obj, const char *name, Property *prop) { - TPMBackend **be = object_field_prop_ptr(obj, prop); + TPMBackend **be = FIELD_PTR(obj, prop, TPMBackend *); if (*be) { tpm_backend_reset(*be); diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c index c1ee634639..390bf417ab 100644 --- a/hw/block/xen-block.c +++ b/hw/block/xen-block.c @@ -335,7 +335,7 @@ static char *disk_to_vbd_name(unsigned int disk) static void xen_block_get_vdev(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - XenBlockVdev *vdev = object_field_prop_ptr(obj, prop); + XenBlockVdev *vdev = FIELD_PTR(obj, prop, XenBlockVdev); char *str; switch (vdev->type) { @@ -394,7 +394,7 @@ 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, Property *prop, Error **errp) { - XenBlockVdev *vdev = object_field_prop_ptr(obj, prop); + XenBlockVdev *vdev = FIELD_PTR(obj, prop, XenBlockVdev); char *str, *p; const char *end; diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c index 2fdd5863bb..1ec64514b9 100644 --- a/hw/core/qdev-properties-system.c +++ b/hw/core/qdev-properties-system.c @@ -61,7 +61,7 @@ static bool check_prop_still_unset(Object *obj, const char *name, static void get_drive(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - void **ptr = object_field_prop_ptr(obj, prop); + void **ptr = FIELD_PTR(obj, prop, void *); const char *value; char *p; @@ -87,7 +87,7 @@ static void set_drive_helper(Object *obj, Visitor *v, const char *name, { DeviceState *dev = DEVICE(obj); Property *prop = opaque; - void **ptr = object_field_prop_ptr(obj, prop); + void **ptr = FIELD_PTR(obj, prop, void *); char *str; BlockBackend *blk; bool blk_created = false; @@ -179,7 +179,7 @@ static void set_drive_iothread(Object *obj, Visitor *v, const char *name, static void release_drive(Object *obj, const char *name, Property *prop) { DeviceState *dev = DEVICE(obj); - BlockBackend **ptr = object_field_prop_ptr(obj, prop); + BlockBackend **ptr = FIELD_PTR(obj, prop, BlockBackend *); if (*ptr) { AioContext *ctx = blk_get_aio_context(*ptr); @@ -212,7 +212,7 @@ const PropertyInfo qdev_prop_drive_iothread = { static void get_chr(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - CharBackend *be = object_field_prop_ptr(obj, prop); + CharBackend *be = FIELD_PTR(obj, prop, CharBackend); char *p; p = g_strdup(be->chr && be->chr->label ? be->chr->label : ""); @@ -223,7 +223,7 @@ static void get_chr(Object *obj, Visitor *v, const char *name, static void set_chr(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - CharBackend *be = object_field_prop_ptr(obj, prop); + CharBackend *be = FIELD_PTR(obj, prop, CharBackend); Chardev *s; char *str; @@ -258,7 +258,7 @@ static void set_chr(Object *obj, Visitor *v, const char *name, static void release_chr(Object *obj, const char *name, Property *prop) { - CharBackend *be = object_field_prop_ptr(obj, prop); + CharBackend *be = FIELD_PTR(obj, prop, CharBackend); qemu_chr_fe_deinit(be, false); } @@ -281,7 +281,7 @@ const PropertyInfo qdev_prop_chr = { static void get_mac(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - MACAddr *mac = object_field_prop_ptr(obj, prop); + MACAddr *mac = FIELD_PTR(obj, prop, MACAddr); char buffer[2 * 6 + 5 + 1]; char *p = buffer; @@ -295,7 +295,7 @@ static void get_mac(Object *obj, Visitor *v, const char *name, static void set_mac(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - MACAddr *mac = object_field_prop_ptr(obj, prop); + MACAddr *mac = FIELD_PTR(obj, prop, MACAddr); int i, pos; char *str; const char *p; @@ -356,7 +356,7 @@ void qdev_prop_set_macaddr(DeviceState *dev, const char *name, static void get_netdev(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - NICPeers *peers_ptr = object_field_prop_ptr(obj, prop); + NICPeers *peers_ptr = FIELD_PTR(obj, prop, NICPeers); char *p = g_strdup(peers_ptr->ncs[0] ? peers_ptr->ncs[0]->name : ""); visit_type_str(v, name, &p, errp); @@ -366,7 +366,7 @@ static void get_netdev(Object *obj, Visitor *v, const char *name, static void set_netdev(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - NICPeers *peers_ptr = object_field_prop_ptr(obj, prop); + NICPeers *peers_ptr = FIELD_PTR(obj, prop, NICPeers); NetClientState **ncs = peers_ptr->ncs; NetClientState *peers[MAX_QUEUE_NUM]; int queues, err = 0, i = 0; @@ -427,7 +427,7 @@ const PropertyInfo qdev_prop_netdev = { static void get_audiodev(Object *obj, Visitor *v, const char* name, Property *prop, Error **errp) { - QEMUSoundCard *card = object_field_prop_ptr(obj, prop); + QEMUSoundCard *card = FIELD_PTR(obj, prop, QEMUSoundCard); char *p = g_strdup(audio_get_id(card)); visit_type_str(v, name, &p, errp); @@ -437,7 +437,7 @@ static void get_audiodev(Object *obj, Visitor *v, const char* name, static void set_audiodev(Object *obj, Visitor *v, const char* name, Property *prop, Error **errp) { - QEMUSoundCard *card = object_field_prop_ptr(obj, prop); + QEMUSoundCard *card = FIELD_PTR(obj, prop, QEMUSoundCard); AudioState *state; int err = 0; char *str; @@ -538,7 +538,7 @@ static void set_blocksize(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { DeviceState *dev = DEVICE(obj); - uint32_t *ptr = object_field_prop_ptr(obj, prop); + uint32_t *ptr = FIELD_PTR(obj, prop, uint32_t); uint64_t value; Error *local_err = NULL; @@ -625,7 +625,7 @@ const PropertyInfo qdev_prop_multifd_compression = { static void get_reserved_region(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - ReservedRegion *rr = object_field_prop_ptr(obj, prop); + ReservedRegion *rr = FIELD_PTR(obj, prop, ReservedRegion); char buffer[64]; char *p = buffer; int rc; @@ -640,7 +640,7 @@ static void get_reserved_region(Object *obj, Visitor *v, const char *name, static void set_reserved_region(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - ReservedRegion *rr = object_field_prop_ptr(obj, prop); + ReservedRegion *rr = FIELD_PTR(obj, prop, ReservedRegion); Error *local_err = NULL; const char *endptr; char *str; @@ -701,7 +701,7 @@ const PropertyInfo qdev_prop_reserved_region = { static void set_pci_devfn(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - int32_t value, *ptr = object_field_prop_ptr(obj, prop); + int32_t value, *ptr = FIELD_PTR(obj, prop, int32_t); unsigned int slot, fn, n; char *str; @@ -739,7 +739,7 @@ invalid: static int print_pci_devfn(Object *obj, Property *prop, char *dest, size_t len) { - int32_t *ptr = object_field_prop_ptr(obj, prop); + int32_t *ptr = FIELD_PTR(obj, prop, int32_t); if (*ptr == -1) { return snprintf(dest, len, ""); @@ -762,7 +762,7 @@ const PropertyInfo qdev_prop_pci_devfn = { static void get_pci_host_devaddr(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - PCIHostDeviceAddress *addr = object_field_prop_ptr(obj, prop); + PCIHostDeviceAddress *addr = FIELD_PTR(obj, prop, PCIHostDeviceAddress); char buffer[] = "ffff:ff:ff.f"; char *p = buffer; int rc = 0; @@ -787,7 +787,7 @@ 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, Property *prop, Error **errp) { - PCIHostDeviceAddress *addr = object_field_prop_ptr(obj, prop); + PCIHostDeviceAddress *addr = FIELD_PTR(obj, prop, PCIHostDeviceAddress); char *str, *p; const char *e; unsigned long val; @@ -875,7 +875,7 @@ const PropertyInfo qdev_prop_off_auto_pcibar = { static void get_prop_pcielinkspeed(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - PCIExpLinkSpeed *p = object_field_prop_ptr(obj, prop); + PCIExpLinkSpeed *p = FIELD_PTR(obj, prop, PCIExpLinkSpeed); int speed; switch (*p) { @@ -902,7 +902,7 @@ static void get_prop_pcielinkspeed(Object *obj, Visitor *v, const char *name, static void set_prop_pcielinkspeed(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - PCIExpLinkSpeed *p = object_field_prop_ptr(obj, prop); + PCIExpLinkSpeed *p = FIELD_PTR(obj, prop, PCIExpLinkSpeed); int speed; if (!visit_type_enum(v, name, &speed, prop->info->enum_table, @@ -943,7 +943,7 @@ const PropertyInfo qdev_prop_pcie_link_speed = { static void get_prop_pcielinkwidth(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - PCIExpLinkWidth *p = object_field_prop_ptr(obj, prop); + PCIExpLinkWidth *p = FIELD_PTR(obj, prop, PCIExpLinkWidth); int width; switch (*p) { @@ -979,7 +979,7 @@ static void get_prop_pcielinkwidth(Object *obj, Visitor *v, const char *name, static void set_prop_pcielinkwidth(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - PCIExpLinkWidth *p = object_field_prop_ptr(obj, prop); + PCIExpLinkWidth *p = FIELD_PTR(obj, prop, PCIExpLinkWidth); int width; if (!visit_type_enum(v, name, &width, prop->info->enum_table, @@ -1029,7 +1029,7 @@ const PropertyInfo qdev_prop_pcie_link_width = { static void get_uuid(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - QemuUUID *uuid = object_field_prop_ptr(obj, prop); + QemuUUID *uuid = FIELD_PTR(obj, prop, QemuUUID); char buffer[UUID_FMT_LEN + 1]; char *p = buffer; @@ -1043,7 +1043,7 @@ static void get_uuid(Object *obj, Visitor *v, const char *name, static void set_uuid(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - QemuUUID *uuid = object_field_prop_ptr(obj, prop); + QemuUUID *uuid = FIELD_PTR(obj, prop, QemuUUID); char *str; if (!visit_type_str(v, name, &str, errp)) { diff --git a/hw/s390x/css.c b/hw/s390x/css.c index 1400d80689..5a38919a05 100644 --- a/hw/s390x/css.c +++ b/hw/s390x/css.c @@ -2343,7 +2343,7 @@ void css_reset(void) static void get_css_devid(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - CssDevId *dev_id = object_field_prop_ptr(obj, prop); + CssDevId *dev_id = FIELD_PTR(obj, prop, CssDevId); char buffer[] = "xx.x.xxxx"; char *p = buffer; int r; @@ -2371,7 +2371,7 @@ static void get_css_devid(Object *obj, Visitor *v, const char *name, static void set_css_devid(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - CssDevId *dev_id = object_field_prop_ptr(obj, prop); + CssDevId *dev_id = FIELD_PTR(obj, prop, CssDevId); 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 a29bba17b4..8e38787c99 100644 --- a/hw/s390x/s390-pci-bus.c +++ b/hw/s390x/s390-pci-bus.c @@ -1322,7 +1322,7 @@ static void s390_pci_device_reset(DeviceState *dev) static void s390_pci_get_fid(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - uint32_t *ptr = object_field_prop_ptr(obj, prop); + uint32_t *ptr = FIELD_PTR(obj, prop, uint32_t); visit_type_uint32(v, name, ptr, errp); } @@ -1331,7 +1331,7 @@ static void s390_pci_set_fid(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { S390PCIBusDevice *zpci = S390_PCI_DEVICE(obj); - uint32_t *ptr = object_field_prop_ptr(obj, prop); + uint32_t *ptr = FIELD_PTR(obj, prop, uint32_t); if (!visit_type_uint32(v, name, ptr, errp)) { return; diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c index 34f5f5dce2..93fb507ec4 100644 --- a/hw/vfio/pci-quirks.c +++ b/hw/vfio/pci-quirks.c @@ -1488,7 +1488,7 @@ static void get_nv_gpudirect_clique_id(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - uint8_t *ptr = object_field_prop_ptr(obj, prop); + uint8_t *ptr = FIELD_PTR(obj, prop, uint8_t); visit_type_uint8(v, name, ptr, errp); } @@ -1497,7 +1497,7 @@ static void set_nv_gpudirect_clique_id(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - uint8_t value, *ptr = object_field_prop_ptr(obj, prop); + uint8_t value, *ptr = FIELD_PTR(obj, prop, uint8_t); if (!visit_type_uint8(v, name, &value, errp)) { return; diff --git a/qom/field-property.c b/qom/field-property.c index 865d4929a3..0932a799de 100644 --- a/qom/field-property.c +++ b/qom/field-property.c @@ -5,10 +5,11 @@ #include "qom/field-property.h" #include "qom/field-property-internal.h" -void *object_field_prop_ptr(Object *obj, Property *prop) +void *object_field_prop_ptr(Object *obj, Property *prop, size_t expected_size) { void *ptr = obj; ptr += prop->offset; + assert(prop->size == expected_size); return ptr; } diff --git a/qom/property-types.c b/qom/property-types.c index 0182a73e38..e01f5a9fef 100644 --- a/qom/property-types.c +++ b/qom/property-types.c @@ -10,7 +10,7 @@ void field_prop_get_enum(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - int *ptr = object_field_prop_ptr(obj, prop); + int *ptr = FIELD_PTR(obj, prop, int); visit_type_enum(v, name, ptr, prop->info->enum_table, errp); } @@ -18,7 +18,7 @@ void field_prop_get_enum(Object *obj, Visitor *v, const char *name, void field_prop_set_enum(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - int *ptr = object_field_prop_ptr(obj, prop); + int *ptr = FIELD_PTR(obj, prop, int); visit_type_enum(v, name, ptr, prop->info->enum_table, errp); } @@ -47,7 +47,7 @@ static uint32_t qdev_get_prop_mask(Property *prop) static void bit_prop_set(Object *obj, Property *props, bool val) { - uint32_t *p = object_field_prop_ptr(obj, props); + uint32_t *p = FIELD_PTR(obj, props, uint32_t); uint32_t mask = qdev_get_prop_mask(props); if (val) { *p |= mask; @@ -59,7 +59,7 @@ static void bit_prop_set(Object *obj, Property *props, bool val) static void prop_get_bit(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - uint32_t *p = object_field_prop_ptr(obj, prop); + uint32_t *p = FIELD_PTR(obj, prop, uint32_t); bool value = (*p & qdev_get_prop_mask(prop)) != 0; visit_type_bool(v, name, &value, errp); @@ -99,7 +99,7 @@ static uint64_t qdev_get_prop_mask64(Property *prop) static void bit64_prop_set(Object *obj, Property *props, bool val) { - uint64_t *p = object_field_prop_ptr(obj, props); + uint64_t *p = FIELD_PTR(obj, props, uint64_t); uint64_t mask = qdev_get_prop_mask64(props); if (val) { *p |= mask; @@ -111,7 +111,7 @@ static void bit64_prop_set(Object *obj, Property *props, bool val) static void prop_get_bit64(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - uint64_t *p = object_field_prop_ptr(obj, prop); + uint64_t *p = FIELD_PTR(obj, prop, uint64_t); bool value = (*p & qdev_get_prop_mask64(prop)) != 0; visit_type_bool(v, name, &value, errp); @@ -141,7 +141,7 @@ const PropertyInfo prop_info_bit64 = { static void get_bool(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - bool *ptr = object_field_prop_ptr(obj, prop); + bool *ptr = FIELD_PTR(obj, prop, bool); visit_type_bool(v, name, ptr, errp); } @@ -149,7 +149,7 @@ static void get_bool(Object *obj, Visitor *v, const char *name, static void set_bool(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - bool *ptr = object_field_prop_ptr(obj, prop); + bool *ptr = FIELD_PTR(obj, prop, bool); visit_type_bool(v, name, ptr, errp); } @@ -166,7 +166,7 @@ const PropertyInfo prop_info_bool = { static void get_uint8(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - uint8_t *ptr = object_field_prop_ptr(obj, prop); + uint8_t *ptr = FIELD_PTR(obj, prop, uint8_t); visit_type_uint8(v, name, ptr, errp); } @@ -174,7 +174,7 @@ static void get_uint8(Object *obj, Visitor *v, const char *name, static void set_uint8(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - uint8_t *ptr = object_field_prop_ptr(obj, prop); + uint8_t *ptr = FIELD_PTR(obj, prop, uint8_t); visit_type_uint8(v, name, ptr, errp); } @@ -203,7 +203,7 @@ const PropertyInfo prop_info_uint8 = { static void get_uint16(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - uint16_t *ptr = object_field_prop_ptr(obj, prop); + uint16_t *ptr = FIELD_PTR(obj, prop, uint16_t); visit_type_uint16(v, name, ptr, errp); } @@ -211,7 +211,7 @@ static void get_uint16(Object *obj, Visitor *v, const char *name, static void set_uint16(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - uint16_t *ptr = object_field_prop_ptr(obj, prop); + uint16_t *ptr = FIELD_PTR(obj, prop, uint16_t); visit_type_uint16(v, name, ptr, errp); } @@ -228,7 +228,7 @@ const PropertyInfo prop_info_uint16 = { static void get_uint32(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - uint32_t *ptr = object_field_prop_ptr(obj, prop); + uint32_t *ptr = FIELD_PTR(obj, prop, uint32_t); visit_type_uint32(v, name, ptr, errp); } @@ -236,7 +236,7 @@ static void get_uint32(Object *obj, Visitor *v, const char *name, static void set_uint32(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - uint32_t *ptr = object_field_prop_ptr(obj, prop); + uint32_t *ptr = FIELD_PTR(obj, prop, uint32_t); visit_type_uint32(v, name, ptr, errp); } @@ -244,7 +244,7 @@ static void set_uint32(Object *obj, Visitor *v, const char *name, void field_prop_get_int32(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - int32_t *ptr = object_field_prop_ptr(obj, prop); + int32_t *ptr = FIELD_PTR(obj, prop, int32_t); visit_type_int32(v, name, ptr, errp); } @@ -252,7 +252,7 @@ void field_prop_get_int32(Object *obj, Visitor *v, const char *name, static void set_int32(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - int32_t *ptr = object_field_prop_ptr(obj, prop); + int32_t *ptr = FIELD_PTR(obj, prop, int32_t); visit_type_int32(v, name, ptr, errp); } @@ -276,7 +276,7 @@ const PropertyInfo prop_info_int32 = { static void get_uint64(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - uint64_t *ptr = object_field_prop_ptr(obj, prop); + uint64_t *ptr = FIELD_PTR(obj, prop, uint64_t); visit_type_uint64(v, name, ptr, errp); } @@ -284,7 +284,7 @@ static void get_uint64(Object *obj, Visitor *v, const char *name, static void set_uint64(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - uint64_t *ptr = object_field_prop_ptr(obj, prop); + uint64_t *ptr = FIELD_PTR(obj, prop, uint64_t); visit_type_uint64(v, name, ptr, errp); } @@ -292,7 +292,7 @@ static void set_uint64(Object *obj, Visitor *v, const char *name, static void get_int64(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - int64_t *ptr = object_field_prop_ptr(obj, prop); + int64_t *ptr = FIELD_PTR(obj, prop, int64_t); visit_type_int64(v, name, ptr, errp); } @@ -300,7 +300,7 @@ static void get_int64(Object *obj, Visitor *v, const char *name, static void set_int64(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - int64_t *ptr = object_field_prop_ptr(obj, prop); + int64_t *ptr = FIELD_PTR(obj, prop, int64_t); visit_type_int64(v, name, ptr, errp); } @@ -323,13 +323,14 @@ const PropertyInfo prop_info_int64 = { static void release_string(Object *obj, const char *name, Property *prop) { - g_free(*(char **)object_field_prop_ptr(obj, prop)); + char **ptr = FIELD_PTR(obj, prop, char *); + g_free(*ptr); } static void get_string(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - char **ptr = object_field_prop_ptr(obj, prop); + char **ptr = FIELD_PTR(obj, prop, char *); if (!*ptr) { char *str = (char *)""; @@ -342,7 +343,7 @@ static void get_string(Object *obj, Visitor *v, const char *name, static void set_string(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - char **ptr = object_field_prop_ptr(obj, prop); + char **ptr = FIELD_PTR(obj, prop, char *); char *str; if (!visit_type_str(v, name, &str, errp)) { @@ -375,7 +376,7 @@ const PropertyInfo prop_info_on_off_auto = { void field_prop_get_size32(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - uint32_t *ptr = object_field_prop_ptr(obj, prop); + uint32_t *ptr = FIELD_PTR(obj, prop, uint32_t); uint64_t value = *ptr; visit_type_size(v, name, &value, errp); @@ -384,7 +385,7 @@ void field_prop_get_size32(Object *obj, Visitor *v, const char *name, static void set_size32(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - uint32_t *ptr = object_field_prop_ptr(obj, prop); + uint32_t *ptr = FIELD_PTR(obj, prop, uint32_t); uint64_t value; if (!visit_type_size(v, name, &value, errp)) { @@ -415,7 +416,7 @@ static void set_prop_arraylen(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { ObjectProperty *op = object_property_find_err(obj, name, &error_abort); - uint32_t *alenptr = object_field_prop_ptr(obj, prop); + uint32_t *alenptr = FIELD_PTR(obj, prop, uint32_t); void **arrayptr = (void *)obj + prop->arrayoffset; void *eltptr; const char *arrayname; @@ -455,7 +456,8 @@ static void set_prop_arraylen(Object *obj, Visitor *v, const char *name, */ arrayprop->offset = eltptr - (void *)obj; arrayprop->size = prop->arrayfieldsize; - assert(object_field_prop_ptr(obj, arrayprop) == eltptr); + assert(object_field_prop_ptr(obj, arrayprop, + prop->arrayfieldsize) == eltptr); object_property_add_field(obj, propname, arrayprop, op->allow_set); } } @@ -472,7 +474,7 @@ const PropertyInfo prop_info_arraylen = { static void get_size(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - uint64_t *ptr = object_field_prop_ptr(obj, prop); + uint64_t *ptr = FIELD_PTR(obj, prop, uint64_t); visit_type_size(v, name, ptr, errp); } @@ -480,7 +482,7 @@ static void get_size(Object *obj, Visitor *v, const char *name, static void set_size(Object *obj, Visitor *v, const char *name, Property *prop, Error **errp) { - uint64_t *ptr = object_field_prop_ptr(obj, prop); + uint64_t *ptr = FIELD_PTR(obj, prop, uint64_t); visit_type_size(v, name, ptr, errp); }