From nobody Mon May 12 14:26:47 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1734445770; cv=none;
d=zohomail.com; s=zohoarc;
b=XY39CbASiD9FqMwtHTdmgSAC1Th4FaytL/tAjAolZoKerI+w+uMPzmhRzz9gUtSYumUfCWMD4yHYLDgn/foCuoATLbxI/zCewMlggMIPJD8HmfBGr06nGEfRNRI39h4BFAzASPL5UB6Q/pBEXB6OYkjOQnh3+Xv0MEw0qUZUfwM=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1734445770;
h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=dvzZP7QmtJuluCF9JaneWnfZ4YDe/Y5SkuUa8w/tnME=;
b=duavod7KdlDv4+JslYM+2X8ggy2j1B6S+nJUDyUe3nPZlBHLraVBU4yPNpnOXSTb7hEvtYtQ9vsyy4fiRi7CgflglHQZmu1l2oGyuPnEkPiJqyUTqQXMImDboLz+tn3AyXDyLMfB/6pqZoSBNHkTHjIAcNWclbdWdVs7BRP3HYI=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<armbru@redhat.com> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1734445770442224.92945571460803;
Tue, 17 Dec 2024 06:29:30 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tNYZg-00017V-N0; Tue, 17 Dec 2024 09:29:25 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <armbru@redhat.com>) id 1tNYZM-0000vj-M1
for qemu-devel@nongnu.org; Tue, 17 Dec 2024 09:29:07 -0500
Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <armbru@redhat.com>) id 1tNYZJ-0004w2-Ka
for qemu-devel@nongnu.org; Tue, 17 Dec 2024 09:29:04 -0500
Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com
(ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by
relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,
cipher=TLS_AES_256_GCM_SHA384) id us-mta-480-_zaxj_DqOSawzgr3-0zgrw-1; Tue,
17 Dec 2024 09:28:58 -0500
Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com
(mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest
SHA256)
(No client certificate requested)
by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS
id D851719560BE; Tue, 17 Dec 2024 14:28:57 +0000 (UTC)
Received: from blackfin.pond.sub.org (unknown [10.39.192.27])
by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with
ESMTPS
id 5D8121955F57; Tue, 17 Dec 2024 14:28:57 +0000 (UTC)
Received: by blackfin.pond.sub.org (Postfix, from userid 1000)
id 1074321E6609; Tue, 17 Dec 2024 15:28:55 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1734445740;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=dvzZP7QmtJuluCF9JaneWnfZ4YDe/Y5SkuUa8w/tnME=;
b=HW7Bt8ssnaiCushdg30QMvO0BXEe6pHIPy/o1wC+FMAn+VRTlYwJihBsfKUtgA2gpRd+th
6aXEJJOg31Zr6ZBbq9Gzk5/2+f1DUHR6FK0SvHAk1cvxLPpYj+TBpvzacTklkyarHYzJS/
YAjvywsN1fB28aY98HFgvyRRC64JI/g=
X-MC-Unique: _zaxj_DqOSawzgr3-0zgrw-1
X-Mimecast-MFC-AGG-ID: _zaxj_DqOSawzgr3-0zgrw
From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: pbonzini@redhat.com,
berrange@redhat.com,
eduardo@habkost.net
Subject: [PATCH 3/6] qdev: Rename PropertyInfo member @name to @type
Date: Tue, 17 Dec 2024 15:28:51 +0100
Message-ID: <20241217142855.3805068-4-armbru@redhat.com>
In-Reply-To: <20241217142855.3805068-1-armbru@redhat.com>
References: <20241217142855.3805068-1-armbru@redhat.com>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com;
helo=us-smtp-delivery-124.mimecast.com
X-Spam_score_int: -31
X-Spam_score: -3.2
X-Spam_bar: ---
X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001,
DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1.116,
RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001,
RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001,
SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @redhat.com)
X-ZM-MESSAGEID: 1734445771060116600
Content-Type: text/plain; charset="utf-8"
PropertyInfo member @name becomes ObjectProperty member @type, while
Property member @name becomes ObjectProperty member @name. Rename the
former.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
include/hw/qdev-properties.h | 2 +-
backends/tpm/tpm_util.c | 2 +-
hw/block/xen-block.c | 2 +-
hw/core/qdev-properties-system.c | 48 ++++++++++++++++----------------
hw/core/qdev-properties.c | 36 ++++++++++++------------
hw/misc/xlnx-versal-trng.c | 2 +-
hw/nvme/nguid.c | 2 +-
hw/nvram/xlnx-bbram.c | 2 +-
hw/nvram/xlnx-efuse.c | 2 +-
hw/pci/pci.c | 2 +-
hw/s390x/ccw-device.c | 2 +-
hw/s390x/css.c | 4 +--
hw/s390x/s390-pci-bus.c | 2 +-
hw/vfio/pci-quirks.c | 2 +-
target/riscv/cpu.c | 28 +++++++++----------
target/sparc/cpu.c | 2 +-
16 files changed, 70 insertions(+), 70 deletions(-)
diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h
index 1e7ae2e01a..1a2d34691a 100644
--- a/include/hw/qdev-properties.h
+++ b/include/hw/qdev-properties.h
@@ -30,7 +30,7 @@ struct Property {
};
=20
struct PropertyInfo {
- const char *name;
+ const char *type;
const char *description;
const QEnumLookup *enum_table;
bool realized_set_allowed; /* allow setting property on realized devic=
e */
diff --git a/backends/tpm/tpm_util.c b/backends/tpm/tpm_util.c
index cf138551df..07db518f77 100644
--- a/backends/tpm/tpm_util.c
+++ b/backends/tpm/tpm_util.c
@@ -75,7 +75,7 @@ static void release_tpm(Object *obj, const char *name, vo=
id *opaque)
}
=20
const PropertyInfo qdev_prop_tpm =3D {
- .name =3D "str",
+ .type =3D "str",
.description =3D "ID of a tpm to use as a backend",
.get =3D get_tpm,
.set =3D set_tpm,
diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c
index aed1d5c330..1303c9dcc9 100644
--- a/hw/block/xen-block.c
+++ b/hw/block/xen-block.c
@@ -660,7 +660,7 @@ invalid:
* https://xenbits.xen.org/docs/unstable/man/xen-vbd-interface.7.html
*/
const PropertyInfo xen_block_prop_vdev =3D {
- .name =3D "str",
+ .type =3D "str",
.description =3D "Virtual Disk specifier: d*p*/xvd*/hd*/sd*",
.get =3D xen_block_get_vdev,
.set =3D xen_block_set_vdev,
diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-sys=
tem.c
index 3177678861..b66e6f5c96 100644
--- a/hw/core/qdev-properties-system.c
+++ b/hw/core/qdev-properties-system.c
@@ -235,7 +235,7 @@ static void release_drive(Object *obj, const char *name=
, void *opaque)
}
=20
const PropertyInfo qdev_prop_drive =3D {
- .name =3D "str",
+ .type =3D "str",
.description =3D "Node name or ID of a block device to use as a backen=
d",
.realized_set_allowed =3D true,
.get =3D get_drive,
@@ -244,7 +244,7 @@ const PropertyInfo qdev_prop_drive =3D {
};
=20
const PropertyInfo qdev_prop_drive_iothread =3D {
- .name =3D "str",
+ .type =3D "str",
.description =3D "Node name or ID of a block device to use as a backen=
d",
.realized_set_allowed =3D true,
.get =3D get_drive,
@@ -312,7 +312,7 @@ static void release_chr(Object *obj, const char *name, =
void *opaque)
}
=20
const PropertyInfo qdev_prop_chr =3D {
- .name =3D "str",
+ .type =3D "str",
.description =3D "ID of a chardev to use as a backend",
.get =3D get_chr,
.set =3D set_chr,
@@ -386,7 +386,7 @@ inval:
}
=20
const PropertyInfo qdev_prop_macaddr =3D {
- .name =3D "str",
+ .type =3D "str",
.description =3D "Ethernet 6-byte MAC Address, example: 52:54:00:12:34=
:56",
.get =3D get_mac,
.set =3D set_mac,
@@ -474,7 +474,7 @@ out:
}
=20
const PropertyInfo qdev_prop_netdev =3D {
- .name =3D "str",
+ .type =3D "str",
.description =3D "ID of a netdev to use as a backend",
.get =3D get_netdev,
.set =3D set_netdev,
@@ -512,7 +512,7 @@ static void set_audiodev(Object *obj, Visitor *v, const=
char* name,
}
=20
const PropertyInfo qdev_prop_audiodev =3D {
- .name =3D "str",
+ .type =3D "str",
.description =3D "ID of an audiodev to use as a backend",
/* release done on shutdown */
.get =3D get_audiodev,
@@ -602,7 +602,7 @@ static void qdev_propinfo_set_losttickpolicy(Object *ob=
j, Visitor *v,
QEMU_BUILD_BUG_ON(sizeof(LostTickPolicy) !=3D sizeof(int));
=20
const PropertyInfo qdev_prop_losttickpolicy =3D {
- .name =3D "LostTickPolicy",
+ .type =3D "LostTickPolicy",
.enum_table =3D &LostTickPolicy_lookup,
.get =3D qdev_propinfo_get_enum,
.set =3D qdev_propinfo_set_losttickpolicy,
@@ -628,7 +628,7 @@ static void set_blocksize(Object *obj, Visitor *v, cons=
t char *name,
}
=20
const PropertyInfo qdev_prop_blocksize =3D {
- .name =3D "size",
+ .type =3D "size",
.description =3D "A power of two between " MIN_BLOCK_SIZE_STR
" and " MAX_BLOCK_SIZE_STR,
.get =3D qdev_propinfo_get_size32,
@@ -641,7 +641,7 @@ const PropertyInfo qdev_prop_blocksize =3D {
QEMU_BUILD_BUG_ON(sizeof(BlockdevOnError) !=3D sizeof(int));
=20
const PropertyInfo qdev_prop_blockdev_on_error =3D {
- .name =3D "BlockdevOnError",
+ .type =3D "BlockdevOnError",
.description =3D "Error handling policy, "
"report/ignore/enospc/stop/auto",
.enum_table =3D &BlockdevOnError_lookup,
@@ -655,7 +655,7 @@ const PropertyInfo qdev_prop_blockdev_on_error =3D {
QEMU_BUILD_BUG_ON(sizeof(BiosAtaTranslation) !=3D sizeof(int));
=20
const PropertyInfo qdev_prop_bios_chs_trans =3D {
- .name =3D "BiosAtaTranslation",
+ .type =3D "BiosAtaTranslation",
.description =3D "Logical CHS translation algorithm, "
"auto/none/lba/large/rechs",
.enum_table =3D &BiosAtaTranslation_lookup,
@@ -667,7 +667,7 @@ const PropertyInfo qdev_prop_bios_chs_trans =3D {
/* --- FDC default drive types */
=20
const PropertyInfo qdev_prop_fdc_drive_type =3D {
- .name =3D "FdcDriveType",
+ .type =3D "FdcDriveType",
.description =3D "FDC drive type, "
"144/288/120/none/auto",
.enum_table =3D &FloppyDriveType_lookup,
@@ -679,7 +679,7 @@ const PropertyInfo qdev_prop_fdc_drive_type =3D {
/* --- MultiFDCompression --- */
=20
const PropertyInfo qdev_prop_multifd_compression =3D {
- .name =3D "MultiFDCompression",
+ .type =3D "MultiFDCompression",
.description =3D "multifd_compression values, "
"none/zlib/zstd/qpl/uadk/qatzip",
.enum_table =3D &MultiFDCompression_lookup,
@@ -693,7 +693,7 @@ const PropertyInfo qdev_prop_multifd_compression =3D {
QEMU_BUILD_BUG_ON(sizeof(MigMode) !=3D sizeof(int));
=20
const PropertyInfo qdev_prop_mig_mode =3D {
- .name =3D "MigMode",
+ .type =3D "MigMode",
.description =3D "mig_mode values, "
"normal,cpr-reboot",
.enum_table =3D &MigMode_lookup,
@@ -707,7 +707,7 @@ const PropertyInfo qdev_prop_mig_mode =3D {
QEMU_BUILD_BUG_ON(sizeof(GranuleMode) !=3D sizeof(int));
=20
const PropertyInfo qdev_prop_granule_mode =3D {
- .name =3D "GranuleMode",
+ .type =3D "GranuleMode",
.description =3D "granule_mode values, "
"4k, 8k, 16k, 64k, host",
.enum_table =3D &GranuleMode_lookup,
@@ -717,7 +717,7 @@ const PropertyInfo qdev_prop_granule_mode =3D {
};
=20
const PropertyInfo qdev_prop_zero_page_detection =3D {
- .name =3D "ZeroPageDetection",
+ .type =3D "ZeroPageDetection",
.description =3D "zero_page_detection values, "
"none,legacy,multifd",
.enum_table =3D &ZeroPageDetection_lookup,
@@ -801,7 +801,7 @@ out:
}
=20
const PropertyInfo qdev_prop_reserved_region =3D {
- .name =3D "reserved_region",
+ .type =3D "reserved_region",
.description =3D "Reserved Region, example: 0xFEE00000:0xFEEFFFFF:0",
.get =3D get_reserved_region,
.set =3D set_reserved_region,
@@ -882,7 +882,7 @@ static int print_pci_devfn(Object *obj, Property *prop,=
char *dest,
}
=20
const PropertyInfo qdev_prop_pci_devfn =3D {
- .name =3D "str",
+ .type =3D "str",
.description =3D "Slot and optional function number, example: 06.0 or =
06",
.print =3D print_pci_devfn,
.get =3D qdev_propinfo_get_int32,
@@ -988,7 +988,7 @@ inval:
}
=20
const PropertyInfo qdev_prop_pci_host_devaddr =3D {
- .name =3D "str",
+ .type =3D "str",
.description =3D "Address (bus/device/function) of "
"the host device, example: 04:10.0",
.get =3D get_pci_host_devaddr,
@@ -998,7 +998,7 @@ const PropertyInfo qdev_prop_pci_host_devaddr =3D {
/* --- OffAutoPCIBAR off/auto/bar0/bar1/bar2/bar3/bar4/bar5 --- */
=20
const PropertyInfo qdev_prop_off_auto_pcibar =3D {
- .name =3D "OffAutoPCIBAR",
+ .type =3D "OffAutoPCIBAR",
.description =3D "off/auto/bar0/bar1/bar2/bar3/bar4/bar5",
.enum_table =3D &OffAutoPCIBAR_lookup,
.get =3D qdev_propinfo_get_enum,
@@ -1080,7 +1080,7 @@ static void set_prop_pcielinkspeed(Object *obj, Visit=
or *v, const char *name,
}
=20
const PropertyInfo qdev_prop_pcie_link_speed =3D {
- .name =3D "PCIELinkSpeed",
+ .type =3D "PCIELinkSpeed",
.description =3D "2_5/5/8/16/32/64",
.enum_table =3D &PCIELinkSpeed_lookup,
.get =3D get_prop_pcielinkspeed,
@@ -1168,7 +1168,7 @@ static void set_prop_pcielinkwidth(Object *obj, Visit=
or *v, const char *name,
}
=20
const PropertyInfo qdev_prop_pcie_link_width =3D {
- .name =3D "PCIELinkWidth",
+ .type =3D "PCIELinkWidth",
.description =3D "1/2/4/8/12/16/32",
.enum_table =3D &PCIELinkWidth_lookup,
.get =3D get_prop_pcielinkwidth,
@@ -1218,7 +1218,7 @@ static void set_default_uuid_auto(ObjectProperty *op,=
const Property *prop)
}
=20
const PropertyInfo qdev_prop_uuid =3D {
- .name =3D "str",
+ .type =3D "str",
.description =3D "UUID (aka GUID) or \"" UUID_VALUE_AUTO
"\" for random value (default)",
.get =3D get_uuid,
@@ -1231,7 +1231,7 @@ const PropertyInfo qdev_prop_uuid =3D {
QEMU_BUILD_BUG_ON(sizeof(S390CpuEntitlement) !=3D sizeof(int));
=20
const PropertyInfo qdev_prop_cpus390entitlement =3D {
- .name =3D "S390CpuEntitlement",
+ .type =3D "S390CpuEntitlement",
.description =3D "low/medium (default)/high",
.enum_table =3D &S390CpuEntitlement_lookup,
.get =3D qdev_propinfo_get_enum,
@@ -1276,7 +1276,7 @@ static void release_iothread_vq_mapping_list(Object *=
obj,
}
=20
const PropertyInfo qdev_prop_iothread_vq_mapping_list =3D {
- .name =3D "IOThreadVirtQueueMappingList",
+ .type =3D "IOThreadVirtQueueMappingList",
.description =3D "IOThread virtqueue mapping list [{\"iothread\":\"<id=
>\", "
"\"vqs\":[1,2,3,...]},...]",
.get =3D get_iothread_vq_mapping_list,
diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index cfd8abb2f9..67b17848b8 100644
--- a/hw/core/qdev-properties.c
+++ b/hw/core/qdev-properties.c
@@ -169,7 +169,7 @@ static void set_default_value_bool(ObjectProperty *op, =
const Property *prop)
}
=20
const PropertyInfo qdev_prop_bit =3D {
- .name =3D "bool",
+ .type =3D "bool",
.description =3D "on/off",
.get =3D prop_get_bit,
.set =3D prop_set_bit,
@@ -218,7 +218,7 @@ static void prop_set_bit64(Object *obj, Visitor *v, con=
st char *name,
}
=20
const PropertyInfo qdev_prop_bit64 =3D {
- .name =3D "bool",
+ .type =3D "bool",
.description =3D "on/off",
.get =3D prop_get_bit64,
.set =3D prop_set_bit64,
@@ -246,7 +246,7 @@ static void set_bool(Object *obj, Visitor *v, const cha=
r *name, void *opaque,
}
=20
const PropertyInfo qdev_prop_bool =3D {
- .name =3D "bool",
+ .type =3D "bool",
.get =3D get_bool,
.set =3D set_bool,
.set_default_value =3D set_default_value_bool,
@@ -285,7 +285,7 @@ void qdev_propinfo_set_default_value_uint(ObjectPropert=
y *op,
}
=20
const PropertyInfo qdev_prop_uint8 =3D {
- .name =3D "uint8",
+ .type =3D "uint8",
.get =3D get_uint8,
.set =3D set_uint8,
.set_default_value =3D qdev_propinfo_set_default_value_uint,
@@ -312,7 +312,7 @@ static void set_uint16(Object *obj, Visitor *v, const c=
har *name,
}
=20
const PropertyInfo qdev_prop_uint16 =3D {
- .name =3D "uint16",
+ .type =3D "uint16",
.get =3D get_uint16,
.set =3D set_uint16,
.set_default_value =3D qdev_propinfo_set_default_value_uint,
@@ -357,14 +357,14 @@ static void set_int32(Object *obj, Visitor *v, const =
char *name, void *opaque,
}
=20
const PropertyInfo qdev_prop_uint32 =3D {
- .name =3D "uint32",
+ .type =3D "uint32",
.get =3D get_uint32,
.set =3D set_uint32,
.set_default_value =3D qdev_propinfo_set_default_value_uint,
};
=20
const PropertyInfo qdev_prop_int32 =3D {
- .name =3D "int32",
+ .type =3D "int32",
.get =3D qdev_propinfo_get_int32,
.set =3D set_int32,
.set_default_value =3D qdev_propinfo_set_default_value_int,
@@ -409,14 +409,14 @@ static void set_int64(Object *obj, Visitor *v, const =
char *name,
}
=20
const PropertyInfo qdev_prop_uint64 =3D {
- .name =3D "uint64",
+ .type =3D "uint64",
.get =3D get_uint64,
.set =3D set_uint64,
.set_default_value =3D qdev_propinfo_set_default_value_uint,
};
=20
const PropertyInfo qdev_prop_int64 =3D {
- .name =3D "int64",
+ .type =3D "int64",
.get =3D get_int64,
.set =3D set_int64,
.set_default_value =3D qdev_propinfo_set_default_value_int,
@@ -436,7 +436,7 @@ static void set_uint64_checkmask(Object *obj, Visitor *=
v, const char *name,
}
=20
const PropertyInfo qdev_prop_uint64_checkmask =3D {
- .name =3D "uint64",
+ .type =3D "uint64",
.get =3D get_uint64,
.set =3D set_uint64_checkmask,
};
@@ -478,7 +478,7 @@ static void set_string(Object *obj, Visitor *v, const c=
har *name,
}
=20
const PropertyInfo qdev_prop_string =3D {
- .name =3D "str",
+ .type =3D "str",
.release =3D release_string,
.get =3D get_string,
.set =3D set_string,
@@ -487,7 +487,7 @@ const PropertyInfo qdev_prop_string =3D {
/* --- on/off/auto --- */
=20
const PropertyInfo qdev_prop_on_off_auto =3D {
- .name =3D "OnOffAuto",
+ .type =3D "OnOffAuto",
.description =3D "on/off/auto",
.enum_table =3D &OnOffAuto_lookup,
.get =3D qdev_propinfo_get_enum,
@@ -530,7 +530,7 @@ static void set_size32(Object *obj, Visitor *v, const c=
har *name, void *opaque,
}
=20
const PropertyInfo qdev_prop_size32 =3D {
- .name =3D "size",
+ .type =3D "size",
.get =3D qdev_propinfo_get_size32,
.set =3D set_size32,
.set_default_value =3D qdev_propinfo_set_default_value_uint,
@@ -733,7 +733,7 @@ static void default_prop_array(ObjectProperty *op, cons=
t Property *prop)
}
=20
const PropertyInfo qdev_prop_array =3D {
- .name =3D "list",
+ .type =3D "list",
.get =3D get_prop_array,
.set =3D set_prop_array,
.release =3D release_prop_array,
@@ -940,7 +940,7 @@ static void set_size(Object *obj, Visitor *v, const cha=
r *name, void *opaque,
}
=20
const PropertyInfo qdev_prop_size =3D {
- .name =3D "size",
+ .type =3D "size",
.get =3D get_size,
.set =3D set_size,
.set_default_value =3D qdev_propinfo_set_default_value_uint,
@@ -958,7 +958,7 @@ static ObjectProperty *create_link_property(ObjectClass=
*oc, const char *name,
}
=20
const PropertyInfo qdev_prop_link =3D {
- .name =3D "link",
+ .type =3D "link",
.create =3D create_link_property,
};
=20
@@ -969,7 +969,7 @@ void qdev_property_add_static(DeviceState *dev, const P=
roperty *prop)
=20
assert(!prop->info->create);
=20
- op =3D object_property_add(obj, prop->name, prop->info->name,
+ op =3D object_property_add(obj, prop->name, prop->info->type,
field_prop_getter(prop->info),
field_prop_setter(prop->info),
prop->info->release,
@@ -996,7 +996,7 @@ static void qdev_class_add_property(DeviceClass *klass,=
const char *name,
op =3D prop->info->create(oc, name, prop);
} else {
op =3D object_class_property_add(oc,
- name, prop->info->name,
+ name, prop->info->type,
field_prop_getter(prop->info),
field_prop_setter(prop->info),
prop->info->release,
diff --git a/hw/misc/xlnx-versal-trng.c b/hw/misc/xlnx-versal-trng.c
index 86905479b8..f989afd325 100644
--- a/hw/misc/xlnx-versal-trng.c
+++ b/hw/misc/xlnx-versal-trng.c
@@ -652,7 +652,7 @@ static void trng_prop_fault_event_set(Object *obj, Visi=
tor *v,
}
=20
static const PropertyInfo trng_prop_fault_events =3D {
- .name =3D "uint32:bits",
+ .type =3D "uint32:bits",
.description =3D "Set to trigger TRNG fault events",
.set =3D trng_prop_fault_event_set,
.realized_set_allowed =3D true,
diff --git a/hw/nvme/nguid.c b/hw/nvme/nguid.c
index 829832bd9f..6097a8b297 100644
--- a/hw/nvme/nguid.c
+++ b/hw/nvme/nguid.c
@@ -179,7 +179,7 @@ static void set_nguid(Object *obj, Visitor *v, const ch=
ar *name, void *opaque,
}
=20
const PropertyInfo qdev_prop_nguid =3D {
- .name =3D "str",
+ .type =3D "str",
.description =3D
"NGUID or \"" NGUID_VALUE_AUTO "\" for random value",
.get =3D get_nguid,
diff --git a/hw/nvram/xlnx-bbram.c b/hw/nvram/xlnx-bbram.c
index 1bc58e90ad..89013ae05f 100644
--- a/hw/nvram/xlnx-bbram.c
+++ b/hw/nvram/xlnx-bbram.c
@@ -502,7 +502,7 @@ static void bbram_prop_release_drive(Object *obj, const=
char *name,
}
=20
static const PropertyInfo bbram_prop_drive =3D {
- .name =3D "str",
+ .type =3D "str",
.description =3D "Node name or ID of a block device to use as BBRAM ba=
ckend",
.realized_set_allowed =3D true,
.get =3D bbram_prop_get_drive,
diff --git a/hw/nvram/xlnx-efuse.c b/hw/nvram/xlnx-efuse.c
index f7b849f7de..47be998d59 100644
--- a/hw/nvram/xlnx-efuse.c
+++ b/hw/nvram/xlnx-efuse.c
@@ -257,7 +257,7 @@ static void efuse_prop_release_drive(Object *obj, const=
char *name,
}
=20
static const PropertyInfo efuse_prop_drive =3D {
- .name =3D "str",
+ .type =3D "str",
.description =3D "Node name or ID of a block device to use as eFUSE ba=
ckend",
.realized_set_allowed =3D true,
.get =3D efuse_prop_get_drive,
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 1416ae202c..d436376f00 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -76,7 +76,7 @@ static void prop_pci_busnr_get(Object *obj, Visitor *v, c=
onst char *name,
}
=20
static const PropertyInfo prop_pci_busnr =3D {
- .name =3D "busnr",
+ .type =3D "busnr",
.get =3D prop_pci_busnr_get,
};
=20
diff --git a/hw/s390x/ccw-device.c b/hw/s390x/ccw-device.c
index 30f2fb486f..5e789e6637 100644
--- a/hw/s390x/ccw-device.c
+++ b/hw/s390x/ccw-device.c
@@ -74,7 +74,7 @@ static void ccw_device_set_loadparm(Object *obj, Visitor =
*v,
}
=20
const PropertyInfo ccw_loadparm =3D {
- .name =3D "ccw_loadparm",
+ .type =3D "ccw_loadparm",
.description =3D "Up to 8 chars in set of [A-Za-z0-9. ] to pass"
" to the guest loader/kernel",
.get =3D ccw_device_get_loadparm,
diff --git a/hw/s390x/css.c b/hw/s390x/css.c
index b2d5327dbf..7c6fc4e56f 100644
--- a/hw/s390x/css.c
+++ b/hw/s390x/css.c
@@ -2523,7 +2523,7 @@ out:
}
=20
const PropertyInfo css_devid_propinfo =3D {
- .name =3D "str",
+ .type =3D "str",
.description =3D "Identifier of an I/O device in the channel "
"subsystem, example: fe.1.23ab",
.get =3D get_css_devid,
@@ -2531,7 +2531,7 @@ const PropertyInfo css_devid_propinfo =3D {
};
=20
const PropertyInfo css_devid_ro_propinfo =3D {
- .name =3D "str",
+ .type =3D "str",
.description =3D "Read-only identifier of an I/O device in the channel=
"
"subsystem, example: fe.1.23ab",
.get =3D get_css_devid,
diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c
index 40b2567aa7..0bf01140b3 100644
--- a/hw/s390x/s390-pci-bus.c
+++ b/hw/s390x/s390-pci-bus.c
@@ -1473,7 +1473,7 @@ static void s390_pci_set_fid(Object *obj, Visitor *v,=
const char *name,
}
=20
static const PropertyInfo s390_pci_fid_propinfo =3D {
- .name =3D "zpci_fid",
+ .type =3D "zpci_fid",
.get =3D s390_pci_get_fid,
.set =3D s390_pci_set_fid,
};
diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c
index d37f722cce..675184648a 100644
--- a/hw/vfio/pci-quirks.c
+++ b/hw/vfio/pci-quirks.c
@@ -1525,7 +1525,7 @@ static void set_nv_gpudirect_clique_id(Object *obj, V=
isitor *v,
}
=20
const PropertyInfo qdev_prop_nv_gpudirect_clique =3D {
- .name =3D "uint4",
+ .type =3D "uint4",
.description =3D "NVIDIA GPUDirect Clique ID (0 - 15)",
.get =3D get_nv_gpudirect_clique_id,
.set =3D set_nv_gpudirect_clique_id,
diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c
index f219f0c3b5..b325fe9ca8 100644
--- a/target/riscv/cpu.c
+++ b/target/riscv/cpu.c
@@ -1680,7 +1680,7 @@ static void prop_pmu_num_get(Object *obj, Visitor *v,=
const char *name,
}
=20
static const PropertyInfo prop_pmu_num =3D {
- .name =3D "pmu-num",
+ .type =3D "pmu-num",
.get =3D prop_pmu_num_get,
.set =3D prop_pmu_num_set,
};
@@ -1721,7 +1721,7 @@ static void prop_pmu_mask_get(Object *obj, Visitor *v=
, const char *name,
}
=20
static const PropertyInfo prop_pmu_mask =3D {
- .name =3D "pmu-mask",
+ .type =3D "pmu-mask",
.get =3D prop_pmu_mask_get,
.set =3D prop_pmu_mask_set,
};
@@ -1752,7 +1752,7 @@ static void prop_mmu_get(Object *obj, Visitor *v, con=
st char *name,
}
=20
static const PropertyInfo prop_mmu =3D {
- .name =3D "mmu",
+ .type =3D "mmu",
.get =3D prop_mmu_get,
.set =3D prop_mmu_set,
};
@@ -1783,7 +1783,7 @@ static void prop_pmp_get(Object *obj, Visitor *v, con=
st char *name,
}
=20
static const PropertyInfo prop_pmp =3D {
- .name =3D "pmp",
+ .type =3D "pmp",
.get =3D prop_pmp_get,
.set =3D prop_pmp_set,
};
@@ -1857,7 +1857,7 @@ static void prop_priv_spec_get(Object *obj, Visitor *=
v, const char *name,
}
=20
static const PropertyInfo prop_priv_spec =3D {
- .name =3D "priv_spec",
+ .type =3D "priv_spec",
.get =3D prop_priv_spec_get,
.set =3D prop_priv_spec_set,
};
@@ -1888,7 +1888,7 @@ static void prop_vext_spec_get(Object *obj, Visitor *=
v, const char *name,
}
=20
static const PropertyInfo prop_vext_spec =3D {
- .name =3D "vext_spec",
+ .type =3D "vext_spec",
.get =3D prop_vext_spec_get,
.set =3D prop_vext_spec_set,
};
@@ -1928,7 +1928,7 @@ static void prop_vlen_get(Object *obj, Visitor *v, co=
nst char *name,
}
=20
static const PropertyInfo prop_vlen =3D {
- .name =3D "vlen",
+ .type =3D "vlen",
.get =3D prop_vlen_get,
.set =3D prop_vlen_set,
};
@@ -1968,7 +1968,7 @@ static void prop_elen_get(Object *obj, Visitor *v, co=
nst char *name,
}
=20
static const PropertyInfo prop_elen =3D {
- .name =3D "elen",
+ .type =3D "elen",
.get =3D prop_elen_get,
.set =3D prop_elen_set,
};
@@ -2003,7 +2003,7 @@ static void prop_cbom_blksize_get(Object *obj, Visito=
r *v, const char *name,
}
=20
static const PropertyInfo prop_cbom_blksize =3D {
- .name =3D "cbom_blocksize",
+ .type =3D "cbom_blocksize",
.get =3D prop_cbom_blksize_get,
.set =3D prop_cbom_blksize_set,
};
@@ -2038,7 +2038,7 @@ static void prop_cbop_blksize_get(Object *obj, Visito=
r *v, const char *name,
}
=20
static const PropertyInfo prop_cbop_blksize =3D {
- .name =3D "cbop_blocksize",
+ .type =3D "cbop_blocksize",
.get =3D prop_cbop_blksize_get,
.set =3D prop_cbop_blksize_set,
};
@@ -2073,7 +2073,7 @@ static void prop_cboz_blksize_get(Object *obj, Visito=
r *v, const char *name,
}
=20
static const PropertyInfo prop_cboz_blksize =3D {
- .name =3D "cboz_blocksize",
+ .type =3D "cboz_blocksize",
.get =3D prop_cboz_blksize_get,
.set =3D prop_cboz_blksize_set,
};
@@ -2108,7 +2108,7 @@ static void prop_mvendorid_get(Object *obj, Visitor *=
v, const char *name,
}
=20
static const PropertyInfo prop_mvendorid =3D {
- .name =3D "mvendorid",
+ .type =3D "mvendorid",
.get =3D prop_mvendorid_get,
.set =3D prop_mvendorid_set,
};
@@ -2143,7 +2143,7 @@ static void prop_mimpid_get(Object *obj, Visitor *v, =
const char *name,
}
=20
static const PropertyInfo prop_mimpid =3D {
- .name =3D "mimpid",
+ .type =3D "mimpid",
.get =3D prop_mimpid_get,
.set =3D prop_mimpid_set,
};
@@ -2199,7 +2199,7 @@ static void prop_marchid_get(Object *obj, Visitor *v,=
const char *name,
}
=20
static const PropertyInfo prop_marchid =3D {
- .name =3D "marchid",
+ .type =3D "marchid",
.get =3D prop_marchid_get,
.set =3D prop_marchid_set,
};
diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c
index dd7af86de7..c3572b8a57 100644
--- a/target/sparc/cpu.c
+++ b/target/sparc/cpu.c
@@ -869,7 +869,7 @@ static void sparc_set_nwindows(Object *obj, Visitor *v,=
const char *name,
}
=20
static PropertyInfo qdev_prop_nwindows =3D {
- .name =3D "int",
+ .type =3D "int",
.get =3D sparc_get_nwindows,
.set =3D sparc_set_nwindows,
};
--=20
2.47.0