On 9/4/26 3:58 PM, Marc-André Lureau wrote:
Convert the remaining PropertyInfo definitions outside hw/
After this patch, all PropertyInfo definitions have .qapi_type set,
except qdev_prop_link (uses .create) and qdev_prop_array (refactored
in the next patches).
Signed-off-by: Marc-André Lureau <[email protected]>
Reviewed-by: Stefan Berger <[email protected]>
---
backends/spdm-socket.c | 4 ++--
backends/tpm/tpm_util.c | 3 ++-
migration/options.c | 4 +++-
target/sparc/cpu.c | 3 ++-
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/backends/spdm-socket.c b/backends/spdm-socket.c
index 826efc276dcd..4a4307975965 100644
--- a/backends/spdm-socket.c
+++ b/backends/spdm-socket.c
@@ -17,6 +17,7 @@
#include "hw/core/qdev-properties.h"
#include "hw/core/qdev-properties-system.h"
#include "hw/core/qdev-prop-internal.h"
+#include "qapi/qapi-type-infos-sockets.h"
static bool read_bytes(const int socket, uint8_t *buffer,
size_t number_of_bytes)
@@ -253,9 +254,8 @@ void spdm_socket_close(const int socket, SpdmTransportType
transport_type)
}
const PropertyInfo qdev_prop_spdm_trans = {
- .type = "SpdmTransportType",
+ .qapi_type = &SpdmTransportType_type_info,
.description = "Spdm Transport, doe/nvme/mctp/scsi/unspecified",
- .enum_table = &SpdmTransportType_lookup,
.get = qdev_propinfo_get_enum,
.set = qdev_propinfo_set_enum,
.set_default_value = qdev_propinfo_set_default_value_enum,
diff --git a/backends/tpm/tpm_util.c b/backends/tpm/tpm_util.c
index 264bff22a91a..ecbc771baa6f 100644
--- a/backends/tpm/tpm_util.c
+++ b/backends/tpm/tpm_util.c
@@ -30,6 +30,7 @@
#include "system/tpm_backend.h"
#include "system/tpm_util.h"
#include "trace.h"
+#include "qapi/qapi-builtin-type-infos.h"
/* tpm backend property */
@@ -77,7 +78,7 @@ static void release_tpm(Object *obj, const char *name, void *opaque)
}
const PropertyInfo qdev_prop_tpm = {
- .type = "str",
+ .qapi_type = &str_type_info,
.description = "ID of a tpm to use as a backend",
.get = get_tpm,
.set = set_tpm,
diff --git a/migration/options.c b/migration/options.c
index d2575edb6cbe..78d4d4818514 100644
--- a/migration/options.c
+++ b/migration/options.c
@@ -31,6 +31,8 @@
#include "ram.h"
#include "options.h"
#include "system/kvm.h"
+#include "qapi/qapi-builtin-type-infos.h"
+#include "qapi/qapi-type-infos-common.h"
/* Maximum migrate downtime set to 2000 seconds */
#define MAX_MIGRATE_DOWNTIME_SECONDS 2000
@@ -287,7 +289,7 @@ static void set_default_value_tls_opt(ObjectProperty *op,
const Property *prop)
* TYPE_MIGRATION's TLS options.
*/
const PropertyInfo qdev_prop_StrOrNull = {
- .type = "StrOrNull",
+ .qapi_type = &StrOrNull_type_info,
.get = get_StrOrNull,
.set = set_StrOrNull,
.release = release_StrOrNull,
diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c
index ae9bdca9df82..d0354a4d02af 100644
--- a/target/sparc/cpu.c
+++ b/target/sparc/cpu.c
@@ -30,6 +30,7 @@
#include "tcg/tcg.h"
#include "fpu/softfloat.h"
#include "target/sparc/translate.h"
+#include "qapi/qapi-builtin-type-infos.h"
//#define DEBUG_FEATURES
@@ -948,7 +949,7 @@ static void sparc_set_nwindows(Object *obj, Visitor *v, const char *name,
}
static const PropertyInfo qdev_prop_nwindows = {
- .type = "int",
+ .qapi_type = &int_type_info,
.description = "Number of register windows",
.get = sparc_get_nwindows,
.set = sparc_set_nwindows,
