* [PATCH v7 01/65] qapi/schema: Rename .lookup_entity() and tighten return type
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
@ 2026-10-20 10:45 ` marcandre.lureau
2026-10-20 10:45 ` [PATCH v7 02/65] qapi: Ease access to introspection names marcandre.lureau
` (63 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: marcandre.lureau @ 2026-10-20 10:45 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
From: Markus Armbruster <armbru@redhat.com>
Commit 060b5a9323 (qapi: Dumb down QAPISchema.lookup_entity())
accidentally relaxed QAPISchema.lookup_entity()'s return type to
QAPISchemaEntity. Tighten it back to QAPISchemaDefinition, and rename
the method to .lookup_defn().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
docs/sphinx/qapidoc.py | 2 +-
scripts/qapi/schema.py | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/docs/sphinx/qapidoc.py b/docs/sphinx/qapidoc.py
index 54a32e45f7ed..31d09ed6343e 100644
--- a/docs/sphinx/qapidoc.py
+++ b/docs/sphinx/qapidoc.py
@@ -512,7 +512,7 @@ def transmogrify(self, schema: QAPISchema) -> nodes.Element:
modules.add(module_source)
if doc.symbol:
- ent = schema.lookup_entity(doc.symbol)
+ ent = schema.lookup_defn(doc.symbol)
assert isinstance(ent, QAPISchemaDefinition)
vis.visit_entity(ent)
else:
diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py
index 8d88b40de2e1..9c9e257a8fd5 100644
--- a/scripts/qapi/schema.py
+++ b/scripts/qapi/schema.py
@@ -1184,11 +1184,11 @@ def _def_definition(self, defn: QAPISchemaDefinition) -> None:
defn.info, "%s is already defined" % other_defn.describe())
self._entity_dict[defn.name] = defn
- def lookup_entity(self, name: str) -> Optional[QAPISchemaEntity]:
+ def lookup_defn(self, name: str) -> Optional[QAPISchemaDefinition]:
return self._entity_dict.get(name)
def lookup_type(self, name: str) -> Optional[QAPISchemaType]:
- typ = self.lookup_entity(name)
+ typ = self.lookup_defn(name)
if isinstance(typ, QAPISchemaType):
return typ
return None
@@ -1324,7 +1324,7 @@ def _make_implicit_object_type(
return None
# See also QAPISchemaObjectTypeMember.describe()
name = 'q_obj_%s-%s' % (name, role)
- typ = self.lookup_entity(name)
+ typ = self.lookup_defn(name)
if typ:
assert isinstance(typ, QAPISchemaObjectType)
# The implicit object type has multiple users. This can
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 02/65] qapi: Ease access to introspection names
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
2026-10-20 10:45 ` [PATCH v7 01/65] qapi/schema: Rename .lookup_entity() and tighten return type marcandre.lureau
@ 2026-10-20 10:45 ` marcandre.lureau
2026-10-20 10:45 ` [PATCH v7 03/65] qapi/introspect: Simplify masked name comment emission slighly marcandre.lureau
` (62 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: marcandre.lureau @ 2026-10-20 10:45 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
From: Markus Armbruster <armbru@redhat.com>
query-qmp-schema masks type names, because they are not part of the
external interface. Marc-André Lureau would like to also use them
with qom-list & friends. Trouble is the masked names are buried deep
in QAPISchemaGenIntrospectVisitor. Lift them into schema.py: new
QAPISchemaDefinition method introspection_name() returns a
definition's name for use in introspection.
This changes the masked names, which is fine.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
scripts/qapi/introspect.py | 23 ++++-------------------
scripts/qapi/schema.py | 43 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 47 insertions(+), 19 deletions(-)
diff --git a/scripts/qapi/introspect.py b/scripts/qapi/introspect.py
index 7e28de2279ad..644461560c64 100644
--- a/scripts/qapi/introspect.py
+++ b/scripts/qapi/introspect.py
@@ -30,7 +30,6 @@
QAPISchemaAlternatives,
QAPISchemaArrayType,
QAPISchemaBranches,
- QAPISchemaBuiltinType,
QAPISchemaEntity,
QAPISchemaEnumMember,
QAPISchemaFeature,
@@ -177,7 +176,6 @@ def __init__(self, prefix: str, unmask: bool):
self._schema: Optional[QAPISchema] = None
self._trees: List[Annotated[SchemaInfo]] = []
self._used_types: List[QAPISchemaType] = []
- self._name_map: Dict[str, str] = {}
self._genc.add(mcgen('''
#include "qemu/osdep.h"
#include "%(prefix)sqapi-introspect.h"
@@ -208,18 +206,14 @@ def visit_end(self) -> None:
self._schema = None
self._trees = []
self._used_types = []
- self._name_map = {}
def visit_needed(self, entity: QAPISchemaEntity) -> bool:
# Ignore types on first pass; visit_end() will pick up used types
return not isinstance(entity, QAPISchemaType)
def _name(self, name: str) -> str:
- if self._unmask:
- return name
- if name not in self._name_map:
- self._name_map[name] = '%d' % len(self._name_map)
- return self._name_map[name]
+ assert self._schema
+ return self._schema.definition_introspection_name(name, self._unmask)
def _use_type(self, typ: QAPISchemaType) -> str:
assert self._schema is not None
@@ -237,13 +231,6 @@ def _use_type(self, typ: QAPISchemaType) -> str:
# Add type to work queue if new
if typ not in self._used_types:
self._used_types.append(typ)
- # Clients should examine commands and events, not types. Hide
- # type names as integers to reduce the temptation. Also, it
- # saves a few characters on the wire.
- if isinstance(typ, QAPISchemaBuiltinType):
- return typ.name
- if isinstance(typ, QAPISchemaArrayType):
- return '[' + self._use_type(typ.element_type) + ']'
return self._name(typ.name)
@staticmethod
@@ -271,8 +258,7 @@ def _gen_tree(self, name: str, mtype: str, obj: Dict[str, object],
# Output a comment to make it easy to map masked names
# back to the source when reading the generated output.
comment = f'"{self._name(name)}" = {name}'
- name = self._name(name)
- obj['name'] = name
+ obj['name'] = self._name(name)
obj['meta-type'] = mtype
if features:
obj['features'] = self._gen_features(features)
@@ -327,8 +313,7 @@ def visit_array_type(self, name: str, info: Optional[QAPISourceInfo],
ifcond: QAPISchemaIfCond,
element_type: QAPISchemaType) -> None:
element = self._use_type(element_type)
- self._gen_tree('[' + element + ']', 'array', {'element-type': element},
- ifcond)
+ self._gen_tree(name, 'array', {'element-type': element}, ifcond)
def visit_object_type_flat(self, name: str, info: Optional[QAPISourceInfo],
ifcond: QAPISchemaIfCond,
diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py
index 9c9e257a8fd5..11f3accec873 100644
--- a/scripts/qapi/schema.py
+++ b/scripts/qapi/schema.py
@@ -136,6 +136,13 @@ def __repr__(self) -> str:
def c_name(self) -> str:
return c_name(self.name)
+ def set_ordinal(self, ordinal: int) -> None:
+ pass
+
+ # pylint: disable=unused-argument
+ def introspection_name(self, unmask: bool) -> str:
+ return self.name
+
def check(self, schema: QAPISchema) -> None:
assert not self._checked
super().check(schema)
@@ -323,6 +330,17 @@ def visit(self, visitor: QAPISchemaVisitor) -> None:
class QAPISchemaType(QAPISchemaDefinition, ABC):
+ def __init__(
+ self,
+ name: str,
+ info: Optional[QAPISourceInfo],
+ doc: Optional[QAPIDoc],
+ ifcond: Optional[QAPISchemaIfCond] = None,
+ features: Optional[List[QAPISchemaFeature]] = None,
+ ):
+ super().__init__(name, info, doc, ifcond, features)
+ self._masked_name: Optional[str] = None
+
# Return the C type for common use.
# For the types we commonly box, this is a pointer type.
@abstractmethod
@@ -363,6 +381,17 @@ def need_has_if_optional(self) -> bool:
# Except for arrays; see QAPISchemaArrayType.need_has_if_optional().
return not self.c_type().endswith(POINTER_SUFFIX)
+ def set_ordinal(self, ordinal: int) -> None:
+ assert not self._masked_name
+ self._masked_name = str(ordinal)
+
+ def introspection_name(self, unmask: bool) -> str:
+ # Type names are not part of the external interface. Hide
+ # them in introspection. Also saves a few characters on the
+ # wire.
+ assert self._masked_name
+ return self.name if unmask else self._masked_name
+
def check(self, schema: QAPISchema) -> None:
super().check(schema)
for feat in self.features:
@@ -402,6 +431,11 @@ def json_type(self) -> str:
def doc_type(self) -> str:
return self.json_type()
+ def introspection_name(self, unmask: bool):
+ if self.json_type() == 'int':
+ return 'int'
+ return self.name
+
def visit(self, visitor: QAPISchemaVisitor) -> None:
super().visit(visitor)
visitor.visit_builtin_type(self.name, self.info, self.json_type())
@@ -503,6 +537,9 @@ def doc_type(self) -> Optional[str]:
return None
return 'array of ' + elt_doc_type
+ def introspection_name(self, unmask: bool):
+ return '[' + self.element_type.introspection_name(unmask) + ']'
+
def visit(self, visitor: QAPISchemaVisitor) -> None:
super().visit(visitor)
visitor.visit_array_type(self.name, self.info, self.ifcond,
@@ -1182,6 +1219,7 @@ def _def_definition(self, defn: QAPISchemaDefinition) -> None:
"'%s' is already defined\n%s" % (defn.name, where))
raise QAPISemError(
defn.info, "%s is already defined" % other_defn.describe())
+ defn.set_ordinal(len(self._entity_dict))
self._entity_dict[defn.name] = defn
def lookup_defn(self, name: str) -> Optional[QAPISchemaDefinition]:
@@ -1208,6 +1246,11 @@ def resolve_type(
info, "%s uses unknown type '%s'" % (what, name))
return typ
+ def definition_introspection_name(self, name: str, unmask: bool) -> str:
+ defn = self.lookup_defn(name)
+ assert defn
+ return defn.introspection_name(unmask)
+
def _module_name(self, fname: str) -> str:
if QAPISchemaModule.is_system_module(fname):
return fname
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 03/65] qapi/introspect: Simplify masked name comment emission slighly
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
2026-10-20 10:45 ` [PATCH v7 01/65] qapi/schema: Rename .lookup_entity() and tighten return type marcandre.lureau
2026-10-20 10:45 ` [PATCH v7 02/65] qapi: Ease access to introspection names marcandre.lureau
@ 2026-10-20 10:45 ` marcandre.lureau
2026-10-20 10:45 ` [PATCH v7 04/65] qapi/introspect: Don't elide types marcandre.lureau
` (61 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: marcandre.lureau @ 2026-10-20 10:45 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
From: Markus Armbruster <armbru@redhat.com>
Instead of emitting the comment for certain meta-types, simply emit it
when introspection name and name differ.
This additionally emits it for arrays, which is fine.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
scripts/qapi/introspect.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/scripts/qapi/introspect.py b/scripts/qapi/introspect.py
index 644461560c64..49d1ed2897e8 100644
--- a/scripts/qapi/introspect.py
+++ b/scripts/qapi/introspect.py
@@ -253,12 +253,12 @@ def _gen_tree(self, name: str, mtype: str, obj: Dict[str, object],
Will be omitted from the output if empty.
"""
comment: Optional[str] = None
- if mtype not in ('command', 'event', 'builtin', 'array'):
- if not self._unmask:
- # Output a comment to make it easy to map masked names
- # back to the source when reading the generated output.
- comment = f'"{self._name(name)}" = {name}'
- obj['name'] = self._name(name)
+ introspection_name = self._name(name)
+ if introspection_name != name:
+ # Output a comment to make it easy to map masked names
+ # back to the source when reading the generated output.
+ comment = f'"{introspection_name}" = {name}'
+ obj['name'] = introspection_name
obj['meta-type'] = mtype
if features:
obj['features'] = self._gen_features(features)
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 04/65] qapi/introspect: Don't elide types
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (2 preceding siblings ...)
2026-10-20 10:45 ` [PATCH v7 03/65] qapi/introspect: Simplify masked name comment emission slighly marcandre.lureau
@ 2026-10-20 10:45 ` marcandre.lureau
2026-10-20 10:45 ` [PATCH v7 05/65] qapi: QAPISchemaVisitor.visit_needed() is now unused, drop marcandre.lureau
` (60 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: marcandre.lureau @ 2026-10-20 10:45 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
From: Markus Armbruster <armbru@redhat.com>
query-qmp-schema elides types not reachable from commands and events.
It currently emits 1251 out of 1385 definitions, and elides 134 types.
Whether that's worthwhile is debatable.
Marc-André Lureau would like to make QOM introspection (qom-list &
friends) refer to QAPI types. We additionally need types reachable
from QOM properties.
Unfortunately, the QAPI generator knows nothing about QOM properties.
We could manually mark the QAPI types to elide, or the QAPI types not
to elide even though they are not reachable from commands and events.
Feels very much not worthwhile to me.
We could conservatively approximate "reachable from QOM properties" by
"available for use with QOM properties". These are the built-in and
user-defined types, and their arrays. With that, we'd elide just 38
out of 1385 definitions. Too few to be worthwhile.
Simply emit everything.
Output of query-qmp-schema grows from 247KiB to 274KiB for me.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
docs/devel/qapi-code-gen.rst | 2 --
scripts/qapi/introspect.py | 31 ++++---------------------------
2 files changed, 4 insertions(+), 29 deletions(-)
diff --git a/docs/devel/qapi-code-gen.rst b/docs/devel/qapi-code-gen.rst
index b1cc5b5f0db1..77f08bb68cac 100644
--- a/docs/devel/qapi-code-gen.rst
+++ b/docs/devel/qapi-code-gen.rst
@@ -1250,8 +1250,6 @@ JSON array of strings.
To examine a type, start with a command or event using it, then follow
references by name.
-QAPI schema definitions not reachable that way are omitted.
-
The SchemaInfo for a command has meta-type "command", and variant
members "arg-type", "ret-type" and "allow-oob". On the wire, the
"arguments" member of a client's "execute" command must conform to the
diff --git a/scripts/qapi/introspect.py b/scripts/qapi/introspect.py
index 49d1ed2897e8..15302ecf155a 100644
--- a/scripts/qapi/introspect.py
+++ b/scripts/qapi/introspect.py
@@ -28,9 +28,7 @@
from .schema import (
QAPISchema,
QAPISchemaAlternatives,
- QAPISchemaArrayType,
QAPISchemaBranches,
- QAPISchemaEntity,
QAPISchemaEnumMember,
QAPISchemaFeature,
QAPISchemaIfCond,
@@ -175,7 +173,6 @@ def __init__(self, prefix: str, unmask: bool):
self._unmask = unmask
self._schema: Optional[QAPISchema] = None
self._trees: List[Annotated[SchemaInfo]] = []
- self._used_types: List[QAPISchemaType] = []
self._genc.add(mcgen('''
#include "qemu/osdep.h"
#include "%(prefix)sqapi-introspect.h"
@@ -187,10 +184,6 @@ def visit_begin(self, schema: QAPISchema) -> None:
self._schema = schema
def visit_end(self) -> None:
- # visit the types that are actually used
- for typ in self._used_types:
- typ.visit(self)
- # generate C
name = c_name(self._prefix, protect=False) + 'qmp_schema_qlit'
self._genh.add(mcgen('''
#include "qobject/qlit.h"
@@ -205,32 +198,12 @@ def visit_end(self) -> None:
c_string=_tree_to_qlit(self._trees)))
self._schema = None
self._trees = []
- self._used_types = []
-
- def visit_needed(self, entity: QAPISchemaEntity) -> bool:
- # Ignore types on first pass; visit_end() will pick up used types
- return not isinstance(entity, QAPISchemaType)
def _name(self, name: str) -> str:
assert self._schema
return self._schema.definition_introspection_name(name, self._unmask)
def _use_type(self, typ: QAPISchemaType) -> str:
- assert self._schema is not None
-
- # Map the various integer types to plain int
- if typ.json_type() == 'int':
- type_int = self._schema.lookup_type('int')
- assert type_int
- typ = type_int
- elif (isinstance(typ, QAPISchemaArrayType) and
- typ.element_type.json_type() == 'int'):
- type_intlist = self._schema.lookup_type('intList')
- assert type_intlist
- typ = type_intlist
- # Add type to work queue if new
- if typ not in self._used_types:
- self._used_types.append(typ)
return self._name(typ.name)
@staticmethod
@@ -295,6 +268,8 @@ def _gen_variant(self, variant: QAPISchemaVariant
def visit_builtin_type(self, name: str, info: Optional[QAPISourceInfo],
json_type: str) -> None:
+ if json_type == 'int' and name != 'int':
+ return
self._gen_tree(name, 'builtin', {'json-type': json_type})
def visit_enum_type(self, name: str, info: Optional[QAPISourceInfo],
@@ -312,6 +287,8 @@ def visit_enum_type(self, name: str, info: Optional[QAPISourceInfo],
def visit_array_type(self, name: str, info: Optional[QAPISourceInfo],
ifcond: QAPISchemaIfCond,
element_type: QAPISchemaType) -> None:
+ if element_type.json_type() == 'int' and name != 'intList':
+ return
element = self._use_type(element_type)
self._gen_tree(name, 'array', {'element-type': element}, ifcond)
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 05/65] qapi: QAPISchemaVisitor.visit_needed() is now unused, drop
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (3 preceding siblings ...)
2026-10-20 10:45 ` [PATCH v7 04/65] qapi/introspect: Don't elide types marcandre.lureau
@ 2026-10-20 10:45 ` marcandre.lureau
2026-10-20 10:45 ` [PATCH v7 06/65] qapi/introspect: Tweak integer type masking marcandre.lureau
` (59 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: marcandre.lureau @ 2026-10-20 10:45 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
From: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
scripts/qapi/schema.py | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py
index 11f3accec873..9e2152fa419b 100644
--- a/scripts/qapi/schema.py
+++ b/scripts/qapi/schema.py
@@ -179,11 +179,6 @@ def visit_end(self) -> None:
def visit_module(self, name: str) -> None:
pass
- def visit_needed(self, entity: QAPISchemaEntity) -> bool:
- # pylint: disable=unused-argument
- # Default to visiting everything
- return True
-
def visit_include(self, name: str, info: Optional[QAPISourceInfo]) -> None:
pass
@@ -315,8 +310,7 @@ def add_entity(self, ent: QAPISchemaEntity) -> None:
def visit(self, visitor: QAPISchemaVisitor) -> None:
visitor.visit_module(self.name)
for entity in self._entity_list:
- if visitor.visit_needed(entity):
- entity.visit(visitor)
+ entity.visit(visitor)
class QAPISchemaInclude(QAPISchemaEntity):
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 06/65] qapi/introspect: Tweak integer type masking
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (4 preceding siblings ...)
2026-10-20 10:45 ` [PATCH v7 05/65] qapi: QAPISchemaVisitor.visit_needed() is now unused, drop marcandre.lureau
@ 2026-10-20 10:45 ` marcandre.lureau
2026-10-20 10:45 ` [PATCH v7 07/65] qapi: add QAPITypeInfo struct definition Marc-André Lureau
` (58 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: marcandre.lureau @ 2026-10-20 10:45 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
From: Markus Armbruster <armbru@redhat.com>
Since introspection maps all integer types to 'int', we need to skip
all but one of them. Instead of filtering by hardcoded name, filter
out duplicates.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
scripts/qapi/introspect.py | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/scripts/qapi/introspect.py b/scripts/qapi/introspect.py
index 15302ecf155a..dc6f70a6fe9e 100644
--- a/scripts/qapi/introspect.py
+++ b/scripts/qapi/introspect.py
@@ -172,7 +172,7 @@ def __init__(self, prefix: str, unmask: bool):
' * QAPI/QMP schema introspection', __doc__)
self._unmask = unmask
self._schema: Optional[QAPISchema] = None
- self._trees: List[Annotated[SchemaInfo]] = []
+ self._trees: Dict[str, Annotated[SchemaInfo]] = {}
self._genc.add(mcgen('''
#include "qemu/osdep.h"
#include "%(prefix)sqapi-introspect.h"
@@ -191,13 +191,14 @@ def visit_end(self) -> None:
extern const QLitObject %(c_name)s;
''',
c_name=c_name(name)))
+ trees = list(self._trees.values())
self._genc.add(mcgen('''
const QLitObject %(c_name)s = %(c_string)s;
''',
c_name=c_name(name),
- c_string=_tree_to_qlit(self._trees)))
+ c_string=_tree_to_qlit(trees)))
self._schema = None
- self._trees = []
+ self._trees = {}
def _name(self, name: str) -> str:
assert self._schema
@@ -235,7 +236,12 @@ def _gen_tree(self, name: str, mtype: str, obj: Dict[str, object],
obj['meta-type'] = mtype
if features:
obj['features'] = self._gen_features(features)
- self._trees.append(Annotated(obj, ifcond, comment))
+ if introspection_name in self._trees:
+ # Duplicates are possible because
+ # QAPISchemaBuiltinType.introspection_name() returns 'int'
+ # for all integer types. Ignore them.
+ return
+ self._trees[introspection_name] = Annotated(obj, ifcond, comment)
def _gen_enum_member(self, member: QAPISchemaEnumMember
) -> Annotated[SchemaInfoEnumMember]:
@@ -268,8 +274,6 @@ def _gen_variant(self, variant: QAPISchemaVariant
def visit_builtin_type(self, name: str, info: Optional[QAPISourceInfo],
json_type: str) -> None:
- if json_type == 'int' and name != 'int':
- return
self._gen_tree(name, 'builtin', {'json-type': json_type})
def visit_enum_type(self, name: str, info: Optional[QAPISourceInfo],
@@ -287,8 +291,6 @@ def visit_enum_type(self, name: str, info: Optional[QAPISourceInfo],
def visit_array_type(self, name: str, info: Optional[QAPISourceInfo],
ifcond: QAPISchemaIfCond,
element_type: QAPISchemaType) -> None:
- if element_type.json_type() == 'int' and name != 'intList':
- return
element = self._use_type(element_type)
self._gen_tree(name, 'array', {'element-type': element}, ifcond)
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 07/65] qapi: add QAPITypeInfo struct definition
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (5 preceding siblings ...)
2026-10-20 10:45 ` [PATCH v7 06/65] qapi/introspect: Tweak integer type masking marcandre.lureau
@ 2026-10-20 10:45 ` Marc-André Lureau
2026-10-20 10:45 ` [PATCH v7 08/65] qapi/gen: fix _module_basename for multi-dash 'what' parameters Marc-André Lureau
` (57 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:45 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
Introduce a minimal struct that pairs a QAPI type's internal name with
its "masked" introspection name. Generated constants of this type will
let QOM property registration carry a reliable reference to the QAPI
schema and possibly other associated data.
The fields are populated in following commits.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
include/qapi/qapi-type-info.h | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/include/qapi/qapi-type-info.h b/include/qapi/qapi-type-info.h
new file mode 100644
index 000000000000..6a6355568325
--- /dev/null
+++ b/include/qapi/qapi-type-info.h
@@ -0,0 +1,31 @@
+/*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#ifndef QAPI_TYPE_INFO_H
+#define QAPI_TYPE_INFO_H
+
+#include "qapi/util.h"
+
+/**
+ * QAPITypeInfo - QAPI type metadata
+ *
+ * @name: QAPI type name (e.g. "str", "OnOffAuto", "int32List").
+ * QOM uses this as the property type string.
+ * @masked_name: Name of the type in the QAPI introspection schema, assigned by
+ * scripts/qapi code generator (e.g. "368").
+ * @lookup: QEnumLookup for this type, or NULL for non-enum types.
+ * visit_type_enum(), qapi_enum_parse(), and qapi_enum_lookup()
+ * all rely on it.
+ * @list: The list-type counterpart, or NULL if none exists.
+ * str_type_info.list points to strList_type_info. qdev array
+ * properties follow this to find the list type for their element.
+ */
+typedef struct QAPITypeInfo {
+ const char *name;
+ const char *masked_name;
+ const QEnumLookup *lookup;
+ const struct QAPITypeInfo *list;
+} QAPITypeInfo;
+
+#endif /* QAPI_TYPE_INFO_H */
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 08/65] qapi/gen: fix _module_basename for multi-dash 'what' parameters
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (6 preceding siblings ...)
2026-10-20 10:45 ` [PATCH v7 07/65] qapi: add QAPITypeInfo struct definition Marc-André Lureau
@ 2026-10-20 10:45 ` Marc-André Lureau
2026-10-20 10:45 ` [PATCH v7 09/65] qapi: add type-infos generator Marc-André Lureau
` (56 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:45 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
The re.sub() call replaces every hyphen in 'what' with the system module
infix. This produces broken filenames for multi-hyphen names (e.g.
'qapi-type-infos' becomes 'qapi-builtin-type-builtin-infos').
Add count=1 so only the first hyphen is replaced.
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
scripts/qapi/gen.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/qapi/gen.py b/scripts/qapi/gen.py
index 0c9b8db3b024..690187d4280d 100644
--- a/scripts/qapi/gen.py
+++ b/scripts/qapi/gen.py
@@ -300,7 +300,7 @@ def _module_basename(self, what: str, name: str) -> str:
ret += '-' + os.path.splitext(basename)[0]
else:
assert QAPISchemaModule.is_system_module(name)
- ret += re.sub(r'-', '-' + name[2:] + '-', what)
+ ret += re.sub(r'-', '-' + name[2:] + '-', what, count=1)
return ret
def _module_filename(self, what: str, name: str) -> str:
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 09/65] qapi: add type-infos generator
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (7 preceding siblings ...)
2026-10-20 10:45 ` [PATCH v7 08/65] qapi/gen: fix _module_basename for multi-dash 'what' parameters Marc-André Lureau
@ 2026-10-20 10:45 ` Marc-André Lureau
2026-10-20 10:45 ` [PATCH v7 10/65] meson: add qapi-type-infos-*.c/h to build Marc-André Lureau
` (55 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:45 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
New QAPISchemaGenTypeInfoVisitor produces per-module
qapi-type-infos-*.h/c files. Each file declares QAPITypeInfo constants
pairing the QAPI type name with its masked introspection name.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
docs/devel/qapi-code-gen.rst | 92 ++++++++++++++++++++++++
meson.build | 1 +
scripts/qapi/backend.py | 2 +
scripts/qapi/type_infos.py | 163 +++++++++++++++++++++++++++++++++++++++++++
4 files changed, 258 insertions(+)
diff --git a/docs/devel/qapi-code-gen.rst b/docs/devel/qapi-code-gen.rst
index 77f08bb68cac..1cc5338a210a 100644
--- a/docs/devel/qapi-code-gen.rst
+++ b/docs/devel/qapi-code-gen.rst
@@ -1250,6 +1250,9 @@ JSON array of strings.
To examine a type, start with a command or event using it, then follow
references by name.
+.. TODO document QOM introspection (qom-list, qom-list-properties,
+ qom-get) and how it relates to QAPI type information.
+
The SchemaInfo for a command has meta-type "command", and variant
members "arg-type", "ret-type" and "allow-oob". On the wire, the
"arguments" member of a client's "execute" command must conform to the
@@ -2099,3 +2102,92 @@ Example::
}));
[Uninteresting stuff omitted...]
+
+
+Code generated for type information
+-----------------------------------
+
+Type information is generated for user-defined types and their array
+types. With option --builtins, it is also generated for the built-in
+types.
+
+The following files are created:
+
+ ``$(prefix)qapi-type-infos.c``
+ A ``QAPITypeInfo`` instance for each type listed above, providing
+ a mapping between the QAPI type name and the masked name used by
+ introspection, along with optional enum lookup table and array
+ type pointers.
+
+ ``$(prefix)qapi-type-infos.h``
+ Declarations for the above type info instances
+
+Each ``QAPITypeInfo`` struct has the following fields:
+
+``name``
+ The QAPI type name (e.g. ``"UserDefOne"``).
+
+``masked_name``
+ The masked name used in ``query-qmp-schema`` output.
+
+``lookup``
+ For enum types, a pointer to the corresponding ``QEnumLookup``
+ table. ``NULL`` for non-enum types.
+
+``list``
+ For types that have an array variant, a pointer to the array type's
+ ``QAPITypeInfo``. ``NULL`` when no array type exists.
+
+These type info instances are used by QOM property registration
+functions (``object_property_add_qapi()``,
+``object_class_property_add_qapi_enum()``, etc.) to associate each
+property with its QAPI type. The ``qom-list`` and
+``device-list-properties`` QMP commands then expose the ``qapi-type``
+field, giving management tools a formal type reference they can look
+up in the introspection schema.
+
+Example::
+
+ $ cat qapi-generated/example-qapi-type-infos.h
+ [Uninteresting stuff omitted...]
+
+ #ifndef EXAMPLE_QAPI_TYPE_INFOS_H
+ #define EXAMPLE_QAPI_TYPE_INFOS_H
+
+ #include "qapi/qapi-builtin-type-infos.h"
+
+ extern const QAPITypeInfo UserDefOne_type_info;
+
+ extern const QAPITypeInfo UserDefOneList_type_info;
+
+ #endif /* EXAMPLE_QAPI_TYPE_INFOS_H */
+ $ cat qapi-generated/example-qapi-type-infos.c
+ [Uninteresting stuff omitted...]
+
+ const QAPITypeInfo UserDefOne_type_info = {
+ .name = "UserDefOne",
+ .masked_name = "1",
+ .list = &UserDefOneList_type_info,
+ };
+
+ const QAPITypeInfo UserDefOneList_type_info = {
+ .name = "UserDefOneList",
+ .masked_name = "[1]",
+ };
+
+ [Uninteresting stuff omitted...]
+
+For a modular QAPI schema (see section `Include directives`_), code for
+each sub-module SUBDIR/SUBMODULE.json is actually generated into ::
+
+ SUBDIR/$(prefix)qapi-type-infos-SUBMODULE.h
+ SUBDIR/$(prefix)qapi-type-infos-SUBMODULE.c
+
+If qapi-gen.py is run with option --builtins, additional files are
+created:
+
+ ``qapi-builtin-type-infos.h``
+ Type info instances for built-in types
+
+ ``qapi-builtin-type-infos.c``
+ Definitions for the above type info instances
diff --git a/meson.build b/meson.build
index bbef9d9c2932..e51fb7a37740 100644
--- a/meson.build
+++ b/meson.build
@@ -3510,6 +3510,7 @@ qapi_gen_depends = [ meson.current_source_dir() / 'scripts/qapi/__init__.py',
meson.current_source_dir() / 'scripts/qapi/parser.py',
meson.current_source_dir() / 'scripts/qapi/schema.py',
meson.current_source_dir() / 'scripts/qapi/source.py',
+ meson.current_source_dir() / 'scripts/qapi/type_infos.py',
meson.current_source_dir() / 'scripts/qapi/types.py',
meson.current_source_dir() / 'scripts/qapi/visit.py',
meson.current_source_dir() / 'scripts/qapi-gen.py'
diff --git a/scripts/qapi/backend.py b/scripts/qapi/backend.py
index 49ae6ecdd33e..508ab2173539 100644
--- a/scripts/qapi/backend.py
+++ b/scripts/qapi/backend.py
@@ -8,6 +8,7 @@
from .features import gen_features
from .introspect import gen_introspect
from .schema import QAPISchema
+from .type_infos import gen_type_infos
from .types import gen_types
from .visit import gen_visit
@@ -63,3 +64,4 @@ def generate(self,
gen_commands(schema, output_dir, prefix, gen_tracing)
gen_events(schema, output_dir, prefix)
gen_introspect(schema, output_dir, prefix, unmask)
+ gen_type_infos(schema, output_dir, prefix, builtins, unmask)
diff --git a/scripts/qapi/type_infos.py b/scripts/qapi/type_infos.py
new file mode 100644
index 000000000000..b29e31d92640
--- /dev/null
+++ b/scripts/qapi/type_infos.py
@@ -0,0 +1,163 @@
+"""
+QAPI type info generator
+
+SPDX-License-Identifier: GPL-2.0-or-later
+"""
+
+from typing import List, Optional
+
+from .common import c_name, mcgen
+from .gen import QAPISchemaModularCVisitor, ifcontext
+from .schema import (
+ QAPISchema,
+ QAPISchemaAlternatives,
+ QAPISchemaBranches,
+ QAPISchemaEnumMember,
+ QAPISchemaFeature,
+ QAPISchemaIfCond,
+ QAPISchemaObjectType,
+ QAPISchemaObjectTypeMember,
+ QAPISchemaType,
+)
+from .source import QAPISourceInfo
+
+
+class QAPISchemaGenTypeInfoVisitor(QAPISchemaModularCVisitor):
+
+ def __init__(self, prefix: str, unmask: bool):
+ super().__init__(
+ prefix, 'qapi-type-infos',
+ ' * Schema-defined QAPI type info',
+ ' * Built-in QAPI type info', __doc__)
+ self._unmask = unmask
+ self._schema: Optional[QAPISchema] = None
+
+ def visit_begin(self, schema: QAPISchema) -> None:
+ super().visit_begin(schema)
+ self._schema = schema
+
+ def _begin_builtin_module(self) -> None:
+ self._genc.preamble_add(mcgen('''
+#include "qemu/osdep.h"
+#include "qapi/qapi-builtin-types.h"
+#include "qapi/qapi-builtin-type-infos.h"
+'''))
+ self._genh.preamble_add(mcgen('''
+#include "qapi/qapi-type-info.h"
+'''))
+
+ def _begin_user_module(self, name: str) -> None:
+ type_infos = self._module_basename('qapi-type-infos', name)
+ types = self._module_basename('qapi-types', name)
+ self._genc.preamble_add(mcgen('''
+#include "qemu/osdep.h"
+#include "%(types)s.h"
+#include "%(type_infos)s.h"
+''',
+ types=types,
+ type_infos=type_infos))
+ self._genh.preamble_add(mcgen('''
+#include "qapi/qapi-builtin-type-infos.h"
+'''))
+
+ def _has_list(self, name: str) -> bool:
+ assert self._schema is not None
+ return self._schema.lookup_type(name + 'List') is not None
+
+ def _masked_name(self, name: str) -> str:
+ assert self._schema is not None
+ return self._schema.definition_introspection_name(name, self._unmask)
+
+ def _gen_type_info(self, name: str,
+ ifcond: Optional[QAPISchemaIfCond] = None,
+ with_lookup: bool = False,
+ with_list: bool = False) -> None:
+ c_id = c_name(name + '_type_info')
+ masked_name_str = '"%s"' % self._masked_name(name)
+ with ifcontext(ifcond or QAPISchemaIfCond(),
+ self._genh, self._genc):
+ self._genh.add(mcgen('''
+
+extern const QAPITypeInfo %(c_id)s;
+''',
+ c_id=c_id))
+ self._genc.add(mcgen('''
+
+const QAPITypeInfo %(c_id)s = {
+ .name = "%(name)s",
+ .masked_name = %(masked_name)s,
+''',
+ c_id=c_id, name=name,
+ masked_name=masked_name_str))
+ if with_lookup:
+ self._genc.add(mcgen('''
+ .lookup = &%(c_name)s_lookup,
+''',
+ c_name=c_name(name)))
+ if with_list:
+ self._genc.add(mcgen('''
+ .list = &%(list_id)s,
+''',
+ list_id=c_name(name + 'List_type_info')))
+ self._genc.add(mcgen('''
+};
+'''))
+
+ def visit_builtin_type(self,
+ name: str,
+ info: Optional[QAPISourceInfo],
+ json_type: str) -> None:
+ self._gen_type_info(name, with_list=self._has_list(name))
+
+ def visit_enum_type(self,
+ name: str,
+ info: Optional[QAPISourceInfo],
+ ifcond: QAPISchemaIfCond,
+ features: List[QAPISchemaFeature],
+ members: List[QAPISchemaEnumMember],
+ prefix: Optional[str]) -> None:
+ self._gen_type_info(name, ifcond,
+ with_lookup=True,
+ with_list=self._has_list(name))
+
+ def visit_array_type(self,
+ name: str,
+ info: Optional[QAPISourceInfo],
+ ifcond: QAPISchemaIfCond,
+ element_type: QAPISchemaType) -> None:
+ self._gen_type_info(name, ifcond)
+
+ def visit_object_type(self,
+ name: str,
+ info: Optional[QAPISourceInfo],
+ ifcond: QAPISchemaIfCond,
+ features: List[QAPISchemaFeature],
+ base: Optional[QAPISchemaObjectType],
+ members: List[QAPISchemaObjectTypeMember],
+ branches: Optional[QAPISchemaBranches]) -> None:
+ assert self._schema is not None
+ typ = self._schema.lookup_type(name)
+ assert typ
+ if typ.is_implicit():
+ return
+ self._gen_type_info(name, ifcond,
+ with_list=self._has_list(name))
+
+ def visit_alternate_type(self,
+ name: str,
+ info: Optional[QAPISourceInfo],
+ ifcond: QAPISchemaIfCond,
+ features: List[QAPISchemaFeature],
+ alternatives: QAPISchemaAlternatives) -> None:
+ self._gen_type_info(name, ifcond,
+ with_list=self._has_list(name))
+
+
+def gen_type_infos(schema: QAPISchema,
+ output_dir: str,
+ prefix: str,
+ opt_builtins: bool,
+ opt_unmask: bool) -> None:
+ vis = QAPISchemaGenTypeInfoVisitor(prefix, opt_unmask)
+ schema.visit(vis)
+ vis.write(output_dir, opt_builtins)
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 10/65] meson: add qapi-type-infos-*.c/h to build
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (8 preceding siblings ...)
2026-10-20 10:45 ` [PATCH v7 09/65] qapi: add type-infos generator Marc-André Lureau
@ 2026-10-20 10:45 ` Marc-André Lureau
2026-10-20 10:45 ` [PATCH v7 11/65] qom: add qapi_type field to ObjectProperty Marc-André Lureau
` (54 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:45 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
Add the per-module type-infos output files so they are compiled into
the build.
Reviewed-by: Kostiantyn Kostiuk <kkostiuk@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
qapi/meson.build | 4 ++++
qga/meson.build | 2 ++
tests/include/meson.build | 2 ++
tests/meson.build | 6 ++++++
tests/qapi-schema/meson.build | 1 +
5 files changed, 15 insertions(+)
diff --git a/qapi/meson.build b/qapi/meson.build
index a46269b5a0c9..7477953492ad 100644
--- a/qapi/meson.build
+++ b/qapi/meson.build
@@ -79,6 +79,7 @@ endif
qapi_nonmodule_outputs = [
'qapi-introspect.c', 'qapi-introspect.h',
+ 'qapi-type-infos.c', 'qapi-type-infos.h',
'qapi-types.c', 'qapi-types.h',
'qapi-visit.h', 'qapi-visit.c',
'qapi-commands.h', 'qapi-commands.c',
@@ -88,6 +89,7 @@ qapi_nonmodule_outputs = [
]
qapi_outputs = qapi_nonmodule_outputs + [
+ 'qapi-builtin-type-infos.c', 'qapi-builtin-type-infos.h',
'qapi-builtin-types.c', 'qapi-builtin-visit.c',
'qapi-builtin-types.h', 'qapi-builtin-visit.h',
]
@@ -96,6 +98,8 @@ qapi_inputs = []
foreach module : qapi_all_modules
qapi_inputs += [ files(module + '.json') ]
qapi_module_outputs = [
+ 'qapi-type-infos-@0@.c'.format(module),
+ 'qapi-type-infos-@0@.h'.format(module),
'qapi-types-@0@.c'.format(module),
'qapi-types-@0@.h'.format(module),
'qapi-visit-@0@.c'.format(module),
diff --git a/qga/meson.build b/qga/meson.build
index cfa2157efb23..79163b7d8e93 100644
--- a/qga/meson.build
+++ b/qga/meson.build
@@ -39,6 +39,8 @@ qga_qapi_outputs = [
'qga-qapi-init-commands.h',
'qga-qapi-introspect.c',
'qga-qapi-introspect.h',
+ 'qga-qapi-type-infos.c',
+ 'qga-qapi-type-infos.h',
'qga-qapi-types.c',
'qga-qapi-types.h',
'qga-qapi-visit.c',
diff --git a/tests/include/meson.build b/tests/include/meson.build
index 8e8d1ec4e692..026480d96851 100644
--- a/tests/include/meson.build
+++ b/tests/include/meson.build
@@ -4,6 +4,8 @@ test_qapi_outputs_extra = [
'test-qapi-commands-sub-module.h',
'test-qapi-events-sub-module.c',
'test-qapi-events-sub-module.h',
+ 'test-qapi-type-infos-sub-module.c',
+ 'test-qapi-type-infos-sub-module.h',
'test-qapi-types-sub-module.c',
'test-qapi-types-sub-module.h',
'test-qapi-visit-sub-module.c',
diff --git a/tests/meson.build b/tests/meson.build
index 5877d2f60b12..6769a1e7812f 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -2,6 +2,8 @@ subdir('bench')
subdir('qemu-iotests')
test_qapi_outputs = [
+ 'qapi-builtin-type-infos.c',
+ 'qapi-builtin-type-infos.h',
'qapi-builtin-types.c',
'qapi-builtin-types.h',
'qapi-builtin-visit.c',
@@ -22,6 +24,10 @@ test_qapi_outputs = [
'test-qapi-init-commands.h',
'test-qapi-introspect.c',
'test-qapi-introspect.h',
+ 'test-qapi-type-infos-sub-sub-module.c',
+ 'test-qapi-type-infos-sub-sub-module.h',
+ 'test-qapi-type-infos.c',
+ 'test-qapi-type-infos.h',
'test-qapi-types-sub-sub-module.c',
'test-qapi-types-sub-sub-module.h',
'test-qapi-types.c',
diff --git a/tests/qapi-schema/meson.build b/tests/qapi-schema/meson.build
index debff633ac17..392b59d8dccd 100644
--- a/tests/qapi-schema/meson.build
+++ b/tests/qapi-schema/meson.build
@@ -231,6 +231,7 @@ custom_target('QAPI doc',
'doc-good-qapi-events.c', 'doc-good-qapi-events.h',
'doc-good-qapi-init-commands.c', 'doc-good-qapi-init-commands.h',
'doc-good-qapi-introspect.c', 'doc-good-qapi-introspect.h',
+ 'doc-good-qapi-type-infos.c', 'doc-good-qapi-type-infos.h',
'doc-good-qapi-types.c', 'doc-good-qapi-types.h',
'doc-good-qapi-visit.c', 'doc-good-qapi-visit.h' ],
input: files('doc-good.json'),
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 11/65] qom: add qapi_type field to ObjectProperty
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (9 preceding siblings ...)
2026-10-20 10:45 ` [PATCH v7 10/65] meson: add qapi-type-infos-*.c/h to build Marc-André Lureau
@ 2026-10-20 10:45 ` Marc-André Lureau
2026-10-20 10:45 ` [PATCH v7 12/65] qapi/qom: add qapi-type field to ObjectPropertyInfo Marc-André Lureau
` (53 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:45 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
Add a const pointer to QAPITypeInfo in ObjectProperty. NULL for now,
but future patches will add means to make it non-null. The
QAPITypeInfo will then be used by QOM introspection to tie the
property to a QAPI type.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
include/qom/object.h | 2 ++
qom/object.c | 1 +
2 files changed, 3 insertions(+)
diff --git a/include/qom/object.h b/include/qom/object.h
index 90c1a34e49aa..e9b380462ded 100644
--- a/include/qom/object.h
+++ b/include/qom/object.h
@@ -15,6 +15,7 @@
#define QEMU_OBJECT_H
#include "qapi/qapi-builtin-types.h"
+#include "qapi/qapi-type-info.h"
#include "qemu/module.h"
struct TypeImpl;
@@ -91,6 +92,7 @@ struct ObjectProperty
char *name;
char *type;
char *description;
+ const QAPITypeInfo *qapi_type;
ObjectPropertyAccessor *get;
ObjectPropertyAccessor *set;
ObjectPropertyResolve *resolve;
diff --git a/qom/object.c b/qom/object.c
index 96498f3d001c..c34b47312f29 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -3171,6 +3171,7 @@ object_property_add_alias(Object *obj, const char *name,
property_release_alias,
prop);
op->resolve = property_resolve_alias;
+ op->qapi_type = target_prop->qapi_type;
if (target_prop->defval) {
op->defval = qobject_ref(target_prop->defval);
}
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 12/65] qapi/qom: add qapi-type field to ObjectPropertyInfo
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (10 preceding siblings ...)
2026-10-20 10:45 ` [PATCH v7 11/65] qom: add qapi_type field to ObjectProperty Marc-André Lureau
@ 2026-10-20 10:45 ` Marc-André Lureau
2026-10-20 10:45 ` [PATCH v7 13/65] qom/qmp: populate qapi-type in QMP handlers Marc-André Lureau
` (52 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:45 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
Add an optional 'qapi-type' field to ObjectPropertyInfo and
ObjectPropertyValue. When present, it contains the masked type name that
can be looked up in query-qmp-schema output. Absent for properties
without a QAPI type association. Always absent for now, populated
in the following changes.
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
qapi/qom.json | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/qapi/qom.json b/qapi/qom.json
index 49f222796ab4..34be7768135c 100644
--- a/qapi/qom.json
+++ b/qapi/qom.json
@@ -35,6 +35,10 @@
# qdev device type name. Link properties form the device model
# graph.
#
+# @qapi-type: the name of the property's type as it appears in the
+# output of ``query-qmp-schema``. Absent if the type does not
+# occur there. (since 11.2)
+#
# @description: if specified, the description of the property.
#
# @default-value: the default value, if any (since 5.0)
@@ -44,6 +48,7 @@
{ 'struct': 'ObjectPropertyInfo',
'data': { 'name': 'str',
'type': 'str',
+ '*qapi-type': 'str',
'*description': 'str',
'*default-value': 'any' } }
@@ -55,6 +60,10 @@
# @type: the type of the property, as described in
# `ObjectPropertyInfo`.
#
+# @qapi-type: the name of the property's type as it appears in the
+# output of ``query-qmp-schema``. Absent if the type does not
+# occur there. (since 11.2)
+#
# @value: the value of the property. Absent when the property cannot
# be read.
#
@@ -63,6 +72,7 @@
{ 'struct': 'ObjectPropertyValue',
'data': { 'name': 'str',
'type': 'str',
+ '*qapi-type': 'str',
'*value': 'any' } }
##
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 13/65] qom/qmp: populate qapi-type in QMP handlers
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (11 preceding siblings ...)
2026-10-20 10:45 ` [PATCH v7 12/65] qapi/qom: add qapi-type field to ObjectPropertyInfo Marc-André Lureau
@ 2026-10-20 10:45 ` Marc-André Lureau
2026-10-20 10:45 ` [PATCH v7 14/65] qom/qmp: populate description & default-value in qom_property_info() Marc-André Lureau
` (51 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:45 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
Wire up the new qapi-type field in all four QMP handlers that return
ObjectPropertyInfo or ObjectPropertyValue: qom-list, qom-list-get,
device-list-properties, and qom-list-properties.
When an ObjectProperty has a qapi_type set, the masked QAPI type name
is copied into the response, allowing clients to cross-reference with
query-qmp-schema.
No property has it yet, the following changes will populate it.
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
qom/qom-qmp-cmds.c | 34 +++++++++++++++++++++-------------
1 file changed, 21 insertions(+), 13 deletions(-)
diff --git a/qom/qom-qmp-cmds.c b/qom/qom-qmp-cmds.c
index f17389c7305c..47bf3bf2937a 100644
--- a/qom/qom-qmp-cmds.c
+++ b/qom/qom-qmp-cmds.c
@@ -25,9 +25,23 @@
#include "qapi/qobject-input-visitor.h"
#include "qapi/qobject-output-visitor.h"
#include "qemu/cutils.h"
+#include "qapi/qapi-type-info.h"
#include "qom/object_interfaces.h"
#include "qom/qom-qobject.h"
+static ObjectPropertyInfo *qom_property_info(ObjectProperty *prop)
+{
+ ObjectPropertyInfo *info = g_new0(ObjectPropertyInfo, 1);
+
+ info->name = g_strdup(prop->name);
+ info->type = g_strdup(prop->type);
+ if (prop->qapi_type) {
+ assert(prop->qapi_type->masked_name);
+ info->qapi_type = g_strdup(prop->qapi_type->masked_name);
+ }
+ return info;
+}
+
static Object *qom_resolve_path(const char *path, Error **errp)
{
bool ambiguous = false;
@@ -58,12 +72,7 @@ ObjectPropertyInfoList *qmp_qom_list(const char *path, Error **errp)
object_property_iter_init(&iter, obj);
while ((prop = object_property_iter_next(&iter))) {
- ObjectPropertyInfo *value = g_new0(ObjectPropertyInfo, 1);
-
- QAPI_LIST_PREPEND(props, value);
-
- value->name = g_strdup(prop->name);
- value->type = g_strdup(prop->type);
+ QAPI_LIST_PREPEND(props, qom_property_info(prop));
}
return props;
@@ -78,6 +87,10 @@ static void qom_list_add_property_value(Object *obj, ObjectProperty *prop,
item->name = g_strdup(prop->name);
item->type = g_strdup(prop->type);
+ if (prop->qapi_type) {
+ assert(prop->qapi_type->masked_name);
+ item->qapi_type = g_strdup(prop->qapi_type->masked_name);
+ }
item->value = object_property_get_qobject(obj, prop->name, NULL);
}
@@ -241,9 +254,7 @@ ObjectPropertyInfoList *qmp_device_list_properties(const char *typename,
continue;
}
- info = g_new0(ObjectPropertyInfo, 1);
- info->name = g_strdup(prop->name);
- info->type = g_strdup(prop->type);
+ info = qom_property_info(prop);
info->description = g_strdup(prop->description);
info->default_value = qobject_ref(prop->defval);
@@ -284,11 +295,8 @@ ObjectPropertyInfoList *qmp_qom_list_properties(const char *typename,
object_property_iter_init(&iter, obj);
}
while ((prop = object_property_iter_next(&iter))) {
- ObjectPropertyInfo *info;
+ ObjectPropertyInfo *info = qom_property_info(prop);
- info = g_malloc0(sizeof(*info));
- info->name = g_strdup(prop->name);
- info->type = g_strdup(prop->type);
info->description = g_strdup(prop->description);
info->default_value = qobject_ref(prop->defval);
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 14/65] qom/qmp: populate description & default-value in qom_property_info()
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (12 preceding siblings ...)
2026-10-20 10:45 ` [PATCH v7 13/65] qom/qmp: populate qapi-type in QMP handlers Marc-André Lureau
@ 2026-10-20 10:45 ` Marc-André Lureau
2026-10-20 10:45 ` [PATCH v7 15/65] qom: add object_property_set_default_enum() Marc-André Lureau
` (50 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:45 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
Move description and default_value population from the individual QMP
handlers into qom_property_info(), so all callers get them.
This also adds description and default-value to qom-list responses,
which previously only returned name and type. The handler doesn't care.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
qom/qom-qmp-cmds.c | 17 ++++-------------
1 file changed, 4 insertions(+), 13 deletions(-)
diff --git a/qom/qom-qmp-cmds.c b/qom/qom-qmp-cmds.c
index 47bf3bf2937a..84a295905148 100644
--- a/qom/qom-qmp-cmds.c
+++ b/qom/qom-qmp-cmds.c
@@ -35,6 +35,8 @@ static ObjectPropertyInfo *qom_property_info(ObjectProperty *prop)
info->name = g_strdup(prop->name);
info->type = g_strdup(prop->type);
+ info->description = g_strdup(prop->description);
+ info->default_value = qobject_ref(prop->defval);
if (prop->qapi_type) {
assert(prop->qapi_type->masked_name);
info->qapi_type = g_strdup(prop->qapi_type->masked_name);
@@ -243,8 +245,6 @@ ObjectPropertyInfoList *qmp_device_list_properties(const char *typename,
object_property_iter_init(&iter, obj);
while ((prop = object_property_iter_next(&iter))) {
- ObjectPropertyInfo *info;
-
/* Skip Object and DeviceState properties */
if (strcmp(prop->name, "type") == 0 ||
strcmp(prop->name, "realized") == 0 ||
@@ -254,11 +254,7 @@ ObjectPropertyInfoList *qmp_device_list_properties(const char *typename,
continue;
}
- info = qom_property_info(prop);
- info->description = g_strdup(prop->description);
- info->default_value = qobject_ref(prop->defval);
-
- QAPI_LIST_PREPEND(prop_list, info);
+ QAPI_LIST_PREPEND(prop_list, qom_property_info(prop));
}
object_unref(obj);
@@ -295,12 +291,7 @@ ObjectPropertyInfoList *qmp_qom_list_properties(const char *typename,
object_property_iter_init(&iter, obj);
}
while ((prop = object_property_iter_next(&iter))) {
- ObjectPropertyInfo *info = qom_property_info(prop);
-
- info->description = g_strdup(prop->description);
- info->default_value = qobject_ref(prop->defval);
-
- QAPI_LIST_PREPEND(prop_list, info);
+ QAPI_LIST_PREPEND(prop_list, qom_property_info(prop));
}
object_unref(obj);
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 15/65] qom: add object_property_set_default_enum()
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (13 preceding siblings ...)
2026-10-20 10:45 ` [PATCH v7 14/65] qom/qmp: populate description & default-value in qom_property_info() Marc-André Lureau
@ 2026-10-20 10:45 ` Marc-André Lureau
2026-10-20 10:45 ` [PATCH v7 16/65] qom: add object_{class_}property_add_qapi Marc-André Lureau
` (49 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:45 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
A simple helper to set the default enum value from the integer value.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
include/qom/object.h | 9 +++++++++
qom/object.c | 9 +++++++++
2 files changed, 18 insertions(+)
diff --git a/include/qom/object.h b/include/qom/object.h
index e9b380462ded..2a5723c555e9 100644
--- a/include/qom/object.h
+++ b/include/qom/object.h
@@ -1260,6 +1260,15 @@ void object_property_set_default_bool(ObjectProperty *prop, bool value);
*/
void object_property_set_default_str(ObjectProperty *prop, const char *value);
+/**
+ * object_property_set_default_enum:
+ * @prop: the property to set
+ * @value: the value to be written to the property
+ *
+ * Set the property default value.
+ */
+void object_property_set_default_enum(ObjectProperty *prop, int value);
+
/**
* object_property_set_default_list:
* @prop: the property to set
diff --git a/qom/object.c b/qom/object.c
index c34b47312f29..1d09315b328b 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -1719,6 +1719,15 @@ void object_property_set_default_str(ObjectProperty *prop, const char *value)
object_property_set_default(prop, QOBJECT(qstring_from_str(value)));
}
+void object_property_set_default_enum(ObjectProperty *prop, int value)
+{
+ assert(prop && prop->qapi_type && prop->qapi_type->lookup);
+
+ object_property_set_default(prop, QOBJECT(qstring_from_str(
+ qapi_enum_lookup(prop->qapi_type->lookup, value)
+ )));
+}
+
void object_property_set_default_list(ObjectProperty *prop)
{
object_property_set_default(prop, QOBJECT(qlist_new()));
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 16/65] qom: add object_{class_}property_add_qapi
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (14 preceding siblings ...)
2026-10-20 10:45 ` [PATCH v7 15/65] qom: add object_property_set_default_enum() Marc-André Lureau
@ 2026-10-20 10:45 ` Marc-André Lureau
2026-10-20 10:45 ` [PATCH v7 17/65] qom: add object_{class_}property_add_qapi_enum Marc-André Lureau
` (48 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:45 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
include/qom/object.h | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++
qom/object.c | 32 ++++++++++++++++++++++++++++++
2 files changed, 87 insertions(+)
diff --git a/include/qom/object.h b/include/qom/object.h
index 2a5723c555e9..eb61d8842b80 100644
--- a/include/qom/object.h
+++ b/include/qom/object.h
@@ -2027,6 +2027,61 @@ ObjectProperty *object_class_property_add_enum(ObjectClass *klass,
int (*get)(Object *, Error **),
void (*set)(Object *, int, Error **));
+/**
+ * object_property_add_qapi:
+ * @obj: the object to add a property to
+ * @name: the name of the property
+ * @qapi_type: QAPI type info descriptor
+ * @get: The getter to be called to read a property. If this is NULL, then
+ * the property cannot be read.
+ * @set: the setter to be called to write a property. If this is NULL,
+ * then the property cannot be written.
+ * @release: called when the property is removed from the object. This is
+ * meant to allow a property to free its opaque upon object
+ * destruction. This may be NULL.
+ * @opaque: an opaque pointer to pass to the callbacks for the property
+ *
+ * Add a property with a QAPI type association. The property type name
+ * is derived from @qapi_type->name.
+ *
+ * Returns: The newly added property on success, or %NULL on failure.
+ */
+ObjectProperty *
+object_property_add_qapi(Object *obj, const char *name,
+ const QAPITypeInfo *qapi_type,
+ ObjectPropertyAccessor *get,
+ ObjectPropertyAccessor *set,
+ ObjectPropertyRelease *release,
+ void *opaque);
+
+/**
+ * object_class_property_add_qapi:
+ * @klass: the object class to add a property to
+ * @name: the name of the property
+ * @qapi_type: QAPI type info descriptor
+ * @get: The getter to be called to read a property. If this is NULL, then
+ * the property cannot be read.
+ * @set: the setter to be called to write a property. If this is NULL,
+ * then the property cannot be written.
+ * @release: called when the property is removed from the object. This is
+ * meant to allow a property to free its opaque upon object
+ * destruction. This may be NULL.
+ * @opaque: an opaque pointer to pass to the callbacks for the property
+ *
+ * Add a property with a QAPI type association. The property type name
+ * is derived from @qapi_type->name.
+ *
+ * Returns: The newly added property on success, or %NULL on failure.
+ */
+ObjectProperty *
+object_class_property_add_qapi(ObjectClass *klass,
+ const char *name,
+ const QAPITypeInfo *qapi_type,
+ ObjectPropertyAccessor *get,
+ ObjectPropertyAccessor *set,
+ ObjectPropertyRelease *release,
+ void *opaque);
+
/**
* object_property_add_tm:
* @obj: the object to add a property to
diff --git a/qom/object.c b/qom/object.c
index 1d09315b328b..bebbfc43556d 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -2609,6 +2609,38 @@ object_class_property_add_enum(ObjectClass *klass, const char *name,
prop);
}
+ObjectProperty *
+object_property_add_qapi(Object *obj, const char *name,
+ const QAPITypeInfo *qapi_type,
+ ObjectPropertyAccessor *get,
+ ObjectPropertyAccessor *set,
+ ObjectPropertyRelease *release,
+ void *opaque)
+{
+ ObjectProperty *prop;
+
+ prop = object_property_add(obj, name, qapi_type->name,
+ get, set, release, opaque);
+ prop->qapi_type = qapi_type;
+ return prop;
+}
+
+ObjectProperty *
+object_class_property_add_qapi(ObjectClass *klass, const char *name,
+ const QAPITypeInfo *qapi_type,
+ ObjectPropertyAccessor *get,
+ ObjectPropertyAccessor *set,
+ ObjectPropertyRelease *release,
+ void *opaque)
+{
+ ObjectProperty *prop;
+
+ prop = object_class_property_add(klass, name, qapi_type->name,
+ get, set, release, opaque);
+ prop->qapi_type = qapi_type;
+ return prop;
+}
+
typedef struct TMProperty {
void (*get)(Object *, struct tm *, Error **);
} TMProperty;
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 17/65] qom: add object_{class_}property_add_qapi_enum
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (15 preceding siblings ...)
2026-10-20 10:45 ` [PATCH v7 16/65] qom: add object_{class_}property_add_qapi Marc-André Lureau
@ 2026-10-20 10:45 ` Marc-André Lureau
2026-10-20 10:45 ` [PATCH v7 18/65] tests: update check-qom-proplist for QAPI-aware property registration Marc-André Lureau
` (47 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:45 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
include/qom/object.h | 74 ++++++++++++++++++++++++++++++++++++++++++
qom/object.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++++---
2 files changed, 159 insertions(+), 5 deletions(-)
diff --git a/include/qom/object.h b/include/qom/object.h
index eb61d8842b80..e04be4caed57 100644
--- a/include/qom/object.h
+++ b/include/qom/object.h
@@ -2027,6 +2027,80 @@ ObjectProperty *object_class_property_add_enum(ObjectClass *klass,
int (*get)(Object *, Error **),
void (*set)(Object *, int, Error **));
+/**
+ * struct QapiEnumProp: Descriptor for a property backed by a QAPI enum type
+ *
+ * Binds a QOM object property to a QAPI enum, providing automatic
+ * string<->int conversion through QAPI visitors and optional
+ * default-value initialization during object instance init.
+ *
+ * Use the QAPI_ENUM_PROP() macro to construct instances inline.
+ *
+ * @name: property name exposed on the QOM object
+ * @description: human-readable description (shown in ``-device help``, etc.)
+ * @default_value: initial enum value applied via @set during instance init,
+ * or -1 (the QAPI_ENUM_PROP default) to skip initialization
+ * @qapi_type: pointer to the generated QAPITypeInfo for the enum
+ * (provides the string<->int lookup table)
+ * @get: getter that returns the current enum value as int, or -1 on error
+ * @set: setter that receives the enum value as int; %NULL for read-only props
+ */
+typedef struct QapiEnumProp {
+ const char *name;
+ const char *description;
+ const int default_value;
+ const QAPITypeInfo *qapi_type;
+ int (*get)(Object *, Error **);
+ void (*set)(Object *, int, Error **);
+} QapiEnumProp;
+
+#define QAPI_ENUM_PROP(...) ({ \
+ static const QapiEnumProp _prop = { \
+ .default_value = -1, __VA_ARGS__ \
+ }; \
+ &_prop; })
+
+/**
+ * object_property_add_qapi_enum:
+ * @obj: the object to add a property to
+ * @prop: property descriptor
+ *
+ * Add an enum property with QAPI type association.
+ *
+ * Returns: The newly added property on success, or %NULL on failure.
+ */
+ObjectProperty *
+object_property_add_qapi_enum(Object *obj, const QapiEnumProp *prop);
+
+/**
+ * object_class_property_add_qapi_enum:
+ * @klass: the class object to add a property to
+ * @prop: property descriptor
+ *
+ * Add an enum property with QAPI type association.
+ *
+ * Use the QAPI_ENUM_PROP() macro to construct the property descriptor
+ * inline. If .default_value is not set, the property is not initialized
+ * (default_value is -1). Otherwise, the setter is called with
+ * default_value during object instance init.
+ *
+ * Example::
+ *
+ * object_class_property_add_qapi_enum(oc, QAPI_ENUM_PROP(
+ * .name = "policy",
+ * .description = "Set the NUMA policy",
+ * .default_value = HOST_MEM_POLICY_DEFAULT,
+ * .qapi_type = &HostMemPolicy_type_info,
+ * .get = my_get_policy,
+ * .set = my_set_policy,
+ * ));
+ *
+ * Returns: The newly added property on success, or %NULL on failure.
+ */
+ObjectProperty *
+object_class_property_add_qapi_enum(ObjectClass *klass,
+ const QapiEnumProp *prop);
+
/**
* object_property_add_qapi:
* @obj: the object to add a property to
diff --git a/qom/object.c b/qom/object.c
index bebbfc43556d..cc113c0810e7 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -1219,7 +1219,7 @@ static void object_class_foreach_tramp(gpointer key, gpointer value,
return;
}
- if (data->implements_type &&
+ if (data->implements_type &&
!object_class_dynamic_cast(k, data->implements_type)) {
return;
}
@@ -1786,7 +1786,6 @@ int object_property_get_enum(Object *obj, const char *name,
char *str;
int ret;
ObjectProperty *prop = object_property_find_err(obj, name, errp);
- EnumProperty *enumprop;
if (prop == NULL) {
return -1;
@@ -1799,14 +1798,17 @@ int object_property_get_enum(Object *obj, const char *name,
return -1;
}
- enumprop = prop->opaque;
-
str = object_property_get_str(obj, name, errp);
if (!str) {
return -1;
}
- ret = qapi_enum_parse(enumprop->lookup, str, -1, errp);
+ if (prop->qapi_type) {
+ ret = qapi_enum_parse(prop->qapi_type->lookup, str, -1, errp);
+ } else {
+ EnumProperty *enumprop = prop->opaque;
+ ret = qapi_enum_parse(enumprop->lookup, str, -1, errp);
+ }
g_free(str);
return ret;
@@ -2609,6 +2611,84 @@ object_class_property_add_enum(ObjectClass *klass, const char *name,
prop);
}
+static void get_qapi_enum(Object *obj, Visitor *v, const char *name,
+ void *opaque, Error **errp)
+{
+ const QapiEnumProp *prop = opaque;
+ int value;
+ Error *err = NULL;
+
+ value = prop->get(obj, &err);
+ assert(value >= 0 || err);
+ if (err) {
+ error_propagate(errp, err);
+ return;
+ }
+
+ visit_type_enum(v, name, &value, prop->qapi_type->lookup, errp);
+}
+
+static void set_qapi_enum(Object *obj, Visitor *v, const char *name,
+ void *opaque, Error **errp)
+{
+ const QapiEnumProp *prop = opaque;
+ int value;
+
+ if (!visit_type_enum(v, name, &value, prop->qapi_type->lookup, errp)) {
+ return;
+ }
+ prop->set(obj, value, errp);
+}
+
+static void init_qapi_enum(Object *obj, ObjectProperty *prop)
+{
+ const QapiEnumProp *e = prop->opaque;
+
+ if (e->set && e->default_value >= 0) {
+ e->set(obj, e->default_value, &error_abort);
+ }
+}
+
+ObjectProperty *
+object_property_add_qapi_enum(Object *obj, const QapiEnumProp *e)
+{
+ ObjectProperty *prop;
+
+ assert(e && e->qapi_type && e->qapi_type->lookup);
+
+ prop = object_property_add_qapi(obj, e->name, e->qapi_type,
+ e->get ? get_qapi_enum : NULL,
+ e->set ? set_qapi_enum : NULL,
+ NULL,
+ (void *)e);
+ prop->description = g_strdup(e->description);
+ if (e->default_value >= 0) {
+ prop->init = init_qapi_enum;
+ }
+
+ return prop;
+}
+
+ObjectProperty *
+object_class_property_add_qapi_enum(ObjectClass *klass, const QapiEnumProp *e)
+{
+ ObjectProperty *prop;
+
+ assert(e && e->qapi_type && e->qapi_type->lookup);
+
+ prop = object_class_property_add_qapi(klass, e->name, e->qapi_type,
+ e->get ? get_qapi_enum : NULL,
+ e->set ? set_qapi_enum : NULL,
+ NULL,
+ (void *)e);
+ prop->description = g_strdup(e->description);
+ if (e->default_value >= 0) {
+ prop->init = init_qapi_enum;
+ }
+
+ return prop;
+}
+
ObjectProperty *
object_property_add_qapi(Object *obj, const char *name,
const QAPITypeInfo *qapi_type,
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 18/65] tests: update check-qom-proplist for QAPI-aware property registration
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (16 preceding siblings ...)
2026-10-20 10:45 ` [PATCH v7 17/65] qom: add object_{class_}property_add_qapi_enum Marc-André Lureau
@ 2026-10-20 10:45 ` Marc-André Lureau
2026-10-20 10:45 ` [PATCH v7 19/65] qom: convert QAPI enum properties to QAPI-aware registration Marc-André Lureau
` (46 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:45 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
Migrate the dummy object's string and enum properties from the legacy
object_class_property_add_str/enum() helpers to the new QAPI-aware
object_class_property_add_qapi/qapi_enum() registration.
Add test cases verifying that the qapi_type metadata is correctly
populated on properties registered through the new API, and that it
remains NULL for properties using the old-style registration.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
tests/unit/check-qom-proplist.c | 93 ++++++++++++++++++++++++++++++++++-------
1 file changed, 77 insertions(+), 16 deletions(-)
diff --git a/tests/unit/check-qom-proplist.c b/tests/unit/check-qom-proplist.c
index 89de92b7d91f..69155e720751 100644
--- a/tests/unit/check-qom-proplist.c
+++ b/tests/unit/check-qom-proplist.c
@@ -108,22 +108,21 @@ static int dummy_get_av(Object *obj,
}
-static void dummy_set_sv(Object *obj,
- const char *value,
- Error **errp)
+static void dummy_set_sv(Object *obj, Visitor *v, const char *name,
+ void *opaque, Error **errp)
{
DummyObject *dobj = DUMMY_OBJECT(obj);
- g_free(dobj->sv);
- dobj->sv = g_strdup(value);
+ g_clear_pointer(&dobj->sv, g_free);
+ visit_type_str(v, name, &dobj->sv, errp);
}
-static char *dummy_get_sv(Object *obj,
- Error **errp)
+static void dummy_get_sv(Object *obj, Visitor *v, const char *name,
+ void *opaque, Error **errp)
{
DummyObject *dobj = DUMMY_OBJECT(obj);
- return g_strdup(dobj->sv);
+ visit_type_str(v, name, &dobj->sv, errp);
}
@@ -135,16 +134,28 @@ static void dummy_init(Object *obj)
}
+static const QAPITypeInfo dummy_animal_qapi_type_info = {
+ .name = "DummyAnimal",
+ .masked_name = "DummyAnimalSchema",
+ .lookup = &dummy_animal_map,
+};
+
+static const QAPITypeInfo dummy_str_qapi_type_info = {
+ .name = "str",
+ .masked_name = "StrSchema",
+};
+
static void dummy_class_init(ObjectClass *cls, const void *data)
{
- object_class_property_add_str(cls, "sv",
- dummy_get_sv,
- dummy_set_sv);
- object_class_property_add_enum(cls, "av",
- "DummyAnimal",
- &dummy_animal_map,
- dummy_get_av,
- dummy_set_av);
+ object_class_property_add_qapi(cls, "sv", &dummy_str_qapi_type_info,
+ dummy_get_sv, dummy_set_sv,
+ NULL, NULL);
+ object_class_property_add_qapi_enum(cls, QAPI_ENUM_PROP(
+ .name = "av",
+ .qapi_type = &dummy_animal_qapi_type_info,
+ .get = dummy_get_av,
+ .set = dummy_set_av,
+ ));
}
@@ -703,6 +714,54 @@ static void test_qom_partial_path(void)
object_unparent(cont1);
}
+static void test_dummy_qapi_enum(void)
+{
+ ObjectProperty *prop;
+ Object *parent = object_get_objects_root();
+ DummyObject *dobj = DUMMY_OBJECT(
+ object_new_with_props(TYPE_DUMMY,
+ parent,
+ "dummy0",
+ &error_abort,
+ "av", "platypus",
+ NULL));
+
+ g_assert(dobj->av == DUMMY_PLATYPUS);
+
+ prop = object_property_find(OBJECT(dobj), "av");
+ g_assert(prop);
+ g_assert(prop->qapi_type == &dummy_animal_qapi_type_info);
+ g_assert_cmpstr(prop->qapi_type->name, ==, "DummyAnimal");
+ g_assert_cmpstr(prop->qapi_type->masked_name, ==, "DummyAnimalSchema");
+ g_assert(prop->qapi_type->lookup == &dummy_animal_map);
+
+ object_unparent(OBJECT(dobj));
+}
+
+static void test_dummy_qapi_prop(void)
+{
+ ObjectProperty *prop;
+ Object *parent = object_get_objects_root();
+ DummyObject *dobj = DUMMY_OBJECT(
+ object_new_with_props(TYPE_DUMMY,
+ parent,
+ "dummy0",
+ &error_abort,
+ "sv", "hello",
+ NULL));
+
+ g_assert_cmpstr(dobj->sv, ==, "hello");
+
+ prop = object_property_find(OBJECT(dobj), "sv");
+ g_assert(prop);
+ g_assert(prop->qapi_type == &dummy_str_qapi_type_info);
+ g_assert_cmpstr(prop->qapi_type->name, ==, "str");
+ g_assert_cmpstr(prop->qapi_type->masked_name, ==, "StrSchema");
+ g_assert(prop->qapi_type->lookup == NULL);
+
+ object_unparent(OBJECT(dobj));
+}
+
int main(int argc, char **argv)
{
g_test_init(&argc, &argv, NULL);
@@ -727,6 +786,8 @@ int main(int argc, char **argv)
g_test_add_func("/qom/proplist/iterator", test_dummy_iterator);
g_test_add_func("/qom/proplist/class_iterator", test_dummy_class_iterator);
g_test_add_func("/qom/proplist/delchild", test_dummy_delchild);
+ g_test_add_func("/qom/proplist/qapi_enum", test_dummy_qapi_enum);
+ g_test_add_func("/qom/proplist/qapi_prop", test_dummy_qapi_prop);
g_test_add_func("/qom/resolve/partial", test_qom_partial_path);
return g_test_run();
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 19/65] qom: convert QAPI enum properties to QAPI-aware registration
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (17 preceding siblings ...)
2026-10-20 10:45 ` [PATCH v7 18/65] tests: update check-qom-proplist for QAPI-aware property registration Marc-André Lureau
@ 2026-10-20 10:45 ` Marc-André Lureau
2026-10-20 10:45 ` [PATCH v7 20/65] qom: convert struct " Marc-André Lureau
` (45 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:45 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
Convert all callers of object_class_property_add_enum() but one to use
the new object_class_property_add_qapi_enum() with the
QAPI_ENUM_PROP() macro, which provides type information via
QAPITypeInfo instead of raw lookup tables and string type names.
This enables QMP QOM introspection to report accurate QAPI type names
for enum properties. Where a separate set_description call was used,
the description is now embedded in the QAPI_ENUM_PROP initializer.
Leave pc_i440fx_machine_options() for later, because enum
PCSouthBridgeOption is a handmade QAPI-like enum instead of a real
one.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
authz/list.c | 12 +++++++-----
backends/hostmem.c | 14 ++++++++------
crypto/secret_common.c | 12 +++++++-----
crypto/tlscreds.c | 12 +++++++-----
hw/microblaze/petalogix_s3adsp1800_mmu.c | 19 +++++++++++--------
include/chardev/char.h | 8 --------
monitor/qmp.c | 12 +++++++-----
net/filter.c | 10 +++++++---
target/i386/kvm/kvm.c | 30 +++++++++++++++++-------------
ui/console-vc.c | 8 +++++++-
ui/dbus.c | 18 ++++++++++++++----
ui/input-linux.c | 11 +++++++----
12 files changed, 99 insertions(+), 67 deletions(-)
diff --git a/authz/list.c b/authz/list.c
index 17aa0efd80e8..363b2ee12c98 100644
--- a/authz/list.c
+++ b/authz/list.c
@@ -22,6 +22,7 @@
#include "authz/list.h"
#include "trace.h"
#include "qom/object_interfaces.h"
+#include "qapi/qapi-type-infos-authz.h"
#include "qapi/qapi-visit-authz.h"
#include "qemu/module.h"
@@ -120,11 +121,12 @@ qauthz_list_class_init(ObjectClass *oc, const void *data)
{
QAuthZClass *authz = QAUTHZ_CLASS(oc);
- object_class_property_add_enum(oc, "policy",
- "QAuthZListPolicy",
- &QAuthZListPolicy_lookup,
- qauthz_list_prop_get_policy,
- qauthz_list_prop_set_policy);
+ object_class_property_add_qapi_enum(oc, QAPI_ENUM_PROP(
+ .name = "policy",
+ .qapi_type = &QAuthZListPolicy_type_info,
+ .get = qauthz_list_prop_get_policy,
+ .set = qauthz_list_prop_set_policy,
+ ));
object_class_property_add(oc, "rules", "QAuthZListRule",
qauthz_list_prop_get_rules,
diff --git a/backends/hostmem.c b/backends/hostmem.c
index 8782c8b1ea98..edb8e6ab4502 100644
--- a/backends/hostmem.c
+++ b/backends/hostmem.c
@@ -16,6 +16,7 @@
#include "hw/core/boards.h"
#include "qapi/error.h"
#include "qapi/qapi-builtin-visit.h"
+#include "qapi/qapi-type-infos-common.h"
#include "qapi/visitor.h"
#include "qemu/config-file.h"
#include "qom/compat-properties.h"
@@ -551,12 +552,13 @@ host_memory_backend_class_init(ObjectClass *oc, const void *data)
NULL, NULL);
object_class_property_set_description(oc, "host-nodes",
"Binds memory to the list of NUMA host nodes");
- object_class_property_add_enum(oc, "policy", "HostMemPolicy",
- &HostMemPolicy_lookup,
- host_memory_backend_get_policy,
- host_memory_backend_set_policy);
- object_class_property_set_description(oc, "policy",
- "Set the NUMA policy");
+ object_class_property_add_qapi_enum(oc, QAPI_ENUM_PROP(
+ .name = "policy",
+ .description = "Set the NUMA policy",
+ .qapi_type = &HostMemPolicy_type_info,
+ .get = host_memory_backend_get_policy,
+ .set = host_memory_backend_set_policy,
+ ));
object_class_property_add_bool(oc, "share",
host_memory_backend_get_share, host_memory_backend_set_share);
object_class_property_set_description(oc, "share",
diff --git a/crypto/secret_common.c b/crypto/secret_common.c
index a5ecb876aeba..381d23ecc8e0 100644
--- a/crypto/secret_common.c
+++ b/crypto/secret_common.c
@@ -22,6 +22,7 @@
#include "crypto/secret_common.h"
#include "crypto/cipher.h"
#include "qapi/error.h"
+#include "qapi/qapi-type-infos-crypto.h"
#include "qom/object_interfaces.h"
#include "qemu/base64.h"
#include "qemu/module.h"
@@ -269,11 +270,12 @@ qcrypto_secret_class_init(ObjectClass *oc, const void *data)
ucc->complete = qcrypto_secret_complete;
- object_class_property_add_enum(oc, "format",
- "QCryptoSecretFormat",
- &QCryptoSecretFormat_lookup,
- qcrypto_secret_prop_get_format,
- qcrypto_secret_prop_set_format);
+ object_class_property_add_qapi_enum(oc, QAPI_ENUM_PROP(
+ .name = "format",
+ .qapi_type = &QCryptoSecretFormat_type_info,
+ .get = qcrypto_secret_prop_get_format,
+ .set = qcrypto_secret_prop_set_format,
+ ));
object_class_property_add_str(oc, "keyid",
qcrypto_secret_prop_get_keyid,
qcrypto_secret_prop_set_keyid);
diff --git a/crypto/tlscreds.c b/crypto/tlscreds.c
index fb09e295a65c..54859720bf74 100644
--- a/crypto/tlscreds.c
+++ b/crypto/tlscreds.c
@@ -20,6 +20,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
+#include "qapi/qapi-type-infos-crypto.h"
#include "qapi-types-crypto.h"
#include "qemu/module.h"
#include "qemu/error-report.h"
@@ -221,11 +222,12 @@ qcrypto_tls_creds_class_init(ObjectClass *oc, const void *data)
object_class_property_add_str(oc, "dir",
qcrypto_tls_creds_prop_get_dir,
qcrypto_tls_creds_prop_set_dir);
- object_class_property_add_enum(oc, "endpoint",
- "QCryptoTLSCredsEndpoint",
- &QCryptoTLSCredsEndpoint_lookup,
- qcrypto_tls_creds_prop_get_endpoint,
- qcrypto_tls_creds_prop_set_endpoint);
+ object_class_property_add_qapi_enum(oc, QAPI_ENUM_PROP(
+ .name = "endpoint",
+ .qapi_type = &QCryptoTLSCredsEndpoint_type_info,
+ .get = qcrypto_tls_creds_prop_get_endpoint,
+ .set = qcrypto_tls_creds_prop_set_endpoint,
+ ));
object_class_property_add_str(oc, "priority",
qcrypto_tls_creds_prop_get_priority,
qcrypto_tls_creds_prop_set_priority);
diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petalogix_s3adsp1800_mmu.c
index c5f64319009b..9a8fcc667812 100644
--- a/hw/microblaze/petalogix_s3adsp1800_mmu.c
+++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c
@@ -27,6 +27,7 @@
#include "qemu/target-info.h"
#include "qemu/units.h"
#include "qapi/error.h"
+#include "qapi/qapi-type-infos-common.h"
#include "target/microblaze/cpu.h"
#include "hw/core/sysbus.h"
#include "net/net.h"
@@ -174,14 +175,16 @@ static void petalogix_s3adsp1800_machine_class_init(ObjectClass *oc,
mc->init = petalogix_s3adsp1800_init;
mc->is_default = true;
- prop = object_class_property_add_enum(oc, "endianness", "EndianMode",
- &EndianMode_lookup,
- machine_get_endianness,
- machine_set_endianness);
- object_property_set_default_str(prop, target_big_endian() ? "big"
- : "little");
- object_class_property_set_description(oc, "endianness",
- "Defines whether the machine runs in big or little endian mode");
+ prop = object_class_property_add_qapi_enum(oc, QAPI_ENUM_PROP(
+ .name = "endianness",
+ .description =
+ "Defines whether the machine runs in big or little endian mode",
+ .qapi_type = &EndianMode_type_info,
+ .get = machine_get_endianness,
+ .set = machine_set_endianness,
+ ));
+ object_property_set_default_enum(prop,
+ target_big_endian() ? ENDIAN_MODE_BIG : ENDIAN_MODE_LITTLE);
}
static const TypeInfo petalogix_s3adsp1800_machine_types[] = {
diff --git a/include/chardev/char.h b/include/chardev/char.h
index 2616c19cc095..21bf85d197eb 100644
--- a/include/chardev/char.h
+++ b/include/chardev/char.h
@@ -352,12 +352,4 @@ static void set_encoding(Object *obj, int value, Error **errp) \
cast_func(obj)->encoding = value; \
}
-static inline void chardev_vc_add_encoding_prop(ObjectClass *oc,
- int (*get)(Object *, Error **),
- void (*set)(Object *, int, Error **))
-{
- object_class_property_add_enum(oc, "encoding", "ChardevVCEncoding",
- &ChardevVCEncoding_lookup, get, set);
-}
-
#endif
diff --git a/monitor/qmp.c b/monitor/qmp.c
index eb44012643f6..c2849214d58b 100644
--- a/monitor/qmp.c
+++ b/monitor/qmp.c
@@ -30,6 +30,7 @@
#include "qapi/error.h"
#include "qapi/qapi-commands-control.h"
#include "qapi/qapi-commands-char.h"
+#include "qapi/qapi-type-infos-qom.h"
#include "qobject/qdict.h"
#include "qobject/qjson.h"
#include "qobject/qlist.h"
@@ -133,11 +134,12 @@ static void monitor_qmp_class_init(ObjectClass *cls, const void *data)
object_class_property_add_bool(cls, "pretty",
monitor_qmp_get_pretty,
monitor_qmp_set_pretty);
- object_class_property_add_enum(cls, "close-action",
- "MonitorQMPCloseAction",
- &MonitorQMPCloseAction_lookup,
- monitor_qmp_get_close_action,
- monitor_qmp_set_close_action);
+ object_class_property_add_qapi_enum(cls, QAPI_ENUM_PROP(
+ .name = "close-action",
+ .qapi_type = &MonitorQMPCloseAction_type_info,
+ .get = monitor_qmp_get_close_action,
+ .set = monitor_qmp_set_close_action,
+ ));
moncls->emit_event = monitor_qmp_emit_event;
moncls->requires_iothread = monitor_qmp_requires_iothread;
diff --git a/net/filter.c b/net/filter.c
index 389f3b0bfefb..79883af22a54 100644
--- a/net/filter.c
+++ b/net/filter.c
@@ -8,6 +8,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
+#include "qapi/qapi-type-infos-common.h"
#include "qapi/qmp/qerror.h"
#include "qemu/error-report.h"
@@ -342,9 +343,12 @@ static void netfilter_class_init(ObjectClass *oc, const void *data)
object_class_property_add_str(oc, "netdev",
netfilter_get_netdev_id, netfilter_set_netdev_id);
- object_class_property_add_enum(oc, "queue", "NetFilterDirection",
- &NetFilterDirection_lookup,
- netfilter_get_direction, netfilter_set_direction);
+ object_class_property_add_qapi_enum(oc, QAPI_ENUM_PROP(
+ .name = "queue",
+ .qapi_type = &NetFilterDirection_type_info,
+ .get = netfilter_get_direction,
+ .set = netfilter_set_direction,
+ ));
object_class_property_add_str(oc, "status",
netfilter_get_status, netfilter_set_status);
object_class_property_add_str(oc, "position",
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
index da922f72d71e..f2e8dc8c156d 100644
--- a/target/i386/kvm/kvm.c
+++ b/target/i386/kvm/kvm.c
@@ -14,6 +14,8 @@
#include "qemu/osdep.h"
#include "qapi/qapi-events-run-state.h"
+#include "qapi/qapi-type-infos-common.h"
+#include "qapi/qapi-type-infos-run-state.h"
#include "qapi/error.h"
#include "qapi/visitor.h"
#include <math.h>
@@ -7089,12 +7091,13 @@ static void kvm_arch_set_honor_guest_pat(Object *obj, int value, Error **errp)
void kvm_arch_accel_class_init(ObjectClass *oc)
{
- object_class_property_add_enum(oc, "notify-vmexit", "NotifyVMexitOption",
- &NotifyVmexitOption_lookup,
- kvm_arch_get_notify_vmexit,
- kvm_arch_set_notify_vmexit);
- object_class_property_set_description(oc, "notify-vmexit",
- "Enable notify VM exit");
+ object_class_property_add_qapi_enum(oc, QAPI_ENUM_PROP(
+ .name = "notify-vmexit",
+ .description = "Enable notify VM exit",
+ .qapi_type = &NotifyVmexitOption_type_info,
+ .get = kvm_arch_get_notify_vmexit,
+ .set = kvm_arch_set_notify_vmexit,
+ ));
object_class_property_add(oc, "notify-window", "uint32",
kvm_arch_get_notify_window,
@@ -7127,13 +7130,14 @@ void kvm_arch_accel_class_init(ObjectClass *oc)
object_class_property_set_description(oc, "xen-evtchn-max-pirq",
"Maximum number of Xen PIRQs");
- object_class_property_add_enum(oc, "honor-guest-pat", "OnOffAuto",
- &OnOffAuto_lookup,
- kvm_arch_get_honor_guest_pat,
- kvm_arch_set_honor_guest_pat);
- object_class_property_set_description(oc, "honor-guest-pat",
- "Disable KVM quirk that ignores guest PAT "
- "memory type settings (default: auto)");
+ object_class_property_add_qapi_enum(oc, QAPI_ENUM_PROP(
+ .name = "honor-guest-pat",
+ .description = "Disable KVM quirk that ignores guest PAT "
+ "memory type settings (default: auto)",
+ .qapi_type = &OnOffAuto_type_info,
+ .get = kvm_arch_get_honor_guest_pat,
+ .set = kvm_arch_set_honor_guest_pat,
+ ));
}
void kvm_set_max_apic_id(uint32_t max_apic_id)
diff --git a/ui/console-vc.c b/ui/console-vc.c
index 99cc8f09c887..cca4790c993c 100644
--- a/ui/console-vc.c
+++ b/ui/console-vc.c
@@ -6,6 +6,7 @@
#include "chardev/char.h"
#include "qapi/error.h"
+#include "qapi/qapi-type-infos-char.h"
#include "qemu/option.h"
#include "qemu/queue.h"
#include "qom/compat-properties.h"
@@ -326,7 +327,12 @@ static void char_vc_class_init(ObjectClass *oc, const void *data)
cc->supports_size_opts = true;
cc->supports_encoding_opts = true;
- chardev_vc_add_encoding_prop(oc, get_encoding, set_encoding);
+ object_class_property_add_qapi_enum(oc, QAPI_ENUM_PROP(
+ .name = "encoding",
+ .qapi_type = &ChardevVCEncoding_type_info,
+ .get = get_encoding,
+ .set = set_encoding,
+ ));
}
static void char_vc_init(Object *obj)
diff --git a/ui/dbus.c b/ui/dbus.c
index 7be0f8e26119..afc321514c68 100644
--- a/ui/dbus.c
+++ b/ui/dbus.c
@@ -38,6 +38,8 @@
#include "qemu/audio.h"
#include "audio/audio_int.h" /* FIXME: use QOM dynamic cast instead of drv->name */
#include "qapi/error.h"
+#include "qapi/qapi-type-infos-char.h"
+#include "qapi/qapi-type-infos-ui.h"
#include "trace.h"
#include "dbus.h"
@@ -508,9 +510,12 @@ dbus_display_class_init(ObjectClass *oc, const void *data)
object_class_property_add_bool(oc, "p2p", get_dbus_p2p, set_dbus_p2p);
object_class_property_add_str(oc, "addr", get_dbus_addr, set_dbus_addr);
object_class_property_add_str(oc, "audiodev", get_audiodev, set_audiodev);
- object_class_property_add_enum(oc, "gl-mode",
- "DisplayGLMode", &DisplayGLMode_lookup,
- get_gl_mode, set_gl_mode);
+ object_class_property_add_qapi_enum(oc, QAPI_ENUM_PROP(
+ .name = "gl-mode",
+ .qapi_type = &DisplayGLMode_type_info,
+ .get = get_gl_mode,
+ .set = set_gl_mode,
+ ));
}
#define TYPE_CHARDEV_VC "chardev-vc"
@@ -602,7 +607,12 @@ dbus_vc_class_init(ObjectClass *oc, const void *data)
cc->chr_open = dbus_vc_open;
cc->supports_encoding_opts = true;
- chardev_vc_add_encoding_prop(oc, get_encoding, set_encoding);
+ object_class_property_add_qapi_enum(oc, QAPI_ENUM_PROP(
+ .name = "encoding",
+ .qapi_type = &ChardevVCEncoding_type_info,
+ .get = get_encoding,
+ .set = set_encoding,
+ ));
}
static void
diff --git a/ui/input-linux.c b/ui/input-linux.c
index f4eee1ffd7ec..715d1f589297 100644
--- a/ui/input-linux.c
+++ b/ui/input-linux.c
@@ -6,6 +6,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
+#include "qapi/qapi-type-infos-common.h"
#include "qemu/config-file.h"
#include "qemu/main-loop.h"
#include "qemu/module.h"
@@ -506,10 +507,12 @@ static void input_linux_class_init(ObjectClass *oc, const void *data)
object_class_property_add_bool(oc, "repeat",
input_linux_get_repeat,
input_linux_set_repeat);
- object_class_property_add_enum(oc, "grab-toggle", "GrabToggleKeys",
- &GrabToggleKeys_lookup,
- input_linux_get_grab_toggle,
- input_linux_set_grab_toggle);
+ object_class_property_add_qapi_enum(oc, QAPI_ENUM_PROP(
+ .name = "grab-toggle",
+ .qapi_type = &GrabToggleKeys_type_info,
+ .get = input_linux_get_grab_toggle,
+ .set = input_linux_set_grab_toggle,
+ ));
}
static const TypeInfo input_linux_info = {
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 20/65] qom: convert struct properties to QAPI-aware registration
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (18 preceding siblings ...)
2026-10-20 10:45 ` [PATCH v7 19/65] qom: convert QAPI enum properties to QAPI-aware registration Marc-André Lureau
@ 2026-10-20 10:45 ` Marc-André Lureau
2026-10-20 10:45 ` [PATCH v7 21/65] x86: convert OnOffAuto " Marc-André Lureau
` (44 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:45 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
Convert all callers of object_property_add() and
object_class_property_add() that register struct-typed properties with
QAPI visitor-based getters/setters to use object_property_add_qapi() and
object_class_property_add_qapi() instead.
This replaces the manual string type name with a reference to the
generated QAPITypeInfo constant, enabling QMP introspection to report
accurate QAPI type information for struct properties. Existing
getters/setters are preserved unchanged.
The cxl-fmw property type is corrected from "CXLFixedMemoryWindow"
(not a real QAPI type) to "CXLFixedMemoryWindowOptionsList", along with
other mis-typed list properties.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
authz/list.c | 2 +-
block/throttle-groups.c | 5 +++--
chardev/char-socket.c | 3 ++-
hw/core/machine.c | 11 +++++++----
hw/cxl/cxl-host.c | 4 +++-
hw/remote/vfio-user-obj.c | 5 +++--
hw/vfio-user/pci.c | 5 +++--
target/i386/cpu.c | 11 ++++++++---
target/i386/kvm/tdx.c | 4 +++-
target/s390x/cpu-system.c | 4 +++-
10 files changed, 36 insertions(+), 18 deletions(-)
diff --git a/authz/list.c b/authz/list.c
index 363b2ee12c98..3efbe1fa1687 100644
--- a/authz/list.c
+++ b/authz/list.c
@@ -128,7 +128,7 @@ qauthz_list_class_init(ObjectClass *oc, const void *data)
.set = qauthz_list_prop_set_policy,
));
- object_class_property_add(oc, "rules", "QAuthZListRule",
+ object_class_property_add_qapi(oc, "rules", &QAuthZListRuleList_type_info,
qauthz_list_prop_get_rules,
qauthz_list_prop_set_rules,
NULL, NULL);
diff --git a/block/throttle-groups.c b/block/throttle-groups.c
index 37814b84fe09..987867477acc 100644
--- a/block/throttle-groups.c
+++ b/block/throttle-groups.c
@@ -31,6 +31,7 @@
#include "qemu/thread.h"
#include "system/qtest.h"
#include "qapi/error.h"
+#include "qapi/qapi-type-infos-block-core.h"
#include "qapi/qapi-visit-block-core.h"
#include "qom/object.h"
#include "qom/object_interfaces.h"
@@ -993,8 +994,8 @@ static void throttle_group_obj_class_init(ObjectClass *klass,
}
/* ThrottleLimits */
- object_class_property_add(klass,
- "limits", "ThrottleLimits",
+ object_class_property_add_qapi(klass,
+ "limits", &ThrottleLimits_type_info,
throttle_group_get_limits,
throttle_group_set_limits,
NULL, NULL);
diff --git a/chardev/char-socket.c b/chardev/char-socket.c
index 81bac42a1587..8e0e5d4343aa 100644
--- a/chardev/char-socket.c
+++ b/chardev/char-socket.c
@@ -31,6 +31,7 @@
#include "qemu/option.h"
#include "qapi/error.h"
#include "qapi/clone-visitor.h"
+#include "qapi/qapi-type-infos-sockets.h"
#include "qapi/qapi-visit-sockets.h"
#include "qemu/yank.h"
#include "trace.h"
@@ -1568,7 +1569,7 @@ static void char_socket_class_init(ObjectClass *oc, const void *data)
cc->chr_listener_cleanup = tcp_chr_listener_cleanup;
cc->chr_get_filename = tcp_chr_get_filename;
- object_class_property_add(oc, "addr", "SocketAddress",
+ object_class_property_add_qapi(oc, "addr", &SocketAddress_type_info,
char_socket_get_addr, NULL,
NULL, NULL);
diff --git a/hw/core/machine.c b/hw/core/machine.c
index d9ac4b419a36..94737e17e66f 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -18,6 +18,7 @@
#include "hw/core/loader.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
+#include "qapi/qapi-type-infos-machine.h"
#include "qapi/qapi-visit-machine.h"
#include "qapi/qapi-commands-machine.h"
#include "qemu/madvise.h"
@@ -1118,19 +1119,20 @@ static void machine_class_init(ObjectClass *oc, const void *data)
object_class_property_set_description(oc, "dumpdtb",
"Dump current dtb to a file and quit");
- object_class_property_add(oc, "boot", "BootConfiguration",
+ object_class_property_add_qapi(oc, "boot", &BootConfiguration_type_info,
machine_get_boot, machine_set_boot,
NULL, NULL);
object_class_property_set_description(oc, "boot",
"Boot configuration");
- object_class_property_add(oc, "smp", "SMPConfiguration",
+ object_class_property_add_qapi(oc, "smp", &SMPConfiguration_type_info,
machine_get_smp, machine_set_smp,
NULL, NULL);
object_class_property_set_description(oc, "smp",
"CPU topology");
- object_class_property_add(oc, "smp-cache", "SmpCachePropertiesWrapper",
+ object_class_property_add_qapi(oc, "smp-cache",
+ &SmpCachePropertiesWrapper_type_info,
machine_get_smp_cache, machine_set_smp_cache, NULL, NULL);
object_class_property_set_description(oc, "smp-cache",
"Cache properties list for SMP machine");
@@ -1212,7 +1214,8 @@ static void machine_class_init(ObjectClass *oc, const void *data)
"Set RAM backend"
"Valid value is ID of hostmem based backend");
- object_class_property_add(oc, "memory", "MemorySizeConfiguration",
+ object_class_property_add_qapi(oc, "memory",
+ &MemorySizeConfiguration_type_info,
machine_get_mem, machine_set_mem,
NULL, NULL);
object_class_property_set_description(oc, "memory",
diff --git a/hw/cxl/cxl-host.c b/hw/cxl/cxl-host.c
index e279ce5fe3ae..8997bf1785c8 100644
--- a/hw/cxl/cxl-host.c
+++ b/hw/cxl/cxl-host.c
@@ -13,6 +13,7 @@
#include "system/qtest.h"
#include "hw/core/boards.h"
+#include "qapi/qapi-type-infos-machine.h"
#include "qapi/qapi-visit-machine.h"
#include "hw/cxl/cxl.h"
#include "hw/cxl/cxl_host.h"
@@ -616,7 +617,8 @@ void cxl_machine_init(Object *obj, CXLState *state)
"Set on/off to enable/disable "
"CXL instantiation");
- object_property_add(obj, "cxl-fmw", "CXLFixedMemoryWindow",
+ object_property_add_qapi(obj, "cxl-fmw",
+ &CXLFixedMemoryWindowOptionsList_type_info,
machine_get_cfmw, machine_set_cfmw,
NULL, state);
object_property_set_description(obj, "cxl-fmw",
diff --git a/hw/remote/vfio-user-obj.c b/hw/remote/vfio-user-obj.c
index a0498d218faf..7e6819f670b5 100644
--- a/hw/remote/vfio-user-obj.c
+++ b/hw/remote/vfio-user-obj.c
@@ -47,6 +47,7 @@
#include "hw/core/boards.h"
#include "hw/remote/machine.h"
#include "qapi/error.h"
+#include "qapi/qapi-type-infos-sockets.h"
#include "qapi/qapi-visit-sockets.h"
#include "qapi/qapi-events-misc.h"
#include "qemu/notify.h"
@@ -931,8 +932,8 @@ static void vfu_object_class_init(ObjectClass *klass, const void *data)
k->nr_devs = 0;
- object_class_property_add(klass, "socket", "SocketAddress", NULL,
- vfu_object_set_socket, NULL, NULL);
+ object_class_property_add_qapi(klass, "socket", &SocketAddress_type_info,
+ NULL, vfu_object_set_socket, NULL, NULL);
object_class_property_set_description(klass, "socket",
"SocketAddress "
"(ex: type=unix,path=/tmp/sock). "
diff --git a/hw/vfio-user/pci.c b/hw/vfio-user/pci.c
index 983e1d4ad470..f58c4a0f3965 100644
--- a/hw/vfio-user/pci.c
+++ b/hw/vfio-user/pci.c
@@ -8,6 +8,7 @@
#include "qemu/osdep.h"
#include <sys/ioctl.h>
+#include "qapi/qapi-type-infos-sockets.h"
#include "qapi-visit-sockets.h"
#include "qemu/error-report.h"
@@ -471,8 +472,8 @@ static void vfio_user_pci_class_init(ObjectClass *klass, const void *data)
device_class_set_legacy_reset(dc, vfio_user_pci_reset);
device_class_set_props(dc, vfio_user_pci_properties);
- object_class_property_add(klass, "socket", "SocketAddress", NULL,
- vfio_user_pci_set_socket, NULL, NULL);
+ object_class_property_add_qapi(klass, "socket", &SocketAddress_type_info,
+ NULL, vfio_user_pci_set_socket, NULL, NULL);
object_class_property_set_description(klass, "socket",
"SocketAddress (UNIX sockets only)");
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 5da80ade70eb..4553ef0892a1 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -35,6 +35,8 @@
#include "sev.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
+#include "qapi/qapi-type-infos-machine.h"
+#include "qapi/qapi-type-infos-run-state.h"
#include "qapi/qapi-visit-machine.h"
#include "standard-headers/asm-x86/kvm_para.h"
#include "hw/core/qdev-properties.h"
@@ -10540,10 +10542,12 @@ static void x86_cpu_initfn(Object *obj)
x86_cpu_init_default_topo(cpu);
- object_property_add(obj, "feature-words", "X86CPUFeatureWordInfo",
+ object_property_add_qapi(obj, "feature-words",
+ &X86CPUFeatureWordInfoList_type_info,
x86_cpu_get_feature_words,
NULL, NULL, (void *)env->features);
- object_property_add(obj, "filtered-features", "X86CPUFeatureWordInfo",
+ object_property_add_qapi(obj, "filtered-features",
+ &X86CPUFeatureWordInfo_type_info,
x86_cpu_get_feature_words,
NULL, NULL, (void *)cpu->filtered_features);
@@ -11007,7 +11011,8 @@ static void x86_cpu_common_class_init(ObjectClass *oc, const void *data)
NULL, NULL);
#if !defined(CONFIG_USER_ONLY)
- object_class_property_add(oc, "crash-information", "GuestPanicInformation",
+ object_class_property_add_qapi(oc, "crash-information",
+ &GuestPanicInformation_type_info,
x86_cpu_get_crash_info_qom, NULL, NULL, NULL);
#endif
diff --git a/target/i386/kvm/tdx.c b/target/i386/kvm/tdx.c
index 8294dbde3aa8..81c5ba3a1b54 100644
--- a/target/i386/kvm/tdx.c
+++ b/target/i386/kvm/tdx.c
@@ -14,6 +14,7 @@
#include "qemu/base64.h"
#include "qemu/mmap-alloc.h"
#include "qapi/error.h"
+#include "qapi/qapi-type-infos-sockets.h"
#include "qapi/qapi-visit-sockets.h"
#include "qom/object_interfaces.h"
#include "crypto/hash.h"
@@ -1586,7 +1587,8 @@ static void tdx_guest_init(Object *obj)
tdx_guest_get_mrownerconfig,
tdx_guest_set_mrownerconfig);
- object_property_add(obj, "quote-generation-socket", "SocketAddress",
+ object_property_add_qapi(obj, "quote-generation-socket",
+ &SocketAddress_type_info,
tdx_guest_get_qgs,
tdx_guest_set_qgs,
NULL, NULL);
diff --git a/target/s390x/cpu-system.c b/target/s390x/cpu-system.c
index d963d9e940e1..30992ef654f4 100644
--- a/target/s390x/cpu-system.c
+++ b/target/s390x/cpu-system.c
@@ -30,6 +30,7 @@
#include "system/reset.h"
#include "qemu/timer.h"
#include "trace.h"
+#include "qapi/qapi-type-infos-run-state.h"
#include "qapi/qapi-visit-run-state.h"
#include "system/hw_accel.h"
@@ -137,7 +138,8 @@ void s390_cpu_system_init(Object *obj)
S390CPU *cpu = S390_CPU(obj);
cs->start_powered_off = true;
- object_property_add(obj, "crash-information", "GuestPanicInformation",
+ object_property_add_qapi(obj, "crash-information",
+ &GuestPanicInformation_type_info,
s390_cpu_get_crash_info_qom, NULL, NULL, NULL);
cpu->env.tod_timer =
timer_new_ns(QEMU_CLOCK_VIRTUAL, s390x_tod_timer, cpu);
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 21/65] x86: convert OnOffAuto properties to QAPI-aware registration
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (19 preceding siblings ...)
2026-10-20 10:45 ` [PATCH v7 20/65] qom: convert struct " Marc-André Lureau
@ 2026-10-20 10:45 ` Marc-André Lureau
2026-10-20 10:45 ` [PATCH v7 22/65] microvm: " Marc-André Lureau
` (43 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:45 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
Convert the smm, acpi, pit, and pic OnOffAuto properties from
manual visitor-based callbacks to property_add_qapi_enum().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
hw/i386/x86.c | 104 +++++++++++++++++++++++++---------------------------------
1 file changed, 45 insertions(+), 59 deletions(-)
diff --git a/hw/i386/x86.c b/hw/i386/x86.c
index f8ba3244e221..63f297a10532 100644
--- a/hw/i386/x86.c
+++ b/hw/i386/x86.c
@@ -24,7 +24,7 @@
#include "qemu/error-report.h"
#include "qemu/units.h"
#include "qapi/error.h"
-#include "qapi/qapi-visit-common.h"
+#include "qapi/qapi-type-infos-common.h"
#include "qapi/qapi-visit-machine.h"
#include "qapi/visitor.h"
#include "system/qtest.h"
@@ -188,21 +188,16 @@ bool x86_machine_is_smm_enabled(const X86MachineState *x86ms)
return false;
}
-static void x86_machine_get_smm(Object *obj, Visitor *v, const char *name,
- void *opaque, Error **errp)
+static int x86_machine_get_smm(Object *obj, Error **errp)
{
X86MachineState *x86ms = X86_MACHINE(obj);
- OnOffAuto smm = x86ms->smm;
-
- visit_type_OnOffAuto(v, name, &smm, errp);
+ return x86ms->smm;
}
-static void x86_machine_set_smm(Object *obj, Visitor *v, const char *name,
- void *opaque, Error **errp)
+static void x86_machine_set_smm(Object *obj, int value, Error **errp)
{
X86MachineState *x86ms = X86_MACHINE(obj);
-
- visit_type_OnOffAuto(v, name, &x86ms->smm, errp);
+ x86ms->smm = value;
}
bool x86_machine_is_acpi_enabled(const X86MachineState *x86ms)
@@ -213,55 +208,40 @@ bool x86_machine_is_acpi_enabled(const X86MachineState *x86ms)
return true;
}
-static void x86_machine_get_acpi(Object *obj, Visitor *v, const char *name,
- void *opaque, Error **errp)
+static int x86_machine_get_acpi(Object *obj, Error **errp)
{
X86MachineState *x86ms = X86_MACHINE(obj);
- OnOffAuto acpi = x86ms->acpi;
-
- visit_type_OnOffAuto(v, name, &acpi, errp);
+ return x86ms->acpi;
}
-static void x86_machine_set_acpi(Object *obj, Visitor *v, const char *name,
- void *opaque, Error **errp)
+static void x86_machine_set_acpi(Object *obj, int value, Error **errp)
{
X86MachineState *x86ms = X86_MACHINE(obj);
-
- visit_type_OnOffAuto(v, name, &x86ms->acpi, errp);
+ x86ms->acpi = value;
}
-static void x86_machine_get_pit(Object *obj, Visitor *v, const char *name,
- void *opaque, Error **errp)
+static int x86_machine_get_pit(Object *obj, Error **errp)
{
X86MachineState *x86ms = X86_MACHINE(obj);
- OnOffAuto pit = x86ms->pit;
-
- visit_type_OnOffAuto(v, name, &pit, errp);
+ return x86ms->pit;
}
-static void x86_machine_set_pit(Object *obj, Visitor *v, const char *name,
- void *opaque, Error **errp)
+static void x86_machine_set_pit(Object *obj, int value, Error **errp)
{
X86MachineState *x86ms = X86_MACHINE(obj);
-
- visit_type_OnOffAuto(v, name, &x86ms->pit, errp);
+ x86ms->pit = value;
}
-static void x86_machine_get_pic(Object *obj, Visitor *v, const char *name,
- void *opaque, Error **errp)
+static int x86_machine_get_pic(Object *obj, Error **errp)
{
X86MachineState *x86ms = X86_MACHINE(obj);
- OnOffAuto pic = x86ms->pic;
-
- visit_type_OnOffAuto(v, name, &pic, errp);
+ return x86ms->pic;
}
-static void x86_machine_set_pic(Object *obj, Visitor *v, const char *name,
- void *opaque, Error **errp)
+static void x86_machine_set_pic(Object *obj, int value, Error **errp)
{
X86MachineState *x86ms = X86_MACHINE(obj);
-
- visit_type_OnOffAuto(v, name, &x86ms->pic, errp);
+ x86ms->pic = value;
}
static char *x86_machine_get_oem_id(Object *obj, Error **errp)
@@ -391,31 +371,37 @@ static void x86_machine_class_init(ObjectClass *oc, const void *data)
mc->kvm_type = x86_kvm_type;
nc->raise_nmi = x86_nmi;
- object_class_property_add(oc, X86_MACHINE_SMM, "OnOffAuto",
- x86_machine_get_smm, x86_machine_set_smm,
- NULL, NULL);
- object_class_property_set_description(oc, X86_MACHINE_SMM,
- "Enable SMM");
+ object_class_property_add_qapi_enum(oc, QAPI_ENUM_PROP(
+ .name = X86_MACHINE_SMM,
+ .description = "Enable SMM",
+ .qapi_type = &OnOffAuto_type_info,
+ .get = x86_machine_get_smm,
+ .set = x86_machine_set_smm,
+ ));
- object_class_property_add(oc, X86_MACHINE_ACPI, "OnOffAuto",
- x86_machine_get_acpi, x86_machine_set_acpi,
- NULL, NULL);
- object_class_property_set_description(oc, X86_MACHINE_ACPI,
- "Enable ACPI");
+ object_class_property_add_qapi_enum(oc, QAPI_ENUM_PROP(
+ .name = X86_MACHINE_ACPI,
+ .description = "Enable ACPI",
+ .qapi_type = &OnOffAuto_type_info,
+ .get = x86_machine_get_acpi,
+ .set = x86_machine_set_acpi,
+ ));
- object_class_property_add(oc, X86_MACHINE_PIT, "OnOffAuto",
- x86_machine_get_pit,
- x86_machine_set_pit,
- NULL, NULL);
- object_class_property_set_description(oc, X86_MACHINE_PIT,
- "Enable i8254 PIT");
+ object_class_property_add_qapi_enum(oc, QAPI_ENUM_PROP(
+ .name = X86_MACHINE_PIT,
+ .description = "Enable i8254 PIT",
+ .qapi_type = &OnOffAuto_type_info,
+ .get = x86_machine_get_pit,
+ .set = x86_machine_set_pit,
+ ));
- object_class_property_add(oc, X86_MACHINE_PIC, "OnOffAuto",
- x86_machine_get_pic,
- x86_machine_set_pic,
- NULL, NULL);
- object_class_property_set_description(oc, X86_MACHINE_PIC,
- "Enable i8259 PIC");
+ object_class_property_add_qapi_enum(oc, QAPI_ENUM_PROP(
+ .name = X86_MACHINE_PIC,
+ .description = "Enable i8259 PIC",
+ .qapi_type = &OnOffAuto_type_info,
+ .get = x86_machine_get_pic,
+ .set = x86_machine_set_pic,
+ ));
object_class_property_add_str(oc, X86_MACHINE_OEM_ID,
x86_machine_get_oem_id,
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 22/65] microvm: convert OnOffAuto properties to QAPI-aware registration
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (20 preceding siblings ...)
2026-10-20 10:45 ` [PATCH v7 21/65] x86: convert OnOffAuto " Marc-André Lureau
@ 2026-10-20 10:45 ` Marc-André Lureau
2026-10-20 10:45 ` [PATCH v7 23/65] pc: convert OnOffAuto vmport property " Marc-André Lureau
` (42 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:45 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
Convert the rtc, pcie, and ioapic2 OnOffAuto properties from
manual visitor-based callbacks to property_add_qapi_enum().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
hw/i386/microvm.c | 80 +++++++++++++++++++++++--------------------------------
1 file changed, 34 insertions(+), 46 deletions(-)
diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c
index a49de3374979..1d1ca172bfbd 100644
--- a/hw/i386/microvm.c
+++ b/hw/i386/microvm.c
@@ -21,7 +21,7 @@
#include "qemu/units.h"
#include "qapi/error.h"
#include "qapi/visitor.h"
-#include "qapi/qapi-visit-common.h"
+#include "qapi/qapi-type-infos-common.h"
#include "system/system.h"
#include "system/cpus.h"
#include "system/numa.h"
@@ -519,55 +519,40 @@ static void microvm_machine_reset(MachineState *machine, ResetType type)
}
}
-static void microvm_machine_get_rtc(Object *obj, Visitor *v, const char *name,
- void *opaque, Error **errp)
+static int microvm_machine_get_rtc(Object *obj, Error **errp)
{
MicrovmMachineState *mms = MICROVM_MACHINE(obj);
- OnOffAuto rtc = mms->rtc;
-
- visit_type_OnOffAuto(v, name, &rtc, errp);
+ return mms->rtc;
}
-static void microvm_machine_set_rtc(Object *obj, Visitor *v, const char *name,
- void *opaque, Error **errp)
+static void microvm_machine_set_rtc(Object *obj, int value, Error **errp)
{
MicrovmMachineState *mms = MICROVM_MACHINE(obj);
-
- visit_type_OnOffAuto(v, name, &mms->rtc, errp);
+ mms->rtc = value;
}
-static void microvm_machine_get_pcie(Object *obj, Visitor *v, const char *name,
- void *opaque, Error **errp)
+static int microvm_machine_get_pcie(Object *obj, Error **errp)
{
MicrovmMachineState *mms = MICROVM_MACHINE(obj);
- OnOffAuto pcie = mms->pcie;
-
- visit_type_OnOffAuto(v, name, &pcie, errp);
+ return mms->pcie;
}
-static void microvm_machine_set_pcie(Object *obj, Visitor *v, const char *name,
- void *opaque, Error **errp)
+static void microvm_machine_set_pcie(Object *obj, int value, Error **errp)
{
MicrovmMachineState *mms = MICROVM_MACHINE(obj);
-
- visit_type_OnOffAuto(v, name, &mms->pcie, errp);
+ mms->pcie = value;
}
-static void microvm_machine_get_ioapic2(Object *obj, Visitor *v, const char *name,
- void *opaque, Error **errp)
+static int microvm_machine_get_ioapic2(Object *obj, Error **errp)
{
MicrovmMachineState *mms = MICROVM_MACHINE(obj);
- OnOffAuto ioapic2 = mms->ioapic2;
-
- visit_type_OnOffAuto(v, name, &ioapic2, errp);
+ return mms->ioapic2;
}
-static void microvm_machine_set_ioapic2(Object *obj, Visitor *v, const char *name,
- void *opaque, Error **errp)
+static void microvm_machine_set_ioapic2(Object *obj, int value, Error **errp)
{
MicrovmMachineState *mms = MICROVM_MACHINE(obj);
-
- visit_type_OnOffAuto(v, name, &mms->ioapic2, errp);
+ mms->ioapic2 = value;
}
static bool microvm_machine_get_isa_serial(Object *obj, Error **errp)
@@ -673,26 +658,29 @@ static void microvm_class_init(ObjectClass *oc, const void *data)
hc->unplug_request = microvm_device_unplug_request_cb;
hc->unplug = microvm_device_unplug_cb;
- object_class_property_add(oc, MICROVM_MACHINE_RTC, "OnOffAuto",
- microvm_machine_get_rtc,
- microvm_machine_set_rtc,
- NULL, NULL);
- object_class_property_set_description(oc, MICROVM_MACHINE_RTC,
- "Enable MC146818 RTC");
+ object_class_property_add_qapi_enum(oc, QAPI_ENUM_PROP(
+ .name = MICROVM_MACHINE_RTC,
+ .description = "Enable MC146818 RTC",
+ .qapi_type = &OnOffAuto_type_info,
+ .get = microvm_machine_get_rtc,
+ .set = microvm_machine_set_rtc,
+ ));
- object_class_property_add(oc, MICROVM_MACHINE_PCIE, "OnOffAuto",
- microvm_machine_get_pcie,
- microvm_machine_set_pcie,
- NULL, NULL);
- object_class_property_set_description(oc, MICROVM_MACHINE_PCIE,
- "Enable PCIe");
+ object_class_property_add_qapi_enum(oc, QAPI_ENUM_PROP(
+ .name = MICROVM_MACHINE_PCIE,
+ .description = "Enable PCIe",
+ .qapi_type = &OnOffAuto_type_info,
+ .get = microvm_machine_get_pcie,
+ .set = microvm_machine_set_pcie,
+ ));
- object_class_property_add(oc, MICROVM_MACHINE_IOAPIC2, "OnOffAuto",
- microvm_machine_get_ioapic2,
- microvm_machine_set_ioapic2,
- NULL, NULL);
- object_class_property_set_description(oc, MICROVM_MACHINE_IOAPIC2,
- "Enable second IO-APIC");
+ object_class_property_add_qapi_enum(oc, QAPI_ENUM_PROP(
+ .name = MICROVM_MACHINE_IOAPIC2,
+ .description = "Enable second IO-APIC",
+ .qapi_type = &OnOffAuto_type_info,
+ .get = microvm_machine_get_ioapic2,
+ .set = microvm_machine_set_ioapic2,
+ ));
object_class_property_add_bool(oc, MICROVM_MACHINE_ISA_SERIAL,
microvm_machine_get_isa_serial,
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 23/65] pc: convert OnOffAuto vmport property to QAPI-aware registration
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (21 preceding siblings ...)
2026-10-20 10:45 ` [PATCH v7 22/65] microvm: " Marc-André Lureau
@ 2026-10-20 10:45 ` Marc-André Lureau
2026-10-20 10:45 ` [PATCH v7 24/65] arm/virt: convert OnOffAuto acpi " Marc-André Lureau
` (41 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:45 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
Convert the vmport OnOffAuto property from manual visitor-based
callbacks to property_add_qapi_enum().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
hw/i386/pc.c | 26 ++++++++++++--------------
1 file changed, 12 insertions(+), 14 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 2d8c87b0e34c..12de020adfbf 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -46,6 +46,7 @@
#include "kvm/kvm_i386.h"
#include "kvm/tdx.h"
#include "hw/xen/xen.h"
+#include "qapi/qapi-type-infos-common.h"
#include "qobject/qlist.h"
#include "qemu/error-report.h"
#include "hw/acpi/acpi.h"
@@ -1417,21 +1418,16 @@ static const HotplugHandler *pc_get_hotplug_handler(MachineState *machine,
return NULL;
}
-static void pc_machine_get_vmport(Object *obj, Visitor *v, const char *name,
- void *opaque, Error **errp)
+static int pc_machine_get_vmport(Object *obj, Error **errp)
{
PCMachineState *pcms = PC_MACHINE(obj);
- OnOffAuto vmport = pcms->vmport;
-
- visit_type_OnOffAuto(v, name, &vmport, errp);
+ return pcms->vmport;
}
-static void pc_machine_set_vmport(Object *obj, Visitor *v, const char *name,
- void *opaque, Error **errp)
+static void pc_machine_set_vmport(Object *obj, int value, Error **errp)
{
PCMachineState *pcms = PC_MACHINE(obj);
-
- visit_type_OnOffAuto(v, name, &pcms->vmport, errp);
+ pcms->vmport = value;
}
static bool pc_machine_get_fd_bootchk(Object *obj, Error **errp)
@@ -1728,11 +1724,13 @@ static void pc_machine_class_init(ObjectClass *oc, const void *data)
object_class_property_set_description(oc, PC_MACHINE_MAX_RAM_BELOW_4G,
"Maximum ram below the 4G boundary (32bit boundary)");
- object_class_property_add(oc, PC_MACHINE_VMPORT, "OnOffAuto",
- pc_machine_get_vmport, pc_machine_set_vmport,
- NULL, NULL);
- object_class_property_set_description(oc, PC_MACHINE_VMPORT,
- "Enable vmport (pc & q35)");
+ object_class_property_add_qapi_enum(oc, QAPI_ENUM_PROP(
+ .name = PC_MACHINE_VMPORT,
+ .description = "Enable vmport (pc & q35)",
+ .qapi_type = &OnOffAuto_type_info,
+ .get = pc_machine_get_vmport,
+ .set = pc_machine_set_vmport,
+ ));
object_class_property_add_bool(oc, PC_MACHINE_SMBUS,
pc_machine_get_smbus, pc_machine_set_smbus);
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 24/65] arm/virt: convert OnOffAuto acpi property to QAPI-aware registration
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (22 preceding siblings ...)
2026-10-20 10:45 ` [PATCH v7 23/65] pc: convert OnOffAuto vmport property " Marc-André Lureau
@ 2026-10-20 10:45 ` Marc-André Lureau
2026-10-20 10:45 ` [PATCH v7 25/65] riscv/virt: convert OnOffAuto properties " Marc-André Lureau
` (40 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:45 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
Convert the acpi OnOffAuto property from manual visitor-based
callbacks to property_add_qapi_enum().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
hw/arm/virt.c | 27 ++++++++++++---------------
1 file changed, 12 insertions(+), 15 deletions(-)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 0d56197dacee..0da10b799cfb 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -73,7 +73,7 @@
#include "whpx_arm.h"
#include "hw/firmware/smbios.h"
#include "qapi/visitor.h"
-#include "qapi/qapi-visit-common.h"
+#include "qapi/qapi-type-infos-common.h"
#include "qobject/qlist.h"
#include "standard-headers/linux/input.h"
#include "hw/arm/smmuv3.h"
@@ -3565,21 +3565,16 @@ bool virt_is_acpi_enabled(const VirtMachineState *vms)
return true;
}
-static void virt_get_acpi(Object *obj, Visitor *v, const char *name,
- void *opaque, Error **errp)
+static int virt_get_acpi(Object *obj, Error **errp)
{
VirtMachineState *vms = VIRT_MACHINE(obj);
- OnOffAuto acpi = vms->acpi;
-
- visit_type_OnOffAuto(v, name, &acpi, errp);
+ return vms->acpi;
}
-static void virt_set_acpi(Object *obj, Visitor *v, const char *name,
- void *opaque, Error **errp)
+static void virt_set_acpi(Object *obj, int value, Error **errp)
{
VirtMachineState *vms = VIRT_MACHINE(obj);
-
- visit_type_OnOffAuto(v, name, &vms->acpi, errp);
+ vms->acpi = value;
}
static bool virt_get_ras(Object *obj, Error **errp)
@@ -4207,11 +4202,13 @@ static void virt_machine_class_init(ObjectClass *oc, const void *data)
mc->default_ram_id = "mach-virt.ram";
mc->default_nic = "virtio-net-pci";
- object_class_property_add(oc, "acpi", "OnOffAuto",
- virt_get_acpi, virt_set_acpi,
- NULL, NULL);
- object_class_property_set_description(oc, "acpi",
- "Enable ACPI");
+ object_class_property_add_qapi_enum(oc, QAPI_ENUM_PROP(
+ .name = "acpi",
+ .description = "Enable ACPI",
+ .qapi_type = &OnOffAuto_type_info,
+ .get = virt_get_acpi,
+ .set = virt_set_acpi,
+ ));
object_class_property_add_bool(oc, "secure", virt_get_secure,
virt_set_secure);
object_class_property_set_description(oc, "secure",
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 25/65] riscv/virt: convert OnOffAuto properties to QAPI-aware registration
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (23 preceding siblings ...)
2026-10-20 10:45 ` [PATCH v7 24/65] arm/virt: convert OnOffAuto acpi " Marc-André Lureau
@ 2026-10-20 10:45 ` Marc-André Lureau
2026-10-20 10:45 ` [PATCH v7 26/65] loongarch/virt: " Marc-André Lureau
` (39 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:45 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
Convert the acpi and iommu-sys OnOffAuto properties from manual
visitor-based callbacks to property_add_qapi_enum().
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
hw/riscv/virt.c | 52 +++++++++++++++++++++++-----------------------------
1 file changed, 23 insertions(+), 29 deletions(-)
diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
index d4b501802f60..c33a279f1e5c 100644
--- a/hw/riscv/virt.c
+++ b/hw/riscv/virt.c
@@ -57,7 +57,7 @@
#include "hw/pci-host/gpex.h"
#include "hw/display/ramfb.h"
#include "hw/acpi/aml-build.h"
-#include "qapi/qapi-visit-common.h"
+#include "qapi/qapi-type-infos-common.h"
#include "hw/virtio/virtio-iommu.h"
#include "hw/uefi/var-service-api.h"
@@ -1049,21 +1049,16 @@ bool virt_is_iommu_sys_enabled(RISCVVirtState *s)
return s->iommu_sys == ON_OFF_AUTO_ON;
}
-static void virt_get_iommu_sys(Object *obj, Visitor *v, const char *name,
- void *opaque, Error **errp)
+static int virt_get_iommu_sys(Object *obj, Error **errp)
{
RISCVVirtState *s = RISCV_VIRT_MACHINE(obj);
- OnOffAuto iommu_sys = s->iommu_sys;
-
- visit_type_OnOffAuto(v, name, &iommu_sys, errp);
+ return s->iommu_sys;
}
-static void virt_set_iommu_sys(Object *obj, Visitor *v, const char *name,
- void *opaque, Error **errp)
+static void virt_set_iommu_sys(Object *obj, int value, Error **errp)
{
RISCVVirtState *s = RISCV_VIRT_MACHINE(obj);
-
- visit_type_OnOffAuto(v, name, &s->iommu_sys, errp);
+ s->iommu_sys = value;
}
bool virt_is_acpi_enabled(RISCVVirtState *s)
@@ -1071,21 +1066,16 @@ bool virt_is_acpi_enabled(RISCVVirtState *s)
return s->acpi != ON_OFF_AUTO_OFF;
}
-static void virt_get_acpi(Object *obj, Visitor *v, const char *name,
- void *opaque, Error **errp)
+static int virt_get_acpi(Object *obj, Error **errp)
{
RISCVVirtState *s = RISCV_VIRT_MACHINE(obj);
- OnOffAuto acpi = s->acpi;
-
- visit_type_OnOffAuto(v, name, &acpi, errp);
+ return s->acpi;
}
-static void virt_set_acpi(Object *obj, Visitor *v, const char *name,
- void *opaque, Error **errp)
+static void virt_set_acpi(Object *obj, int value, Error **errp)
{
RISCVVirtState *s = RISCV_VIRT_MACHINE(obj);
-
- visit_type_OnOffAuto(v, name, &s->acpi, errp);
+ s->acpi = value;
}
static const HotplugHandler *
@@ -1183,17 +1173,21 @@ static void virt_machine_class_init(ObjectClass *oc, const void *data)
object_class_property_set_description(oc, "aia-guests", str);
}
- object_class_property_add(oc, "acpi", "OnOffAuto",
- virt_get_acpi, virt_set_acpi,
- NULL, NULL);
- object_class_property_set_description(oc, "acpi",
- "Enable ACPI");
+ object_class_property_add_qapi_enum(oc, QAPI_ENUM_PROP(
+ .name = "acpi",
+ .description = "Enable ACPI",
+ .qapi_type = &OnOffAuto_type_info,
+ .get = virt_get_acpi,
+ .set = virt_set_acpi,
+ ));
- object_class_property_add(oc, "iommu-sys", "OnOffAuto",
- virt_get_iommu_sys, virt_set_iommu_sys,
- NULL, NULL);
- object_class_property_set_description(oc, "iommu-sys",
- "Enable IOMMU platform device");
+ object_class_property_add_qapi_enum(oc, QAPI_ENUM_PROP(
+ .name = "iommu-sys",
+ .description = "Enable IOMMU platform device",
+ .qapi_type = &OnOffAuto_type_info,
+ .get = virt_get_iommu_sys,
+ .set = virt_set_iommu_sys,
+ ));
}
static const TypeInfo virt_machine_typeinfo = {
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 26/65] loongarch/virt: convert OnOffAuto properties to QAPI-aware registration
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (24 preceding siblings ...)
2026-10-20 10:45 ` [PATCH v7 25/65] riscv/virt: convert OnOffAuto properties " Marc-André Lureau
@ 2026-10-20 10:45 ` Marc-André Lureau
2026-10-20 10:45 ` [PATCH v7 27/65] hostmem-file: convert OnOffAuto rom property " Marc-André Lureau
` (38 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:45 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
Convert the acpi, v-eiointc, and dmsi OnOffAuto properties from
manual visitor-based callbacks to property_add_qapi_enum().
Reviewed-by: Bibo Mao <maobibo@loongson.cn>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
hw/loongarch/virt.c | 85 +++++++++++++++++++++++++----------------------------
1 file changed, 40 insertions(+), 45 deletions(-)
diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index 9c5371af9dee..db8ea76f117c 100644
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -36,7 +36,8 @@
#include "target/loongarch/cpu.h"
#include "target/loongarch/cpu-mmu.h"
#include "hw/firmware/smbios.h"
-#include "qapi/qapi-visit-common.h"
+#include "qapi/qapi-type-infos-common.h"
+#include "qapi/visitor.h"
#include "hw/acpi/generic_event_device.h"
#include "hw/mem/nvdimm.h"
#include "hw/core/platform-bus.h"
@@ -51,26 +52,21 @@
#include "qemu/log.h"
#include "kvm/kvm_loongarch.h"
-static void virt_get_dmsi(Object *obj, Visitor *v, const char *name,
- void *opaque, Error **errp)
+static int virt_get_dmsi(Object *obj, Error **errp)
{
LoongArchVirtMachineState *lvms = LOONGARCH_VIRT_MACHINE(obj);
- OnOffAuto dmsi = lvms->dmsi;
-
- visit_type_OnOffAuto(v, name, &dmsi, errp);
-
+ return lvms->dmsi;
}
-static void virt_set_dmsi(Object *obj, Visitor *v, const char *name,
- void *opaque, Error **errp)
+
+static void virt_set_dmsi(Object *obj, int value, Error **errp)
{
LoongArchVirtMachineState *lvms = LOONGARCH_VIRT_MACHINE(obj);
+ lvms->dmsi = value;
- visit_type_OnOffAuto(v, name, &lvms->dmsi, errp);
-
- if (lvms->dmsi == ON_OFF_AUTO_OFF) {
+ if (value == ON_OFF_AUTO_OFF) {
lvms->misc_feature &= ~BIT(IOCSRF_DMSI);
lvms->misc_status &= ~BIT_ULL(IOCSRM_DMSI_EN);
- } else if (lvms->dmsi == ON_OFF_AUTO_ON) {
+ } else if (value == ON_OFF_AUTO_ON) {
lvms->misc_feature = BIT(IOCSRF_DMSI);
}
}
@@ -78,21 +74,16 @@ static void virt_set_dmsi(Object *obj, Visitor *v, const char *name,
#define DEFAULT_HIGH_PCIE_MMIO_SIZE_GB 64
#define DEFAULT_HIGH_PCIE_MMIO_SIZE (DEFAULT_HIGH_PCIE_MMIO_SIZE_GB * GiB)
-static void virt_get_veiointc(Object *obj, Visitor *v, const char *name,
- void *opaque, Error **errp)
+static int virt_get_veiointc(Object *obj, Error **errp)
{
LoongArchVirtMachineState *lvms = LOONGARCH_VIRT_MACHINE(obj);
- OnOffAuto veiointc = lvms->veiointc;
-
- visit_type_OnOffAuto(v, name, &veiointc, errp);
+ return lvms->veiointc;
}
-static void virt_set_veiointc(Object *obj, Visitor *v, const char *name,
- void *opaque, Error **errp)
+static void virt_set_veiointc(Object *obj, int value, Error **errp)
{
LoongArchVirtMachineState *lvms = LOONGARCH_VIRT_MACHINE(obj);
-
- visit_type_OnOffAuto(v, name, &lvms->veiointc, errp);
+ lvms->veiointc = value;
}
static bool virt_get_highmem_mmio(Object *obj, Error **errp)
@@ -1025,21 +1016,16 @@ static void virt_init(MachineState *machine)
loongarch_load_kernel(machine, &lvms->bootinfo, phys_addr_mask);
}
-static void virt_get_acpi(Object *obj, Visitor *v, const char *name,
- void *opaque, Error **errp)
+static int virt_get_acpi(Object *obj, Error **errp)
{
LoongArchVirtMachineState *lvms = LOONGARCH_VIRT_MACHINE(obj);
- OnOffAuto acpi = lvms->acpi;
-
- visit_type_OnOffAuto(v, name, &acpi, errp);
+ return lvms->acpi;
}
-static void virt_set_acpi(Object *obj, Visitor *v, const char *name,
- void *opaque, Error **errp)
+static void virt_set_acpi(Object *obj, int value, Error **errp)
{
LoongArchVirtMachineState *lvms = LOONGARCH_VIRT_MACHINE(obj);
-
- visit_type_OnOffAuto(v, name, &lvms->acpi, errp);
+ lvms->acpi = value;
}
static char *virt_get_oem_id(Object *obj, Error **errp)
@@ -1483,20 +1469,29 @@ static void virt_class_init(ObjectClass *oc, const void *data)
hc->unplug_request = virt_device_unplug_request;
hc->unplug = virt_device_unplug;
- object_class_property_add(oc, "acpi", "OnOffAuto",
- virt_get_acpi, virt_set_acpi,
- NULL, NULL);
- object_class_property_set_description(oc, "acpi",
- "Enable ACPI");
- object_class_property_add(oc, "v-eiointc", "OnOffAuto",
- virt_get_veiointc, virt_set_veiointc,
- NULL, NULL);
- object_class_property_set_description(oc, "v-eiointc",
- "Enable Virt Extend I/O Interrupt Controller.");
- object_class_property_add(oc, "dmsi", "OnOffAuto",
- virt_get_dmsi, virt_set_dmsi, NULL, NULL);
- object_class_property_set_description(oc, "dmsi",
- "Enable direct Message-interrupts Controller.");
+ object_class_property_add_qapi_enum(oc, QAPI_ENUM_PROP(
+ .name = "acpi",
+ .description = "Enable ACPI",
+ .qapi_type = &OnOffAuto_type_info,
+ .get = virt_get_acpi,
+ .set = virt_set_acpi,
+ ));
+
+ object_class_property_add_qapi_enum(oc, QAPI_ENUM_PROP(
+ .name = "v-eiointc",
+ .description = "Enable Virt Extend I/O Interrupt Controller.",
+ .qapi_type = &OnOffAuto_type_info,
+ .get = virt_get_veiointc,
+ .set = virt_set_veiointc,
+ ));
+
+ object_class_property_add_qapi_enum(oc, QAPI_ENUM_PROP(
+ .name = "dmsi",
+ .description = "Enable direct Message-interrupts Controller.",
+ .qapi_type = &OnOffAuto_type_info,
+ .get = virt_get_dmsi,
+ .set = virt_set_dmsi,
+ ));
machine_class_allow_dynamic_sysbus_dev(mc, TYPE_RAMFB_DEVICE);
machine_class_allow_dynamic_sysbus_dev(mc, TYPE_UEFI_VARS_SYSBUS);
#ifdef CONFIG_TPM
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 27/65] hostmem-file: convert OnOffAuto rom property to QAPI-aware registration
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (25 preceding siblings ...)
2026-10-20 10:45 ` [PATCH v7 26/65] loongarch/virt: " Marc-André Lureau
@ 2026-10-20 10:45 ` Marc-André Lureau
2026-10-20 10:45 ` [PATCH v7 28/65] sev: convert OnOffAuto legacy-vm-type " Marc-André Lureau
` (37 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:45 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
Convert the rom OnOffAuto property from manual visitor-based
callbacks to property_add_qapi_enum().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
backends/hostmem-file.c | 29 +++++++++++++----------------
1 file changed, 13 insertions(+), 16 deletions(-)
diff --git a/backends/hostmem-file.c b/backends/hostmem-file.c
index 7efecf71f565..7d4d52482966 100644
--- a/backends/hostmem-file.c
+++ b/backends/hostmem-file.c
@@ -19,7 +19,7 @@
#include "qom/object_interfaces.h"
#include "qom/object.h"
#include "qapi/visitor.h"
-#include "qapi/qapi-visit-common.h"
+#include "qapi/qapi-type-infos-common.h"
OBJECT_DECLARE_SIMPLE_TYPE(HostMemoryBackendFile, MEMORY_BACKEND_FILE)
@@ -230,30 +230,24 @@ static void file_memory_backend_set_readonly(Object *obj, bool value,
fb->readonly = value;
}
-static void file_memory_backend_get_rom(Object *obj, Visitor *v,
- const char *name, void *opaque,
- Error **errp)
+static int file_memory_backend_get_rom(Object *obj, Error **errp)
{
HostMemoryBackendFile *fb = MEMORY_BACKEND_FILE(obj);
- OnOffAuto rom = fb->rom;
-
- visit_type_OnOffAuto(v, name, &rom, errp);
+ return fb->rom;
}
-static void file_memory_backend_set_rom(Object *obj, Visitor *v,
- const char *name, void *opaque,
- Error **errp)
+static void file_memory_backend_set_rom(Object *obj, int value, Error **errp)
{
HostMemoryBackend *backend = MEMORY_BACKEND(obj);
HostMemoryBackendFile *fb = MEMORY_BACKEND_FILE(obj);
if (host_memory_backend_mr_inited(backend)) {
- error_setg(errp, "cannot change property '%s' of %s.", name,
+ error_setg(errp, "cannot change property 'rom' of %s.",
object_get_typename(obj));
return;
}
- visit_type_OnOffAuto(v, name, &fb->rom, errp);
+ fb->rom = value;
}
static void file_backend_unparent(Object *obj)
@@ -298,10 +292,13 @@ file_backend_class_init(ObjectClass *oc, const void *data)
object_class_property_add_bool(oc, "readonly",
file_memory_backend_get_readonly,
file_memory_backend_set_readonly);
- object_class_property_add(oc, "rom", "OnOffAuto",
- file_memory_backend_get_rom, file_memory_backend_set_rom, NULL, NULL);
- object_class_property_set_description(oc, "rom",
- "Whether to create Read Only Memory (ROM)");
+ object_class_property_add_qapi_enum(oc, QAPI_ENUM_PROP(
+ .name = "rom",
+ .description = "Whether to create Read Only Memory (ROM)",
+ .qapi_type = &OnOffAuto_type_info,
+ .get = file_memory_backend_get_rom,
+ .set = file_memory_backend_set_rom,
+ ));
}
static void file_backend_instance_finalize(Object *o)
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 28/65] sev: convert OnOffAuto legacy-vm-type property to QAPI-aware registration
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (26 preceding siblings ...)
2026-10-20 10:45 ` [PATCH v7 27/65] hostmem-file: convert OnOffAuto rom property " Marc-André Lureau
@ 2026-10-20 10:45 ` Marc-André Lureau
2026-10-20 10:45 ` [PATCH v7 29/65] whpx: convert OnOffAuto hyperv " Marc-André Lureau
` (36 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:45 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
Convert the legacy-vm-type OnOffAuto property from manual
visitor-based callbacks to property_add_qapi_enum().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
target/i386/sev.c | 29 +++++++++++++----------------
1 file changed, 13 insertions(+), 16 deletions(-)
diff --git a/target/i386/sev.c b/target/i386/sev.c
index cc16c6b07123..b2c7260c80a4 100644
--- a/target/i386/sev.c
+++ b/target/i386/sev.c
@@ -20,6 +20,7 @@
#include <sys/ioctl.h>
#include "qapi/error.h"
+#include "qapi/qapi-type-infos-common.h"
#include "qom/object_interfaces.h"
#include "qemu/base64.h"
#include "qemu/module.h"
@@ -2939,23 +2940,16 @@ sev_guest_set_session_file(Object *obj, const char *value, Error **errp)
SEV_GUEST(obj)->session_file = g_strdup(value);
}
-static void sev_guest_get_legacy_vm_type(Object *obj, Visitor *v,
- const char *name, void *opaque,
- Error **errp)
+static int sev_guest_get_legacy_vm_type(Object *obj, Error **errp)
{
SevGuestState *sev_guest = SEV_GUEST(obj);
- OnOffAuto legacy_vm_type = sev_guest->legacy_vm_type;
-
- visit_type_OnOffAuto(v, name, &legacy_vm_type, errp);
+ return sev_guest->legacy_vm_type;
}
-static void sev_guest_set_legacy_vm_type(Object *obj, Visitor *v,
- const char *name, void *opaque,
- Error **errp)
+static void sev_guest_set_legacy_vm_type(Object *obj, int value, Error **errp)
{
SevGuestState *sev_guest = SEV_GUEST(obj);
-
- visit_type_OnOffAuto(v, name, &sev_guest->legacy_vm_type, errp);
+ sev_guest->legacy_vm_type = value;
}
static void
@@ -2981,11 +2975,14 @@ sev_guest_class_init(ObjectClass *oc, const void *data)
sev_guest_set_session_file);
object_class_property_set_description(oc, "session-file",
"guest owners session parameters (encoded with base64)");
- object_class_property_add(oc, "legacy-vm-type", "OnOffAuto",
- sev_guest_get_legacy_vm_type,
- sev_guest_set_legacy_vm_type, NULL, NULL);
- object_class_property_set_description(oc, "legacy-vm-type",
- "use legacy VM type to maintain measurement compatibility with older QEMU or kernel versions.");
+ object_class_property_add_qapi_enum(oc, QAPI_ENUM_PROP(
+ .name = "legacy-vm-type",
+ .description = "use legacy VM type to maintain measurement "
+ "compatibility with older QEMU or kernel versions.",
+ .qapi_type = &OnOffAuto_type_info,
+ .get = sev_guest_get_legacy_vm_type,
+ .set = sev_guest_set_legacy_vm_type,
+ ));
}
static void
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 29/65] whpx: convert OnOffAuto hyperv property to QAPI-aware registration
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (27 preceding siblings ...)
2026-10-20 10:45 ` [PATCH v7 28/65] sev: convert OnOffAuto legacy-vm-type " Marc-André Lureau
@ 2026-10-20 10:45 ` Marc-André Lureau
2026-10-20 10:45 ` [PATCH v7 30/65] whpx: convert OnOffAuto arch properties " Marc-André Lureau
` (35 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:45 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
Convert the hyperv OnOffAuto property from manual visitor-based
callbacks to property_add_qapi_enum().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
accel/whpx/whpx-common.c | 29 ++++++++++-------------------
1 file changed, 10 insertions(+), 19 deletions(-)
diff --git a/accel/whpx/whpx-common.c b/accel/whpx/whpx-common.c
index 247e12db8128..187938c02b51 100644
--- a/accel/whpx/whpx-common.c
+++ b/accel/whpx/whpx-common.c
@@ -22,6 +22,7 @@
#include "qemu/error-report.h"
#include "qapi/error.h"
#include "qapi/qapi-types-common.h"
+#include "qapi/qapi-type-infos-common.h"
#include "qapi/qapi-visit-common.h"
#include "migration/blocker.h"
#include "accel/accel-cpu-target.h"
@@ -470,18 +471,11 @@ static void whpx_set_kernel_irqchip(Object *obj, Visitor *v,
}
}
-static void whpx_set_hyperv(Object *obj, Visitor *v,
- const char *name, void *opaque,
- Error **errp)
+static void whpx_set_hyperv(Object *obj, int value, Error **errp)
{
struct whpx_state *whpx = &whpx_global;
- OnOffAuto mode;
- if (!visit_type_OnOffAuto(v, name, &mode, errp)) {
- return;
- }
-
- switch (mode) {
+ switch (value) {
case ON_OFF_AUTO_ON:
whpx->hyperv_enlightenments_allowed = true;
whpx->hyperv_enlightenments_required = true;
@@ -497,11 +491,7 @@ static void whpx_set_hyperv(Object *obj, Visitor *v,
whpx->hyperv_enlightenments_required = false;
break;
default:
- /*
- * The value was checked in visit_type_OnOffAuto() above. If
- * we get here, then something is wrong in QEMU.
- */
- abort();
+ g_assert_not_reached();
}
}
@@ -533,11 +523,12 @@ static void whpx_accel_class_init(ObjectClass *oc, const void *data)
NULL, NULL);
object_class_property_set_description(oc, "kernel-irqchip",
"Configure WHPX in-kernel irqchip");
- object_class_property_add(oc, "hyperv", "OnOffAuto",
- NULL, whpx_set_hyperv,
- NULL, NULL);
- object_class_property_set_description(oc, "hyperv",
- "Configure Hyper-V enlightenments");
+ object_class_property_add_qapi_enum(oc, QAPI_ENUM_PROP(
+ .name = "hyperv",
+ .description = "Configure Hyper-V enlightenments",
+ .qapi_type = &OnOffAuto_type_info,
+ .set = whpx_set_hyperv,
+ ));
whpx_arch_accel_class_init(oc);
}
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 30/65] whpx: convert OnOffAuto arch properties to QAPI-aware registration
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (28 preceding siblings ...)
2026-10-20 10:45 ` [PATCH v7 29/65] whpx: convert OnOffAuto hyperv " Marc-André Lureau
@ 2026-10-20 10:45 ` Marc-André Lureau
2026-10-20 10:45 ` [PATCH v7 31/65] accel/kvm: convert OnOffSplit property " Marc-André Lureau
` (34 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:45 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
Convert the ignore-unknown-msr, intercept-msr-gp, and ssd OnOffAuto
properties from manual visitor-based callbacks to
property_add_qapi_enum().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
target/i386/whpx/whpx-all.c | 101 +++++++++++++++-----------------------------
1 file changed, 34 insertions(+), 67 deletions(-)
diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c
index 113f79afb9ab..64fa389a2f93 100644
--- a/target/i386/whpx/whpx-all.c
+++ b/target/i386/whpx/whpx-all.c
@@ -30,7 +30,7 @@
#include "qemu/error-report.h"
#include "qapi/error.h"
#include "qapi/qapi-types-common.h"
-#include "qapi/qapi-visit-common.h"
+#include "qapi/qapi-type-infos-common.h"
#include "migration/blocker.h"
#include "host-cpu.h"
#include "accel/accel-cpu-target.h"
@@ -1875,6 +1875,7 @@ void whpx_apply_breakpoints(
}
}
+
void whpx_arch_destroy_vcpu(CPUState *cpu)
{
X86CPU *x86cpu = X86_CPU(cpu);
@@ -1955,7 +1956,7 @@ static int whpx_handle_hyperv_guestidle(CPUState *cpu)
return whpx_handle_halt(cpu);
}
-static void whpx_vcpu_kick_out_of_hlt(CPUState *cpu)
+static void whpx_vcpu_kick_out_of_hlt(CPUState *cpu)
{
WHV_REGISTER_VALUE reg;
whpx_get_reg(cpu, WHvRegisterInternalActivityState, ®);
@@ -2059,7 +2060,7 @@ static void whpx_vcpu_pre_run(CPUState *cpu)
.Vector = irq,
};
reg_count += 1;
- /*
+ /*
* When the Hyper-V APIC is enabled, to get out of HLT we
* either have to request an interrupt or manually get it away
* from HLT.
@@ -2359,7 +2360,7 @@ int whpx_vcpu_run(CPUState *cpu)
WHV_REGISTER_VALUE reg_values[3] = {0};
WHV_REGISTER_NAME reg_names[3];
UINT32 reg_count;
- bool is_known_msr = 0;
+ bool is_known_msr = 0;
bool raises_gpf = false;
uint64_t val;
@@ -2911,120 +2912,86 @@ void whpx_cpu_instance_init(CPUState *cs)
* Partition support
*/
-static void whpx_set_unknown_msr(Object *obj, Visitor *v,
- const char *name, void *opaque,
- Error **errp)
+static void whpx_set_unknown_msr(Object *obj, int value, Error **errp)
{
struct whpx_state *whpx = &whpx_global;
- OnOffAuto mode;
- if (!visit_type_OnOffAuto(v, name, &mode, errp)) {
- return;
- }
-
- switch (mode) {
+ switch (value) {
case ON_OFF_AUTO_ON:
whpx->ignore_unknown_msr = true;
break;
-
case ON_OFF_AUTO_OFF:
whpx->ignore_unknown_msr = false;
break;
-
case ON_OFF_AUTO_AUTO:
whpx->ignore_unknown_msr = true;
break;
default:
- /*
- * The value was checked in visit_type_OnOffAuto() above. If
- * we get here, then something is wrong in QEMU.
- */
- abort();
+ g_assert_not_reached();
}
}
-static void whpx_set_intercept_msr_gp(Object *obj, Visitor *v,
- const char *name, void *opaque,
- Error **errp)
+static void whpx_set_intercept_msr_gp(Object *obj, int value, Error **errp)
{
struct whpx_state *whpx = &whpx_global;
- OnOffAuto mode;
- if (!visit_type_OnOffAuto(v, name, &mode, errp)) {
- return;
- }
-
- switch (mode) {
+ switch (value) {
case ON_OFF_AUTO_ON:
whpx->intercept_msr_gp = true;
break;
-
case ON_OFF_AUTO_OFF:
whpx->intercept_msr_gp = false;
break;
-
case ON_OFF_AUTO_AUTO:
whpx->intercept_msr_gp = false;
break;
default:
- /*
- * The value was checked in visit_type_OnOffAuto() above. If
- * we get here, then something is wrong in QEMU.
- */
- abort();
+ g_assert_not_reached();
}
}
-static void whpx_set_ssd(Object *obj, Visitor *v,
- const char *name, void *opaque,
- Error **errp)
+static void whpx_set_ssd(Object *obj, int value, Error **errp)
{
struct whpx_state *whpx = &whpx_global;
- OnOffAuto mode;
- if (!visit_type_OnOffAuto(v, name, &mode, errp)) {
- return;
- }
-
- switch (mode) {
+ switch (value) {
case ON_OFF_AUTO_ON:
whpx->separate_security_domain = true;
break;
-
case ON_OFF_AUTO_OFF:
whpx->separate_security_domain = false;
break;
-
case ON_OFF_AUTO_AUTO:
whpx->separate_security_domain = true;
break;
default:
- /*
- * The value was checked in visit_type_OnOffAuto() above. If
- * we get here, then something is wrong in QEMU.
- */
- abort();
+ g_assert_not_reached();
}
}
void whpx_arch_accel_class_init(ObjectClass *oc)
{
- object_class_property_add(oc, "ignore-unknown-msr", "OnOffAuto",
- NULL, whpx_set_unknown_msr,
- NULL, NULL);
- object_class_property_set_description(oc, "ignore-unknown-msr",
- "Configure unknown MSR behavior");
- object_class_property_add(oc, "intercept-msr-gp", "OnOffAuto",
- NULL, whpx_set_intercept_msr_gp,
- NULL, NULL);
- object_class_property_set_description(oc, "intercept-msr-gp",
- "Intercept #GP to log erroring MSR accesses.");
- object_class_property_add(oc, "ssd", "OnOffAuto",
- NULL, whpx_set_ssd,
- NULL, NULL);
- object_class_property_set_description(oc, "ssd",
- "Separate security domain");
+ object_class_property_add_qapi_enum(oc, QAPI_ENUM_PROP(
+ .name = "ignore-unknown-msr",
+ .description = "Configure unknown MSR behavior",
+ .qapi_type = &OnOffAuto_type_info,
+ .set = whpx_set_unknown_msr,
+ ));
+
+ object_class_property_add_qapi_enum(oc, QAPI_ENUM_PROP(
+ .name = "intercept-msr-gp",
+ .description = "Intercept #GP to log erroring MSR accesses.",
+ .qapi_type = &OnOffAuto_type_info,
+ .set = whpx_set_intercept_msr_gp,
+ ));
+
+ object_class_property_add_qapi_enum(oc, QAPI_ENUM_PROP(
+ .name = "ssd",
+ .description = "Separate security domain",
+ .qapi_type = &OnOffAuto_type_info,
+ .set = whpx_set_ssd,
+ ));
}
int whpx_accel_init(AccelState *as, MachineState *ms)
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 31/65] accel/kvm: convert OnOffSplit property to QAPI-aware registration
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (29 preceding siblings ...)
2026-10-20 10:45 ` [PATCH v7 30/65] whpx: convert OnOffAuto arch properties " Marc-André Lureau
@ 2026-10-20 10:45 ` Marc-André Lureau
2026-10-20 10:45 ` [PATCH v7 32/65] whpx: " Marc-André Lureau
` (33 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:45 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
Convert the OnOffSplit property from manual visitor-based
callbacks to property_add_qapi_enum().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
accel/kvm/kvm-all.c | 26 ++++++++++----------------
1 file changed, 10 insertions(+), 16 deletions(-)
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index db8fba53f339..1d91667fb880 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -46,6 +46,7 @@
#include "qapi/visitor.h"
#include "qapi/qapi-types-common.h"
#include "qapi/qapi-visit-common.h"
+#include "qapi/qapi-type-infos-common.h"
#include "system/reset.h"
#include "qemu/guest-random.h"
#include "system/hw_accel.h"
@@ -4151,22 +4152,17 @@ static void kvm_set_kvm_shadow_mem(Object *obj, Visitor *v,
s->kvm_shadow_mem = value;
}
-static void kvm_set_kernel_irqchip(Object *obj, Visitor *v,
- const char *name, void *opaque,
+static void kvm_set_kernel_irqchip(Object *obj, int value,
Error **errp)
{
KVMState *s = KVM_STATE(obj);
- OnOffSplit mode;
if (s->fd != -1) {
error_setg(errp, "Cannot set properties after the accelerator has been initialized");
return;
}
- if (!visit_type_OnOffSplit(v, name, &mode, errp)) {
- return;
- }
- switch (mode) {
+ switch (value) {
case ON_OFF_SPLIT_ON:
s->kernel_irqchip_allowed = true;
s->kernel_irqchip_required = true;
@@ -4183,10 +4179,7 @@ static void kvm_set_kernel_irqchip(Object *obj, Visitor *v,
s->kernel_irqchip_split = ON_OFF_AUTO_ON;
break;
default:
- /* The value was checked in visit_type_OnOffSplit() above. If
- * we get here, then something is wrong in QEMU.
- */
- abort();
+ g_assert_not_reached();
}
}
@@ -4303,11 +4296,12 @@ static void kvm_accel_class_init(ObjectClass *oc, const void *data)
ac->has_memory = kvm_accel_has_memory;
ac->allowed = &kvm_allowed;
- object_class_property_add(oc, "kernel-irqchip", "on|off|split",
- NULL, kvm_set_kernel_irqchip,
- NULL, NULL);
- object_class_property_set_description(oc, "kernel-irqchip",
- "Configure KVM in-kernel irqchip");
+ object_class_property_add_qapi_enum(oc, QAPI_ENUM_PROP(
+ .name = "kernel-irqchip",
+ .qapi_type = &OnOffSplit_type_info,
+ .set = kvm_set_kernel_irqchip,
+ .description = "Configure KVM in-kernel irqchip",
+ ));
object_class_property_add(oc, "kvm-shadow-mem", "int",
kvm_get_kvm_shadow_mem, kvm_set_kvm_shadow_mem,
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 32/65] whpx: convert OnOffSplit property to QAPI-aware registration
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (30 preceding siblings ...)
2026-10-20 10:45 ` [PATCH v7 31/65] accel/kvm: convert OnOffSplit property " Marc-André Lureau
@ 2026-10-20 10:45 ` Marc-André Lureau
2026-10-20 10:45 ` [PATCH v7 33/65] hw/ppc/spapr_caps: fix property type name Marc-André Lureau
` (32 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:45 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
Convert the OnOffSplit property from manual visitor-based
callbacks to property_add_qapi_enum().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
accel/whpx/whpx-common.c | 29 ++++++++++-------------------
1 file changed, 10 insertions(+), 19 deletions(-)
diff --git a/accel/whpx/whpx-common.c b/accel/whpx/whpx-common.c
index 187938c02b51..5d4b405e56d3 100644
--- a/accel/whpx/whpx-common.c
+++ b/accel/whpx/whpx-common.c
@@ -434,18 +434,12 @@ error:
return false;
}
-static void whpx_set_kernel_irqchip(Object *obj, Visitor *v,
- const char *name, void *opaque,
- Error **errp)
+static void whpx_set_kernel_irqchip(Object *obj, int value,
+ Error **errp)
{
struct whpx_state *whpx = &whpx_global;
- OnOffSplit mode;
- if (!visit_type_OnOffSplit(v, name, &mode, errp)) {
- return;
- }
-
- switch (mode) {
+ switch (value) {
case ON_OFF_SPLIT_ON:
whpx->kernel_irqchip_allowed = true;
whpx->kernel_irqchip_required = true;
@@ -463,11 +457,7 @@ static void whpx_set_kernel_irqchip(Object *obj, Visitor *v,
break;
default:
- /*
- * The value was checked in visit_type_OnOffSplit() above. If
- * we get here, then something is wrong in QEMU.
- */
- abort();
+ g_assert_not_reached();
}
}
@@ -518,11 +508,12 @@ static void whpx_accel_class_init(ObjectClass *oc, const void *data)
ac->pre_resume_vm = whpx_pre_resume_vm;
ac->allowed = &whpx_allowed;
- object_class_property_add(oc, "kernel-irqchip", "on|off|split",
- NULL, whpx_set_kernel_irqchip,
- NULL, NULL);
- object_class_property_set_description(oc, "kernel-irqchip",
- "Configure WHPX in-kernel irqchip");
+ object_class_property_add_qapi_enum(oc, QAPI_ENUM_PROP(
+ .name = "kernel-irqchip",
+ .qapi_type = &OnOffSplit_type_info,
+ .set = whpx_set_kernel_irqchip,
+ .description = "Configure WHPX in-kernel irqchip",
+ ));
object_class_property_add_qapi_enum(oc, QAPI_ENUM_PROP(
.name = "hyperv",
.description = "Configure Hyper-V enlightenments",
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 33/65] hw/ppc/spapr_caps: fix property type name
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (31 preceding siblings ...)
2026-10-20 10:45 ` [PATCH v7 32/65] whpx: " Marc-André Lureau
@ 2026-10-20 10:45 ` Marc-André Lureau
2026-10-20 10:45 ` [PATCH v7 34/65] ppc/spapr-caps: convert to QAPI-aware property registration Marc-André Lureau
` (31 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:45 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
The getter/setter use visit_type_size(). Fix the type name mismatch.
Reviewed-by: Amit Machhiwal <amachhiw@linux.ibm.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
hw/ppc/spapr_caps.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/ppc/spapr_caps.c b/hw/ppc/spapr_caps.c
index 0d659e9b0251..103b17364feb 100644
--- a/hw/ppc/spapr_caps.c
+++ b/hw/ppc/spapr_caps.c
@@ -784,7 +784,7 @@ SpaprCapabilityInfo capability_table[SPAPR_CAP_NUM] = {
.index = SPAPR_CAP_HPT_MAXPAGESIZE,
.get = spapr_cap_get_pagesize,
.set = spapr_cap_set_pagesize,
- .type = "int",
+ .type = "size",
.apply = cap_hpt_maxpagesize_apply,
.cpu_apply = cap_hpt_maxpagesize_cpu_apply,
},
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 34/65] ppc/spapr-caps: convert to QAPI-aware property registration
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (32 preceding siblings ...)
2026-10-20 10:45 ` [PATCH v7 33/65] hw/ppc/spapr_caps: fix property type name Marc-André Lureau
@ 2026-10-20 10:45 ` Marc-André Lureau
2026-10-20 10:45 ` [PATCH v7 35/65] net/colo-compare: fix compare_timeout setter visitor type Marc-André Lureau
` (30 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:45 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
Replace the type string in SpaprCapabilityInfo with a QAPITypeInfo
pointer and switch spapr_caps_add_properties() from
object_class_property_add() to object_class_property_add_qapi().
Reviewed-by: Amit Machhiwal <amachhiw@linux.ibm.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
hw/ppc/spapr_caps.c | 39 ++++++++++++++++++++-------------------
1 file changed, 20 insertions(+), 19 deletions(-)
diff --git a/hw/ppc/spapr_caps.c b/hw/ppc/spapr_caps.c
index 103b17364feb..e622c79eb52a 100644
--- a/hw/ppc/spapr_caps.c
+++ b/hw/ppc/spapr_caps.c
@@ -24,6 +24,7 @@
#include "qemu/osdep.h"
#include "qemu/error-report.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qapi/error.h"
#include "qapi/visitor.h"
#include "system/hw_accel.h"
@@ -59,7 +60,7 @@ typedef struct SpaprCapabilityInfo {
/* Getter and Setter Function Pointers */
ObjectPropertyAccessor *get;
ObjectPropertyAccessor *set;
- const char *type;
+ const QAPITypeInfo *type;
/* Possible values if this is a custom string type */
SpaprCapPossible *possible;
/* Make sure the virtual hardware can support this capability */
@@ -725,7 +726,7 @@ SpaprCapabilityInfo capability_table[SPAPR_CAP_NUM] = {
.index = SPAPR_CAP_HTM,
.get = spapr_cap_get_bool,
.set = spapr_cap_set_bool,
- .type = "bool",
+ .type = &bool_type_info,
.apply = cap_htm_apply,
},
[SPAPR_CAP_VSX] = {
@@ -734,7 +735,7 @@ SpaprCapabilityInfo capability_table[SPAPR_CAP_NUM] = {
.index = SPAPR_CAP_VSX,
.get = spapr_cap_get_bool,
.set = spapr_cap_set_bool,
- .type = "bool",
+ .type = &bool_type_info,
.apply = cap_vsx_apply,
},
[SPAPR_CAP_DFP] = {
@@ -743,7 +744,7 @@ SpaprCapabilityInfo capability_table[SPAPR_CAP_NUM] = {
.index = SPAPR_CAP_DFP,
.get = spapr_cap_get_bool,
.set = spapr_cap_set_bool,
- .type = "bool",
+ .type = &bool_type_info,
.apply = cap_dfp_apply,
},
[SPAPR_CAP_CFPC] = {
@@ -752,7 +753,7 @@ SpaprCapabilityInfo capability_table[SPAPR_CAP_NUM] = {
.index = SPAPR_CAP_CFPC,
.get = spapr_cap_get_string,
.set = spapr_cap_set_string,
- .type = "string",
+ .type = &str_type_info,
.possible = &cap_cfpc_possible,
.apply = cap_safe_cache_apply,
},
@@ -762,7 +763,7 @@ SpaprCapabilityInfo capability_table[SPAPR_CAP_NUM] = {
.index = SPAPR_CAP_SBBC,
.get = spapr_cap_get_string,
.set = spapr_cap_set_string,
- .type = "string",
+ .type = &str_type_info,
.possible = &cap_sbbc_possible,
.apply = cap_safe_bounds_check_apply,
},
@@ -774,7 +775,7 @@ SpaprCapabilityInfo capability_table[SPAPR_CAP_NUM] = {
.index = SPAPR_CAP_IBS,
.get = spapr_cap_get_string,
.set = spapr_cap_set_string,
- .type = "string",
+ .type = &str_type_info,
.possible = &cap_ibs_possible,
.apply = cap_safe_indirect_branch_apply,
},
@@ -784,7 +785,7 @@ SpaprCapabilityInfo capability_table[SPAPR_CAP_NUM] = {
.index = SPAPR_CAP_HPT_MAXPAGESIZE,
.get = spapr_cap_get_pagesize,
.set = spapr_cap_set_pagesize,
- .type = "size",
+ .type = &size_type_info,
.apply = cap_hpt_maxpagesize_apply,
.cpu_apply = cap_hpt_maxpagesize_cpu_apply,
},
@@ -794,7 +795,7 @@ SpaprCapabilityInfo capability_table[SPAPR_CAP_NUM] = {
.index = SPAPR_CAP_NESTED_KVM_HV,
.get = spapr_cap_get_bool,
.set = spapr_cap_set_bool,
- .type = "bool",
+ .type = &bool_type_info,
.apply = cap_nested_kvm_hv_apply,
},
[SPAPR_CAP_NESTED_PAPR] = {
@@ -803,7 +804,7 @@ SpaprCapabilityInfo capability_table[SPAPR_CAP_NUM] = {
.index = SPAPR_CAP_NESTED_PAPR,
.get = spapr_cap_get_bool,
.set = spapr_cap_set_bool,
- .type = "bool",
+ .type = &bool_type_info,
.apply = cap_nested_papr_apply,
},
[SPAPR_CAP_LARGE_DECREMENTER] = {
@@ -812,7 +813,7 @@ SpaprCapabilityInfo capability_table[SPAPR_CAP_NUM] = {
.index = SPAPR_CAP_LARGE_DECREMENTER,
.get = spapr_cap_get_bool,
.set = spapr_cap_set_bool,
- .type = "bool",
+ .type = &bool_type_info,
.apply = cap_large_decr_apply,
.cpu_apply = cap_large_decr_cpu_apply,
},
@@ -822,7 +823,7 @@ SpaprCapabilityInfo capability_table[SPAPR_CAP_NUM] = {
.index = SPAPR_CAP_CCF_ASSIST,
.get = spapr_cap_get_bool,
.set = spapr_cap_set_bool,
- .type = "bool",
+ .type = &bool_type_info,
.apply = cap_ccf_assist_apply,
},
[SPAPR_CAP_FWNMI] = {
@@ -831,7 +832,7 @@ SpaprCapabilityInfo capability_table[SPAPR_CAP_NUM] = {
.index = SPAPR_CAP_FWNMI,
.get = spapr_cap_get_bool,
.set = spapr_cap_set_bool,
- .type = "bool",
+ .type = &bool_type_info,
.apply = cap_fwnmi_apply,
},
[SPAPR_CAP_RPT_INVALIDATE] = {
@@ -840,7 +841,7 @@ SpaprCapabilityInfo capability_table[SPAPR_CAP_NUM] = {
.index = SPAPR_CAP_RPT_INVALIDATE,
.get = spapr_cap_get_bool,
.set = spapr_cap_set_bool,
- .type = "bool",
+ .type = &bool_type_info,
.apply = cap_rpt_invalidate_apply,
},
[SPAPR_CAP_AIL_MODE_3] = {
@@ -849,7 +850,7 @@ SpaprCapabilityInfo capability_table[SPAPR_CAP_NUM] = {
.index = SPAPR_CAP_AIL_MODE_3,
.get = spapr_cap_get_bool,
.set = spapr_cap_set_bool,
- .type = "bool",
+ .type = &bool_type_info,
.apply = cap_ail_mode_3_apply,
},
[SPAPR_CAP_DAWR1] = {
@@ -858,7 +859,7 @@ SpaprCapabilityInfo capability_table[SPAPR_CAP_NUM] = {
.index = SPAPR_CAP_DAWR1,
.get = spapr_cap_get_bool,
.set = spapr_cap_set_bool,
- .type = "bool",
+ .type = &bool_type_info,
.apply = cap_dawr1_apply,
},
};
@@ -1069,9 +1070,9 @@ void spapr_caps_add_properties(SpaprMachineClass *smc)
g_autofree char *name = g_strdup_printf("cap-%s", cap->name);
g_autofree char *desc = g_strdup(cap->description);
- object_class_property_add(klass, name, cap->type,
- cap->get, cap->set,
- NULL, cap);
+ object_class_property_add_qapi(klass, name, cap->type,
+ cap->get, cap->set,
+ NULL, cap);
object_class_property_set_description(klass, name, desc);
}
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 35/65] net/colo-compare: fix compare_timeout setter visitor type
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (33 preceding siblings ...)
2026-10-20 10:45 ` [PATCH v7 34/65] ppc/spapr-caps: convert to QAPI-aware property registration Marc-André Lureau
@ 2026-10-20 10:45 ` Marc-André Lureau
2026-10-20 10:45 ` [PATCH v7 36/65] net/colo-compare: fix max_queue_size " Marc-André Lureau
` (29 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:45 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
The setter was using visit_type_uint32, truncating the value, while the
getter and typename use uint64. Use visit_type_uint64 consistently.
Fixes: 0c4266ef2690 ("net/colo-compare.c: Fix compare_timeout format issue")
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
net/colo-compare.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/colo-compare.c b/net/colo-compare.c
index 5986fb1e8800..948a2f7f9e4b 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -1075,9 +1075,9 @@ static void compare_set_timeout(Object *obj, Visitor *v,
Error **errp)
{
CompareState *s = COLO_COMPARE(obj);
- uint32_t value;
+ uint64_t value;
- if (!visit_type_uint32(v, name, &value, errp)) {
+ if (!visit_type_uint64(v, name, &value, errp)) {
return;
}
if (!value) {
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 36/65] net/colo-compare: fix max_queue_size setter visitor type
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (34 preceding siblings ...)
2026-10-20 10:45 ` [PATCH v7 35/65] net/colo-compare: fix compare_timeout setter visitor type Marc-André Lureau
@ 2026-10-20 10:45 ` Marc-André Lureau
2026-10-20 10:45 ` [PATCH v7 37/65] hw/misc/xlnx-versal-trng: add missing getter for fips-fault-events Marc-André Lureau
` (28 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:45 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
The setter was using visit_type_uint64, accepting values wider than
the uint32_t field. Use visit_type_uint32 to match the getter, field,
and typename.
Fixes: 0c4266ef2690 ("net/colo-compare.c: Fix compare_timeout format issue")
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
net/colo-compare.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/colo-compare.c b/net/colo-compare.c
index 948a2f7f9e4b..a6910de869ff 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -1129,9 +1129,9 @@ static void set_max_queue_size(Object *obj, Visitor *v,
const char *name, void *opaque,
Error **errp)
{
- uint64_t value;
+ uint32_t value;
- if (!visit_type_uint64(v, name, &value, errp)) {
+ if (!visit_type_uint32(v, name, &value, errp)) {
return;
}
if (!value) {
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 37/65] hw/misc/xlnx-versal-trng: add missing getter for fips-fault-events
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (35 preceding siblings ...)
2026-10-20 10:45 ` [PATCH v7 36/65] net/colo-compare: fix max_queue_size " Marc-André Lureau
@ 2026-10-20 10:45 ` Marc-André Lureau
2026-10-20 10:45 ` [PATCH v7 38/65] qom: convert scalar properties to QAPI-aware registration Marc-André Lureau
` (27 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:45 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
hw/misc/xlnx-versal-trng.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/hw/misc/xlnx-versal-trng.c b/hw/misc/xlnx-versal-trng.c
index aa1d65de7b70..0584ee089e3c 100644
--- a/hw/misc/xlnx-versal-trng.c
+++ b/hw/misc/xlnx-versal-trng.c
@@ -650,10 +650,22 @@ static void trng_prop_fault_event_set(Object *obj, Visitor *v,
trng_fault_event_set(XLNX_VERSAL_TRNG(obj), *events);
}
+static void trng_prop_fault_event_get(Object *obj, Visitor *v,
+ const char *name,
+ void *opaque,
+ Error **errp)
+{
+ const Property *prop = opaque;
+ uint32_t *events = object_field_prop_ptr(obj, prop);
+
+ visit_type_uint32(v, name, events, errp);
+}
+
static const PropertyInfo trng_prop_fault_events = {
.type = "uint32",
.description = "Set to trigger TRNG fault events",
.set = trng_prop_fault_event_set,
+ .get = trng_prop_fault_event_get,
.realized_set_allowed = true,
};
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 38/65] qom: convert scalar properties to QAPI-aware registration
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (36 preceding siblings ...)
2026-10-20 10:45 ` [PATCH v7 37/65] hw/misc/xlnx-versal-trng: add missing getter for fips-fault-events Marc-André Lureau
@ 2026-10-20 10:45 ` Marc-André Lureau
2026-10-20 10:45 ` [PATCH v7 39/65] i386/cpu: convert strList property " Marc-André Lureau
` (26 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:45 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
Reviewed-by: Amit Machhiwal <amachhiw@linux.ibm.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
accel/kvm/kvm-all.c | 5 ++-
accel/nitro/nitro-accel.c | 3 +-
accel/tcg/tcg-all.c | 3 +-
backends/cryptodev.c | 7 ++--
backends/hostmem-file.c | 4 +-
backends/hostmem-memfd.c | 3 +-
backends/hostmem.c | 6 +--
block/throttle-groups.c | 5 ++-
crypto/secret_keyring.c | 9 +++--
event-loop-base.c | 7 ++--
hw/acpi/ich9.c | 1 +
hw/acpi/pci.c | 7 ++--
hw/arm/virt.c | 4 +-
hw/core/clock.c | 3 +-
hw/core/machine.c | 2 +-
hw/cpu/core.c | 10 +++--
hw/cxl/cxl-host.c | 2 +-
hw/gpio/aspeed_gpio.c | 5 ++-
hw/gpio/aspeed_sgpio.c | 3 +-
hw/gpio/stm32l4x5_gpio.c | 5 ++-
hw/i386/pc.c | 6 +--
hw/i386/sgx-epc.c | 10 +++--
hw/i386/x86.c | 6 +--
hw/ide/ide-dev.c | 3 +-
hw/intc/apic_common.c | 3 +-
hw/loongarch/virt.c | 2 +-
hw/mem/nvdimm.c | 7 ++--
hw/mem/pc-dimm.c | 3 +-
hw/misc/aspeed_lpc.c | 73 +++++++++++++++++++++++++------------
hw/misc/aspeed_sdmc.c | 3 +-
hw/misc/npcm7xx_mft.c | 3 +-
hw/net/ne2000-isa.c | 3 +-
hw/nvme/ctrl.c | 3 +-
hw/pci-bridge/pci_expander_bridge.c | 3 +-
hw/pci-host/i440fx.c | 29 +++++++++------
hw/pci-host/pnv_phb3.c | 5 ++-
hw/pci-host/pnv_phb4.c | 5 ++-
hw/pci-host/q35.c | 9 +++--
hw/ppc/spapr_drc.c | 3 +-
hw/riscv/microchip_pfsoc.c | 3 +-
hw/s390x/sclpcpi.c | 8 ++--
hw/s390x/virtio-ccw-mem.c | 3 +-
hw/sensor/adc128d818.c | 16 +++++---
hw/sensor/adm1266.c | 3 +-
hw/sensor/adm1272.c | 9 +++--
hw/sensor/emc141x.c | 9 +++--
hw/sensor/isl_pmbus_vr.c | 19 +++++-----
hw/sensor/lsm303dlhc_mag.c | 9 +++--
hw/sensor/max34451.c | 5 ++-
hw/sensor/tmp105.c | 3 +-
hw/sensor/tmp421.c | 9 +++--
hw/usb/dev-storage-classic.c | 3 +-
hw/virtio/virtio-balloon.c | 3 +-
hw/virtio/virtio-mem-pci.c | 3 +-
hw/virtio/virtio-mem.c | 18 +++++----
hw/xen/xen-pvh-common.c | 9 +++--
iothread.c | 9 +++--
net/colo-compare.c | 7 ++--
net/dump.c | 6 ++-
net/filter-buffer.c | 3 +-
qom/object.c | 42 ++++++++++-----------
system/bootdevice.c | 3 +-
system/memory.c | 5 ++-
target/arm/cpu64.c | 11 +++---
target/arm/kvm.c | 3 +-
target/arm/tcg/cpu64.c | 11 +++---
target/i386/cpu.c | 12 +++---
target/i386/kvm/kvm.c | 8 ++--
target/i386/sev.c | 2 +-
target/ppc/compat.c | 3 +-
target/riscv/cpu.c | 15 ++++----
target/riscv/kvm/kvm-cpu.c | 7 ++--
target/riscv/tcg/tcg-cpu.c | 13 ++++---
target/s390x/cpu_models.c | 5 ++-
tests/unit/test-qdev-global-props.c | 11 ++++--
ui/console.c | 3 +-
util/thread-context.c | 7 ++--
77 files changed, 347 insertions(+), 244 deletions(-)
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index 1d91667fb880..bc178482b309 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -24,6 +24,7 @@
#include "qemu/config-file.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "hw/pci/msi.h"
#include "hw/pci/msix.h"
#include "hw/s390x/adapter.h"
@@ -4303,13 +4304,13 @@ static void kvm_accel_class_init(ObjectClass *oc, const void *data)
.description = "Configure KVM in-kernel irqchip",
));
- object_class_property_add(oc, "kvm-shadow-mem", "int",
+ object_class_property_add_qapi(oc, "kvm-shadow-mem", &int_type_info,
kvm_get_kvm_shadow_mem, kvm_set_kvm_shadow_mem,
NULL, NULL);
object_class_property_set_description(oc, "kvm-shadow-mem",
"KVM shadow MMU size");
- object_class_property_add(oc, "dirty-ring-size", "uint32",
+ object_class_property_add_qapi(oc, "dirty-ring-size", &uint32_type_info,
kvm_get_dirty_ring_size, kvm_set_dirty_ring_size,
NULL, NULL);
object_class_property_set_description(oc, "dirty-ring-size",
diff --git a/accel/nitro/nitro-accel.c b/accel/nitro/nitro-accel.c
index a1e97a9162e9..05841c1277dc 100644
--- a/accel/nitro/nitro-accel.c
+++ b/accel/nitro/nitro-accel.c
@@ -29,6 +29,7 @@
#include "qemu/osdep.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qapi/visitor.h"
#include "qemu/module.h"
#include "qemu/rcu.h"
@@ -238,7 +239,7 @@ static void nitro_accel_class_init(ObjectClass *oc, const void *data)
object_class_property_set_description(oc, "debug-mode",
"Start enclave in debug mode (enables console output)");
- object_class_property_add(oc, "enclave-cid", "uint64",
+ object_class_property_add_qapi(oc, "enclave-cid", &uint64_type_info,
nitro_get_enclave_cid,
nitro_set_enclave_cid,
NULL, NULL);
diff --git a/accel/tcg/tcg-all.c b/accel/tcg/tcg-all.c
index 767e8805552f..277cf0e2d012 100644
--- a/accel/tcg/tcg-all.c
+++ b/accel/tcg/tcg-all.c
@@ -29,6 +29,7 @@
#include "exec/icount.h"
#include "tcg/startup.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qemu/error-report.h"
#include "qemu/accel.h"
#include "qemu/atomic.h"
@@ -270,7 +271,7 @@ static void tcg_accel_class_init(ObjectClass *oc, const void *data)
tcg_get_thread,
tcg_set_thread);
- object_class_property_add(oc, "tb-size", "uint32",
+ object_class_property_add_qapi(oc, "tb-size", &uint32_type_info,
tcg_get_tb_size, tcg_set_tb_size,
NULL, NULL);
object_class_property_set_description(oc, "tb-size",
diff --git a/backends/cryptodev.c b/backends/cryptodev.c
index e8f2b18f2017..a69adb70440c 100644
--- a/backends/cryptodev.c
+++ b/backends/cryptodev.c
@@ -25,6 +25,7 @@
#include "system/cryptodev.h"
#include "system/stats.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qapi/qapi-commands-cryptodev.h"
#include "qapi/qapi-types-stats.h"
#include "qapi/visitor.h"
@@ -622,15 +623,15 @@ cryptodev_backend_class_init(ObjectClass *oc, const void *data)
ucc->prepare_delete = cryptodev_backend_prepare_delete;
QTAILQ_INIT(&crypto_clients);
- object_class_property_add(oc, "queues", "uint32",
+ object_class_property_add_qapi(oc, "queues", &uint32_type_info,
cryptodev_backend_get_queues,
cryptodev_backend_set_queues,
NULL, NULL);
- object_class_property_add(oc, "throttle-bps", "uint64",
+ object_class_property_add_qapi(oc, "throttle-bps", &uint64_type_info,
cryptodev_backend_get_bps,
cryptodev_backend_set_bps,
NULL, NULL);
- object_class_property_add(oc, "throttle-ops", "uint64",
+ object_class_property_add_qapi(oc, "throttle-ops", &uint64_type_info,
cryptodev_backend_get_ops,
cryptodev_backend_set_ops,
NULL, NULL);
diff --git a/backends/hostmem-file.c b/backends/hostmem-file.c
index 7d4d52482966..46646115713e 100644
--- a/backends/hostmem-file.c
+++ b/backends/hostmem-file.c
@@ -275,11 +275,11 @@ file_backend_class_init(ObjectClass *oc, const void *data)
file_memory_backend_get_discard_data, file_memory_backend_set_discard_data);
object_class_property_add_str(oc, "mem-path",
get_mem_path, set_mem_path);
- object_class_property_add(oc, "align", "uint64",
+ object_class_property_add_qapi(oc, "align", &uint64_type_info,
file_memory_backend_get_align,
file_memory_backend_set_align,
NULL, NULL);
- object_class_property_add(oc, "offset", "int",
+ object_class_property_add_qapi(oc, "offset", &int_type_info,
file_memory_backend_get_offset,
file_memory_backend_set_offset,
NULL, NULL);
diff --git a/backends/hostmem-memfd.c b/backends/hostmem-memfd.c
index 666593ff6c0b..fcd51680cd64 100644
--- a/backends/hostmem-memfd.c
+++ b/backends/hostmem-memfd.c
@@ -16,6 +16,7 @@
#include "qemu/memfd.h"
#include "qemu/module.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qom/object.h"
#include "migration/cpr.h"
#include "system/kvm.h"
@@ -195,7 +196,7 @@ memfd_backend_class_init(ObjectClass *oc, const void *data)
memfd_backend_set_hugetlb);
object_class_property_set_description(oc, "hugetlb",
"Use huge pages");
- object_class_property_add(oc, "hugetlbsize", "uint64",
+ object_class_property_add_qapi(oc, "hugetlbsize", &uint64_type_info,
memfd_backend_get_hugetlbsize,
memfd_backend_set_hugetlbsize,
NULL, NULL);
diff --git a/backends/hostmem.c b/backends/hostmem.c
index edb8e6ab4502..45a2ea6ef174 100644
--- a/backends/hostmem.c
+++ b/backends/hostmem.c
@@ -529,7 +529,7 @@ host_memory_backend_class_init(ObjectClass *oc, const void *data)
host_memory_backend_set_prealloc);
object_class_property_set_description(oc, "prealloc",
"Preallocate memory");
- object_class_property_add(oc, "prealloc-threads", "int",
+ object_class_property_add_qapi(oc, "prealloc-threads", &int_type_info,
host_memory_backend_get_prealloc_threads,
host_memory_backend_set_prealloc_threads,
NULL, NULL);
@@ -540,13 +540,13 @@ host_memory_backend_class_init(ObjectClass *oc, const void *data)
object_property_allow_set_link, OBJ_PROP_LINK_STRONG);
object_class_property_set_description(oc, "prealloc-context",
"Context to use for creating CPU threads for preallocation");
- object_class_property_add(oc, "size", "size",
+ object_class_property_add_qapi(oc, "size", &size_type_info,
host_memory_backend_get_size,
host_memory_backend_set_size,
NULL, NULL);
object_class_property_set_description(oc, "size",
"Size of the memory region (ex: 500M)");
- object_class_property_add(oc, "host-nodes", "[uint16]",
+ object_class_property_add_qapi(oc, "host-nodes", &uint16List_type_info,
host_memory_backend_get_host_nodes,
host_memory_backend_set_host_nodes,
NULL, NULL);
diff --git a/block/throttle-groups.c b/block/throttle-groups.c
index 987867477acc..c0f24ad91e42 100644
--- a/block/throttle-groups.c
+++ b/block/throttle-groups.c
@@ -31,6 +31,7 @@
#include "qemu/thread.h"
#include "system/qtest.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qapi/qapi-type-infos-block-core.h"
#include "qapi/qapi-visit-block-core.h"
#include "qom/object.h"
@@ -985,9 +986,9 @@ static void throttle_group_obj_class_init(ObjectClass *klass,
/* individual properties */
for (i = 0; i < sizeof(properties) / sizeof(ThrottleParamInfo); i++) {
- object_class_property_add(klass,
+ object_class_property_add_qapi(klass,
properties[i].name,
- "int64",
+ &int64_type_info,
throttle_group_get,
throttle_group_set,
NULL, &properties[i]);
diff --git a/crypto/secret_keyring.c b/crypto/secret_keyring.c
index 3b332276ef5b..6ac7cd6a232d 100644
--- a/crypto/secret_keyring.c
+++ b/crypto/secret_keyring.c
@@ -21,6 +21,7 @@
#include "qemu/osdep.h"
#include <asm/unistd.h>
#include <linux/keyctl.h>
+#include "qapi/qapi-builtin-type-infos.h"
#include "qapi/error.h"
#include "qom/object_interfaces.h"
#include "trace.h"
@@ -107,10 +108,10 @@ qcrypto_secret_keyring_class_init(ObjectClass *oc, const void *data)
QCryptoSecretCommonClass *sic = QCRYPTO_SECRET_COMMON_CLASS(oc);
sic->load_data = qcrypto_secret_keyring_load_data;
- object_class_property_add(oc, "serial", "int32_t",
- qcrypto_secret_prop_get_key,
- qcrypto_secret_prop_set_key,
- NULL, NULL);
+ object_class_property_add_qapi(oc, "serial", &int32_type_info,
+ qcrypto_secret_prop_get_key,
+ qcrypto_secret_prop_set_key,
+ NULL, NULL);
}
diff --git a/event-loop-base.c b/event-loop-base.c
index 23f554d92ce8..c16c5366f680 100644
--- a/event-loop-base.c
+++ b/event-loop-base.c
@@ -14,6 +14,7 @@
#include "qemu/osdep.h"
#include "qom/object_interfaces.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "block/thread-pool.h"
#include "system/event-loop-base.h"
@@ -104,15 +105,15 @@ static void event_loop_base_class_init(ObjectClass *klass,
ucc->complete = event_loop_base_complete;
ucc->prepare_delete = event_loop_base_prepare_delete;
- object_class_property_add(klass, "aio-max-batch", "int64",
+ object_class_property_add_qapi(klass, "aio-max-batch", &int64_type_info,
event_loop_base_get_param,
event_loop_base_set_param,
NULL, &aio_max_batch_info);
- object_class_property_add(klass, "thread-pool-min", "int64",
+ object_class_property_add_qapi(klass, "thread-pool-min", &int64_type_info,
event_loop_base_get_param,
event_loop_base_set_param,
NULL, &thread_pool_min_info);
- object_class_property_add(klass, "thread-pool-max", "int64",
+ object_class_property_add_qapi(klass, "thread-pool-max", &int64_type_info,
event_loop_base_get_param,
event_loop_base_set_param,
NULL, &thread_pool_max_info);
diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
index 6d421b990cef..64228a620e69 100644
--- a/hw/acpi/ich9.c
+++ b/hw/acpi/ich9.c
@@ -26,6 +26,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qapi/visitor.h"
#include "hw/pci/pci.h"
#include "migration/vmstate.h"
diff --git a/hw/acpi/pci.c b/hw/acpi/pci.c
index c82924be8620..71d01307e141 100644
--- a/hw/acpi/pci.c
+++ b/hw/acpi/pci.c
@@ -27,6 +27,7 @@
#include "qemu/error-report.h"
#include "qom/object_interfaces.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "hw/core/boards.h"
#include "hw/acpi/aml-build.h"
#include "hw/acpi/pci.h"
@@ -139,7 +140,7 @@ static void acpi_generic_initiator_class_init(ObjectClass *oc, const void *data)
acpi_generic_initiator_set_pci_device);
object_class_property_set_description(oc, "pci-dev",
"PCI device to associate with the node");
- object_class_property_add(oc, "node", "uint32", NULL,
+ object_class_property_add_qapi(oc, "node", &uint32_type_info, NULL,
acpi_generic_initiator_set_node, NULL, NULL);
object_class_property_set_description(oc, "node",
"NUMA node associated with the PCI device");
@@ -253,8 +254,8 @@ static void acpi_generic_port_class_init(ObjectClass *oc, const void *data)
acpi_generic_port_set_pci_bus);
object_class_property_set_description(oc, "pci-bus",
"PCI Bus of the host bridge associated with this GP affinity structure");
- object_class_property_add(oc, "node", "uint32", NULL,
- acpi_generic_port_set_node, NULL, NULL);
+ object_class_property_add_qapi(oc, "node", &uint32_type_info, NULL,
+ acpi_generic_port_set_node, NULL, NULL);
object_class_property_set_description(oc, "node",
"The NUMA node like ID to index HMAT/SLIT NUMA properties involving GP");
}
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 0da10b799cfb..2fa728b99e08 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -4257,7 +4257,7 @@ static void virt_machine_class_init(ObjectClass *oc, const void *data)
"Set on/off to enable/disable high "
"memory region for PCI MMIO");
- object_class_property_add(oc, "highmem-mmio-size", "size",
+ object_class_property_add_qapi(oc, "highmem-mmio-size", &size_type_info,
virt_get_highmem_mmio_size,
virt_set_highmem_mmio_size,
NULL, NULL);
@@ -4265,7 +4265,7 @@ static void virt_machine_class_init(ObjectClass *oc, const void *data)
"Set the high memory region size "
"for PCI MMIO");
- object_class_property_add(oc, "virtio-mmio-transports", "uint8",
+ object_class_property_add_qapi(oc, "virtio-mmio-transports", &uint8_type_info,
virt_get_virtio_transports,
virt_set_virtio_transports,
NULL, NULL);
diff --git a/hw/core/clock.c b/hw/core/clock.c
index 3fc98a0c65d5..f55cb17af77e 100644
--- a/hw/core/clock.c
+++ b/hw/core/clock.c
@@ -13,6 +13,7 @@
#include "qemu/osdep.h"
#include "qemu/cutils.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qapi/visitor.h"
#include "system/qtest.h"
#include "hw/core/clock.h"
@@ -185,7 +186,7 @@ static void clock_initfn(Object *obj)
QLIST_INIT(&clk->children);
if (qtest_enabled()) {
- object_property_add(obj, "qtest-clock-period", "uint64",
+ object_property_add_qapi(obj, "qtest-clock-period", &uint64_type_info,
clock_period_prop_get, NULL, NULL, NULL);
}
}
diff --git a/hw/core/machine.c b/hw/core/machine.c
index 94737e17e66f..7272944f30a2 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -1137,7 +1137,7 @@ static void machine_class_init(ObjectClass *oc, const void *data)
object_class_property_set_description(oc, "smp-cache",
"Cache properties list for SMP machine");
- object_class_property_add(oc, "phandle-start", "int",
+ object_class_property_add_qapi(oc, "phandle-start", &int_type_info,
machine_get_phandle_start, machine_set_phandle_start,
NULL, NULL);
object_class_property_set_description(oc, "phandle-start",
diff --git a/hw/cpu/core.c b/hw/cpu/core.c
index 26e488f3d8e3..d7c89f47ab04 100644
--- a/hw/cpu/core.c
+++ b/hw/cpu/core.c
@@ -12,6 +12,7 @@
#include "hw/core/boards.h"
#include "hw/cpu/core.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qapi/visitor.h"
static void core_prop_get_core_id(Object *obj, Visitor *v, const char *name,
@@ -82,10 +83,11 @@ static void cpu_core_class_init(ObjectClass *oc, const void *data)
DeviceClass *dc = DEVICE_CLASS(oc);
set_bit(DEVICE_CATEGORY_CPU, dc->categories);
- object_class_property_add(oc, "core-id", "int", core_prop_get_core_id,
- core_prop_set_core_id, NULL, NULL);
- object_class_property_add(oc, "nr-threads", "int", core_prop_get_nr_threads,
- core_prop_set_nr_threads, NULL, NULL);
+ object_class_property_add_qapi(oc, "core-id", &int_type_info, core_prop_get_core_id,
+ core_prop_set_core_id, NULL, NULL);
+ object_class_property_add_qapi(oc, "nr-threads", &int_type_info,
+ core_prop_get_nr_threads, core_prop_set_nr_threads,
+ NULL, NULL);
}
static const TypeInfo cpu_core_type_info = {
diff --git a/hw/cxl/cxl-host.c b/hw/cxl/cxl-host.c
index 8997bf1785c8..326a1eda69ac 100644
--- a/hw/cxl/cxl-host.c
+++ b/hw/cxl/cxl-host.c
@@ -611,7 +611,7 @@ static void machine_set_cfmw(Object *obj, Visitor *v, const char *name,
void cxl_machine_init(Object *obj, CXLState *state)
{
- object_property_add(obj, "cxl", "bool", machine_get_cxl,
+ object_property_add_qapi(obj, "cxl", &bool_type_info, machine_get_cxl,
machine_set_cxl, NULL, state);
object_property_set_description(obj, "cxl",
"Set on/off to enable/disable "
diff --git a/hw/gpio/aspeed_gpio.c b/hw/gpio/aspeed_gpio.c
index 1cf6f5df5505..0c90bcd723da 100644
--- a/hw/gpio/aspeed_gpio.c
+++ b/hw/gpio/aspeed_gpio.c
@@ -12,6 +12,7 @@
#include "hw/gpio/aspeed_gpio.h"
#include "hw/misc/aspeed_scu.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qapi/visitor.h"
#include "hw/core/irq.h"
#include "migration/vmstate.h"
@@ -1481,7 +1482,7 @@ static void aspeed_gpio_init(Object *obj)
int pin_idx = j % GPIOS_PER_GROUP;
const char *group = &props->group_label[group_idx][0];
char *name = g_strdup_printf("gpio%s%d", group, pin_idx);
- object_property_add(obj, name, "bool", aspeed_gpio_get_pin,
+ object_property_add_qapi(obj, name, &bool_type_info, aspeed_gpio_get_pin,
aspeed_gpio_set_pin, NULL, NULL);
g_free(name);
}
@@ -1489,7 +1490,7 @@ static void aspeed_gpio_init(Object *obj)
for (int i = 0; i < agc->nr_gpio_sets; i++) {
g_autofree char *name = g_strdup_printf("gpio-set[%d]", i);
- object_property_add(obj, name, "uint32", aspeed_gpio_get_set,
+ object_property_add_qapi(obj, name, &uint32_type_info, aspeed_gpio_get_set,
aspeed_gpio_set_set, NULL, NULL);
}
}
diff --git a/hw/gpio/aspeed_sgpio.c b/hw/gpio/aspeed_sgpio.c
index 7d2f73699520..67b0c10d79fa 100644
--- a/hw/gpio/aspeed_sgpio.c
+++ b/hw/gpio/aspeed_sgpio.c
@@ -11,6 +11,7 @@
#include "qemu/log.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qapi/visitor.h"
#include "hw/core/irq.h"
#include "hw/core/qdev-properties.h"
@@ -300,7 +301,7 @@ static void aspeed_sgpio_init(Object *obj)
{
for (int i = 0; i < ASPEED_SGPIO_MAX_PIN_PAIR * 2; i++) {
g_autofree char *name = g_strdup_printf("sgpio%03d", i);
- object_property_add(obj, name, "bool", aspeed_sgpio_get_pin,
+ object_property_add_qapi(obj, name, &bool_type_info, aspeed_sgpio_get_pin,
aspeed_sgpio_set_pin, NULL, NULL);
}
}
diff --git a/hw/gpio/stm32l4x5_gpio.c b/hw/gpio/stm32l4x5_gpio.c
index 92fa397fbafe..d349d41e41a1 100644
--- a/hw/gpio/stm32l4x5_gpio.c
+++ b/hw/gpio/stm32l4x5_gpio.c
@@ -25,6 +25,7 @@
#include "hw/core/qdev-properties.h"
#include "qapi/visitor.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "migration/vmstate.h"
#include "trace.h"
@@ -409,10 +410,10 @@ static void stm32l4x5_gpio_init(Object *obj)
s->clk = qdev_init_clock_in(DEVICE(s), "clk", NULL, s, 0);
- object_property_add(obj, "disconnected-pins", "uint16",
+ object_property_add_qapi(obj, "disconnected-pins", &uint16_type_info,
disconnected_pins_get, disconnected_pins_set,
NULL, &s->disconnected_pins);
- object_property_add(obj, "clock-freq-hz", "uint32",
+ object_property_add_qapi(obj, "clock-freq-hz", &uint32_type_info,
clock_freq_get, NULL, NULL, NULL);
}
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 12de020adfbf..c2bca40e511a 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1718,7 +1718,7 @@ static void pc_machine_class_init(ObjectClass *oc, const void *data)
mc->default_ram_id = "pc.ram";
pcmc->default_smbios_ep_type = SMBIOS_ENTRY_POINT_TYPE_AUTO;
- object_class_property_add(oc, PC_MACHINE_MAX_RAM_BELOW_4G, "size",
+ object_class_property_add_qapi(oc, PC_MACHINE_MAX_RAM_BELOW_4G, &size_type_info,
pc_machine_get_max_ram_below_4g, pc_machine_set_max_ram_below_4g,
NULL, NULL);
object_class_property_set_description(oc, PC_MACHINE_MAX_RAM_BELOW_4G,
@@ -1756,13 +1756,13 @@ static void pc_machine_class_init(ObjectClass *oc, const void *data)
pc_machine_get_default_bus_bypass_iommu,
pc_machine_set_default_bus_bypass_iommu);
- object_class_property_add(oc, PC_MACHINE_MAX_FW_SIZE, "size",
+ object_class_property_add_qapi(oc, PC_MACHINE_MAX_FW_SIZE, &size_type_info,
pc_machine_get_max_fw_size, pc_machine_set_max_fw_size,
NULL, NULL);
object_class_property_set_description(oc, PC_MACHINE_MAX_FW_SIZE,
"Maximum combined firmware size");
- object_class_property_add(oc, PC_MACHINE_SMBIOS_EP, "str",
+ object_class_property_add_qapi(oc, PC_MACHINE_SMBIOS_EP, &str_type_info,
pc_machine_get_smbios_ep, pc_machine_set_smbios_ep,
NULL, NULL);
object_class_property_set_description(oc, PC_MACHINE_SMBIOS_EP,
diff --git a/hw/i386/sgx-epc.c b/hw/i386/sgx-epc.c
index 29cda843c942..9636f32fb624 100644
--- a/hw/i386/sgx-epc.c
+++ b/hw/i386/sgx-epc.c
@@ -15,6 +15,7 @@
#include "hw/mem/memory-device.h"
#include "hw/core/qdev-properties.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qapi/visitor.h"
#include "target/i386/cpu.h"
#include "system/address-spaces.h"
@@ -159,10 +160,11 @@ static void sgx_epc_class_init(ObjectClass *oc, const void *data)
mdc->get_memory_region = sgx_epc_md_get_memory_region;
mdc->fill_device_info = sgx_epc_md_fill_device_info;
- object_class_property_add(oc, SGX_EPC_SIZE_PROP, "uint64",
- sgx_epc_get_size,
- NULL,
- NULL, NULL);
+ object_class_property_add_qapi(oc, SGX_EPC_SIZE_PROP,
+ &uint64_type_info,
+ sgx_epc_get_size,
+ NULL,
+ NULL, NULL);
}
static const TypeInfo sgx_epc_info = {
diff --git a/hw/i386/x86.c b/hw/i386/x86.c
index 63f297a10532..d0c782ec8544 100644
--- a/hw/i386/x86.c
+++ b/hw/i386/x86.c
@@ -420,9 +420,9 @@ static void x86_machine_class_init(ObjectClass *oc, const void *data)
"in ACPI table header."
"The string may be up to 8 bytes in size");
- object_class_property_add(oc, X86_MACHINE_BUS_LOCK_RATELIMIT, "uint64_t",
- x86_machine_get_bus_lock_ratelimit,
- x86_machine_set_bus_lock_ratelimit, NULL, NULL);
+ object_class_property_add_qapi(oc, X86_MACHINE_BUS_LOCK_RATELIMIT, &uint64_type_info,
+ x86_machine_get_bus_lock_ratelimit,
+ x86_machine_set_bus_lock_ratelimit, NULL, NULL);
object_class_property_set_description(oc, X86_MACHINE_BUS_LOCK_RATELIMIT,
"Set the ratelimit for the bus locks acquired in VMs");
diff --git a/hw/ide/ide-dev.c b/hw/ide/ide-dev.c
index 5d478588c614..e2dd2439991f 100644
--- a/hw/ide/ide-dev.c
+++ b/hw/ide/ide-dev.c
@@ -19,6 +19,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qapi/qapi-types-block.h"
#include "qemu/error-report.h"
#include "qemu/module.h"
@@ -174,7 +175,7 @@ out:
static void ide_dev_instance_init(Object *obj)
{
- object_property_add(obj, "bootindex", "int32",
+ object_property_add_qapi(obj, "bootindex", &int32_type_info,
ide_dev_get_bootindex,
ide_dev_set_bootindex, NULL, NULL);
object_property_set_int(obj, "bootindex", -1, NULL);
diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c
index 0f0f37d45734..dc0517ceea90 100644
--- a/hw/intc/apic_common.c
+++ b/hw/intc/apic_common.c
@@ -22,6 +22,7 @@
#include "qemu/error-report.h"
#include "qemu/module.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qapi/visitor.h"
#include "hw/i386/apic.h"
#include "hw/i386/apic_internal.h"
@@ -442,7 +443,7 @@ static void apic_common_initfn(Object *obj)
APICCommonState *s = APIC_COMMON(obj);
s->id = s->initial_apic_id = -1;
- object_property_add(obj, "id", "uint32",
+ object_property_add_qapi(obj, "id", &uint32_type_info,
apic_common_get_id,
apic_common_set_id, NULL, NULL);
}
diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index db8ea76f117c..edb59568038b 100644
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -1520,7 +1520,7 @@ static void virt_class_init(ObjectClass *oc, const void *data)
object_class_property_set_description(oc, "highmem-mmio",
"Set on/off to enable/disable high "
"memory region for PCI MMIO");
- object_class_property_add(oc, "highmem-mmio-size", "size",
+ object_class_property_add_qapi(oc, "highmem-mmio-size", &size_type_info,
virt_get_highmem_mmio_size,
virt_set_highmem_mmio_size,
NULL, NULL);
diff --git a/hw/mem/nvdimm.c b/hw/mem/nvdimm.c
index cf8a4d8c5f2a..123ddc938546 100644
--- a/hw/mem/nvdimm.c
+++ b/hw/mem/nvdimm.c
@@ -26,6 +26,7 @@
#include "qemu/module.h"
#include "qemu/pmem.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qapi/visitor.h"
#include "hw/mem/nvdimm.h"
#include "hw/core/qdev-properties.h"
@@ -99,9 +100,9 @@ static void nvdimm_set_uuid(Object *obj, Visitor *v, const char *name,
static void nvdimm_init(Object *obj)
{
- object_property_add(obj, NVDIMM_LABEL_SIZE_PROP, "size",
- nvdimm_get_label_size, nvdimm_set_label_size, NULL,
- NULL);
+ object_property_add_qapi(obj, NVDIMM_LABEL_SIZE_PROP, &size_type_info,
+ nvdimm_get_label_size, nvdimm_set_label_size, NULL,
+ NULL);
object_property_add(obj, NVDIMM_UUID_PROP, "QemuUUID", nvdimm_get_uuid,
nvdimm_set_uuid, NULL, NULL);
diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c
index 68862926ee2d..ee586ecc0c7d 100644
--- a/hw/mem/pc-dimm.c
+++ b/hw/mem/pc-dimm.c
@@ -26,6 +26,7 @@
#include "hw/mem/nvdimm.h"
#include "hw/mem/memory-device.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qapi/visitor.h"
#include "qemu/module.h"
#include "system/hostmem.h"
@@ -176,7 +177,7 @@ static void pc_dimm_get_size(Object *obj, Visitor *v, const char *name,
static void pc_dimm_init(Object *obj)
{
- object_property_add(obj, PC_DIMM_SIZE_PROP, "uint64", pc_dimm_get_size,
+ object_property_add_qapi(obj, PC_DIMM_SIZE_PROP, &uint64_type_info, pc_dimm_get_size,
NULL, NULL, NULL);
}
diff --git a/hw/misc/aspeed_lpc.c b/hw/misc/aspeed_lpc.c
index 7f7e4f1a0985..e2d9b7572f27 100644
--- a/hw/misc/aspeed_lpc.c
+++ b/hw/misc/aspeed_lpc.c
@@ -12,6 +12,7 @@
#include "qemu/error-report.h"
#include "hw/misc/aspeed_lpc.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qapi/visitor.h"
#include "hw/core/irq.h"
#include "hw/core/qdev-properties.h"
@@ -417,30 +418,54 @@ static void aspeed_lpc_realize(DeviceState *dev, Error **errp)
static void aspeed_lpc_init(Object *obj)
{
- object_property_add(obj, "idr1", "uint32", aspeed_kcs_get_register_property,
- aspeed_kcs_set_register_property, NULL, NULL);
- object_property_add(obj, "odr1", "uint32", aspeed_kcs_get_register_property,
- aspeed_kcs_set_register_property, NULL, NULL);
- object_property_add(obj, "str1", "uint32", aspeed_kcs_get_register_property,
- aspeed_kcs_set_register_property, NULL, NULL);
- object_property_add(obj, "idr2", "uint32", aspeed_kcs_get_register_property,
- aspeed_kcs_set_register_property, NULL, NULL);
- object_property_add(obj, "odr2", "uint32", aspeed_kcs_get_register_property,
- aspeed_kcs_set_register_property, NULL, NULL);
- object_property_add(obj, "str2", "uint32", aspeed_kcs_get_register_property,
- aspeed_kcs_set_register_property, NULL, NULL);
- object_property_add(obj, "idr3", "uint32", aspeed_kcs_get_register_property,
- aspeed_kcs_set_register_property, NULL, NULL);
- object_property_add(obj, "odr3", "uint32", aspeed_kcs_get_register_property,
- aspeed_kcs_set_register_property, NULL, NULL);
- object_property_add(obj, "str3", "uint32", aspeed_kcs_get_register_property,
- aspeed_kcs_set_register_property, NULL, NULL);
- object_property_add(obj, "idr4", "uint32", aspeed_kcs_get_register_property,
- aspeed_kcs_set_register_property, NULL, NULL);
- object_property_add(obj, "odr4", "uint32", aspeed_kcs_get_register_property,
- aspeed_kcs_set_register_property, NULL, NULL);
- object_property_add(obj, "str4", "uint32", aspeed_kcs_get_register_property,
- aspeed_kcs_set_register_property, NULL, NULL);
+ object_property_add_qapi(obj, "idr1", &uint32_type_info,
+ aspeed_kcs_get_register_property,
+ aspeed_kcs_set_register_property,
+ NULL, NULL);
+ object_property_add_qapi(obj, "odr1", &uint32_type_info,
+ aspeed_kcs_get_register_property,
+ aspeed_kcs_set_register_property,
+ NULL, NULL);
+ object_property_add_qapi(obj, "str1", &uint32_type_info,
+ aspeed_kcs_get_register_property,
+ aspeed_kcs_set_register_property,
+ NULL, NULL);
+ object_property_add_qapi(obj, "idr2", &uint32_type_info,
+ aspeed_kcs_get_register_property,
+ aspeed_kcs_set_register_property,
+ NULL, NULL);
+ object_property_add_qapi(obj, "odr2", &uint32_type_info,
+ aspeed_kcs_get_register_property,
+ aspeed_kcs_set_register_property,
+ NULL, NULL);
+ object_property_add_qapi(obj, "str2", &uint32_type_info,
+ aspeed_kcs_get_register_property,
+ aspeed_kcs_set_register_property,
+ NULL, NULL);
+ object_property_add_qapi(obj, "idr3", &uint32_type_info,
+ aspeed_kcs_get_register_property,
+ aspeed_kcs_set_register_property,
+ NULL, NULL);
+ object_property_add_qapi(obj, "odr3", &uint32_type_info,
+ aspeed_kcs_get_register_property,
+ aspeed_kcs_set_register_property,
+ NULL, NULL);
+ object_property_add_qapi(obj, "str3", &uint32_type_info,
+ aspeed_kcs_get_register_property,
+ aspeed_kcs_set_register_property,
+ NULL, NULL);
+ object_property_add_qapi(obj, "idr4", &uint32_type_info,
+ aspeed_kcs_get_register_property,
+ aspeed_kcs_set_register_property,
+ NULL, NULL);
+ object_property_add_qapi(obj, "odr4", &uint32_type_info,
+ aspeed_kcs_get_register_property,
+ aspeed_kcs_set_register_property,
+ NULL, NULL);
+ object_property_add_qapi(obj, "str4", &uint32_type_info,
+ aspeed_kcs_get_register_property,
+ aspeed_kcs_set_register_property,
+ NULL, NULL);
}
static const VMStateDescription vmstate_aspeed_lpc = {
diff --git a/hw/misc/aspeed_sdmc.c b/hw/misc/aspeed_sdmc.c
index f8fbaebee6ab..d096cc88f5c5 100644
--- a/hw/misc/aspeed_sdmc.c
+++ b/hw/misc/aspeed_sdmc.c
@@ -15,6 +15,7 @@
#include "hw/core/qdev-properties.h"
#include "migration/vmstate.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "trace.h"
#include "qemu/units.h"
#include "qemu/cutils.h"
@@ -259,7 +260,7 @@ static void aspeed_sdmc_set_ram_size(Object *obj, Visitor *v, const char *name,
static void aspeed_sdmc_initfn(Object *obj)
{
- object_property_add(obj, "ram-size", "int",
+ object_property_add_qapi(obj, "ram-size", &int_type_info,
aspeed_sdmc_get_ram_size, aspeed_sdmc_set_ram_size,
NULL, NULL);
}
diff --git a/hw/misc/npcm7xx_mft.c b/hw/misc/npcm7xx_mft.c
index 742166c4e828..99e9e49788c0 100644
--- a/hw/misc/npcm7xx_mft.c
+++ b/hw/misc/npcm7xx_mft.c
@@ -23,6 +23,7 @@
#include "hw/core/registerfields.h"
#include "migration/vmstate.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qapi/visitor.h"
#include "qemu/bitops.h"
#include "qemu/error-report.h"
@@ -491,7 +492,7 @@ static void npcm7xx_mft_init(Object *obj)
s->clock_2 = qdev_init_clock_out(dev, "clock2");
for (int i = 0; i < NPCM7XX_PWM_PER_MODULE; ++i) {
- object_property_add(obj, "max_rpm[*]", "uint32",
+ object_property_add_qapi(obj, "max_rpm[*]", &uint32_type_info,
npcm7xx_mft_get_max_rpm,
npcm7xx_mft_set_max_rpm,
NULL, &s->max_rpm[i]);
diff --git a/hw/net/ne2000-isa.c b/hw/net/ne2000-isa.c
index 673c785abc94..63e0d40ee726 100644
--- a/hw/net/ne2000-isa.c
+++ b/hw/net/ne2000-isa.c
@@ -29,6 +29,7 @@
#include "ne2000.h"
#include "system/system.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qapi/visitor.h"
#include "qemu/module.h"
#include "qom/object.h"
@@ -131,7 +132,7 @@ out:
static void isa_ne2000_instance_init(Object *obj)
{
- object_property_add(obj, "bootindex", "int32",
+ object_property_add_qapi(obj, "bootindex", &int32_type_info,
isa_ne2000_get_bootindex,
isa_ne2000_set_bootindex, NULL, NULL);
object_property_set_int(obj, "bootindex", -1, NULL);
diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c
index 578421c21761..1065b9411ddf 100644
--- a/hw/nvme/ctrl.c
+++ b/hw/nvme/ctrl.c
@@ -203,6 +203,7 @@
#include "qemu/units.h"
#include "qemu/range.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qapi/visitor.h"
#include "system/system.h"
#include "system/block-backend.h"
@@ -10612,7 +10613,7 @@ static void nvme_instance_init(Object *obj)
"bootindex", "/namespace@1,0",
DEVICE(obj));
- object_property_add(obj, "smart_critical_warning", "uint8",
+ object_property_add_qapi(obj, "smart_critical_warning", &uint8_type_info,
nvme_get_smart_warning,
nvme_set_smart_warning, NULL, NULL);
}
diff --git a/hw/pci-bridge/pci_expander_bridge.c b/hw/pci-bridge/pci_expander_bridge.c
index 40ffbc4e0821..9bb7d3c9debe 100644
--- a/hw/pci-bridge/pci_expander_bridge.c
+++ b/hw/pci-bridge/pci_expander_bridge.c
@@ -12,6 +12,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_bus.h"
#include "hw/pci/pci_host.h"
@@ -103,7 +104,7 @@ static void pxb_bus_class_init(ObjectClass *class, const void *data)
pbc->bus_num = pxb_bus_num;
pbc->numa_node = pxb_bus_numa_node;
- object_class_property_add(class, "acpi_uid", "uint32",
+ object_class_property_add_qapi(class, "acpi_uid", &uint32_type_info,
prop_pxb_uid_get, NULL, NULL, NULL);
object_class_property_set_description(class, "acpi_uid",
"ACPI Unique ID used to distinguish this PCI Host Bridge / ACPI00016");
diff --git a/hw/pci-host/i440fx.c b/hw/pci-host/i440fx.c
index c1982f7962a6..feafa6a72fe4 100644
--- a/hw/pci-host/i440fx.c
+++ b/hw/pci-host/i440fx.c
@@ -32,6 +32,7 @@
#include "hw/core/qdev-properties.h"
#include "hw/core/sysbus.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "migration/vmstate.h"
#include "qapi/visitor.h"
#include "qemu/error-report.h"
@@ -387,21 +388,25 @@ static void i440fx_pcihost_class_init(ObjectClass *klass, const void *data)
/* Reason: needs to be wired up by pc_init1 */
dc->user_creatable = false;
- object_class_property_add(klass, PCI_HOST_PROP_PCI_HOLE_START, "uint32",
- i440fx_pcihost_get_pci_hole_start,
- NULL, NULL, NULL);
+ object_class_property_add_qapi(klass, PCI_HOST_PROP_PCI_HOLE_START,
+ &uint32_type_info,
+ i440fx_pcihost_get_pci_hole_start,
+ NULL, NULL, NULL);
- object_class_property_add(klass, PCI_HOST_PROP_PCI_HOLE_END, "uint32",
- i440fx_pcihost_get_pci_hole_end,
- NULL, NULL, NULL);
+ object_class_property_add_qapi(klass, PCI_HOST_PROP_PCI_HOLE_END,
+ &uint32_type_info,
+ i440fx_pcihost_get_pci_hole_end,
+ NULL, NULL, NULL);
- object_class_property_add(klass, PCI_HOST_PROP_PCI_HOLE64_START, "uint64",
- i440fx_pcihost_get_pci_hole64_start,
- NULL, NULL, NULL);
+ object_class_property_add_qapi(klass, PCI_HOST_PROP_PCI_HOLE64_START,
+ &uint64_type_info,
+ i440fx_pcihost_get_pci_hole64_start,
+ NULL, NULL, NULL);
- object_class_property_add(klass, PCI_HOST_PROP_PCI_HOLE64_END, "uint64",
- i440fx_pcihost_get_pci_hole64_end,
- NULL, NULL, NULL);
+ object_class_property_add_qapi(klass, PCI_HOST_PROP_PCI_HOLE64_END,
+ &uint64_type_info,
+ i440fx_pcihost_get_pci_hole64_end,
+ NULL, NULL, NULL);
}
static const TypeInfo i440fx_pcihost_info = {
diff --git a/hw/pci-host/pnv_phb3.c b/hw/pci-host/pnv_phb3.c
index db061c134e95..667e9585ab8f 100644
--- a/hw/pci-host/pnv_phb3.c
+++ b/hw/pci-host/pnv_phb3.c
@@ -11,6 +11,7 @@
#include "qemu/bswap.h"
#include "qapi/visitor.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "hw/pci-host/pnv_phb3_regs.h"
#include "hw/pci-host/pnv_phb.h"
#include "hw/pci-host/pnv_phb3.h"
@@ -1164,12 +1165,12 @@ static void pnv_phb3_root_bus_class_init(ObjectClass *klass, const void *data)
{
BusClass *k = BUS_CLASS(klass);
- object_class_property_add(klass, "phb-id", "uint32",
+ object_class_property_add_qapi(klass, "phb-id", &uint32_type_info,
pnv_phb3_root_bus_get_prop,
pnv_phb3_root_bus_set_prop,
NULL, NULL);
- object_class_property_add(klass, "chip-id", "uint32",
+ object_class_property_add_qapi(klass, "chip-id", &uint32_type_info,
pnv_phb3_root_bus_get_prop,
pnv_phb3_root_bus_set_prop,
NULL, NULL);
diff --git a/hw/pci-host/pnv_phb4.c b/hw/pci-host/pnv_phb4.c
index 9acaf4c0c2f5..96c2f89f889b 100644
--- a/hw/pci-host/pnv_phb4.c
+++ b/hw/pci-host/pnv_phb4.c
@@ -11,6 +11,7 @@
#include "qemu/bswap.h"
#include "qapi/visitor.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "target/ppc/cpu.h"
#include "hw/pci-host/pnv_phb4_regs.h"
#include "hw/pci-host/pnv_phb4.h"
@@ -1761,12 +1762,12 @@ static void pnv_phb4_root_bus_class_init(ObjectClass *klass, const void *data)
{
BusClass *k = BUS_CLASS(klass);
- object_class_property_add(klass, "phb-id", "uint32",
+ object_class_property_add_qapi(klass, "phb-id", &uint32_type_info,
pnv_phb4_root_bus_get_prop,
pnv_phb4_root_bus_set_prop,
NULL, NULL);
- object_class_property_add(klass, "chip-id", "uint32",
+ object_class_property_add_qapi(klass, "chip-id", &uint32_type_info,
pnv_phb4_root_bus_get_prop,
pnv_phb4_root_bus_set_prop,
NULL, NULL);
diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c
index f4556ad03a04..6eba30e06811 100644
--- a/hw/pci-host/q35.c
+++ b/hw/pci-host/q35.c
@@ -35,6 +35,7 @@
#include "hw/core/qdev-properties.h"
#include "migration/vmstate.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qapi/visitor.h"
#include "qemu/module.h"
@@ -226,19 +227,19 @@ static void q35_host_initfn(Object *obj)
qdev_prop_set_uint64(DEVICE(s), PCI_HOST_PROP_PCI_HOLE64_SIZE,
Q35_PCI_HOST_HOLE64_SIZE_DEFAULT);
- object_property_add(obj, PCI_HOST_PROP_PCI_HOLE_START, "uint32",
+ object_property_add_qapi(obj, PCI_HOST_PROP_PCI_HOLE_START, &uint32_type_info,
q35_host_get_pci_hole_start,
NULL, NULL, NULL);
- object_property_add(obj, PCI_HOST_PROP_PCI_HOLE_END, "uint32",
+ object_property_add_qapi(obj, PCI_HOST_PROP_PCI_HOLE_END, &uint32_type_info,
q35_host_get_pci_hole_end,
NULL, NULL, NULL);
- object_property_add(obj, PCI_HOST_PROP_PCI_HOLE64_START, "uint64",
+ object_property_add_qapi(obj, PCI_HOST_PROP_PCI_HOLE64_START, &uint64_type_info,
q35_host_get_pci_hole64_start,
NULL, NULL, NULL);
- object_property_add(obj, PCI_HOST_PROP_PCI_HOLE64_END, "uint64",
+ object_property_add_qapi(obj, PCI_HOST_PROP_PCI_HOLE64_END, &uint64_type_info,
q35_host_get_pci_hole64_end,
NULL, NULL, NULL);
diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c
index 5c2150b71c86..64f9ca29b02e 100644
--- a/hw/ppc/spapr_drc.c
+++ b/hw/ppc/spapr_drc.c
@@ -12,6 +12,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qobject/qnull.h"
#include "qemu/cutils.h"
#include "hw/ppc/spapr_drc.h"
@@ -584,7 +585,7 @@ static void spapr_dr_connector_instance_init(Object *obj)
SpaprDrcClass *drck = SPAPR_DR_CONNECTOR_GET_CLASS(drc);
object_property_add_uint32_ptr(obj, "id", &drc->id, OBJ_PROP_FLAG_READ);
- object_property_add(obj, "index", "uint32", prop_get_index,
+ object_property_add_qapi(obj, "index", &uint32_type_info, prop_get_index,
NULL, NULL, NULL);
object_property_add(obj, "fdt", "struct", prop_get_fdt,
NULL, NULL, NULL);
diff --git a/hw/riscv/microchip_pfsoc.c b/hw/riscv/microchip_pfsoc.c
index edd29626fa07..e36063244bde 100644
--- a/hw/riscv/microchip_pfsoc.c
+++ b/hw/riscv/microchip_pfsoc.c
@@ -39,6 +39,7 @@
#include "qemu/units.h"
#include "qemu/cutils.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qapi/visitor.h"
#include "hw/core/boards.h"
#include "hw/core/loader.h"
@@ -743,7 +744,7 @@ static void microchip_icicle_kit_machine_class_init(ObjectClass *oc,
*/
mc->default_ram_size = 1537 * MiB;
- object_class_property_add(oc, "clint-timebase-frequency", "uint32_t",
+ object_class_property_add_qapi(oc, "clint-timebase-frequency", &uint32_type_info,
microchip_icicle_kit_get_clint_timebase_freq,
microchip_icicle_kit_set_clint_timebase_freq,
NULL, NULL);
diff --git a/hw/s390x/sclpcpi.c b/hw/s390x/sclpcpi.c
index ec4bdf23509b..97d37ae4b932 100644
--- a/hw/s390x/sclpcpi.c
+++ b/hw/s390x/sclpcpi.c
@@ -53,6 +53,7 @@
#include "qemu/timer.h"
#include "hw/s390x/event-facility.h"
#include "hw/s390x/ebcdic.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qapi/qapi-visit-machine.h"
#include "qapi/qapi-events-machine-s390x.h"
#include "migration/vmstate.h"
@@ -195,12 +196,13 @@ static void cpi_class_init(ObjectClass *klass, const void *data)
"name of the cluster which the VM belongs to, if any"
" e.g. \"PLEX \"");
- object_class_property_add(klass, "system_level", "uint64", get_system_level,
- NULL, NULL, NULL);
+ object_class_property_add_qapi(klass, "system_level",
+ &uint64_type_info, get_system_level,
+ NULL, NULL, NULL);
object_class_property_set_description(klass, "system_level",
"distribution and kernel version in Linux e.g. 74872343805430528");
- object_class_property_add(klass, "timestamp", "uint64", get_timestamp,
+ object_class_property_add_qapi(klass, "timestamp", &uint64_type_info, get_timestamp,
NULL, NULL, NULL);
object_class_property_set_description(klass, "timestamp",
"latest update of CPI data in nanoseconds since the UNIX EPOCH");
diff --git a/hw/s390x/virtio-ccw-mem.c b/hw/s390x/virtio-ccw-mem.c
index dea30aacfb32..046dfd544cf3 100644
--- a/hw/s390x/virtio-ccw-mem.c
+++ b/hw/s390x/virtio-ccw-mem.c
@@ -13,6 +13,7 @@
#include "qemu/osdep.h"
#include "hw/core/qdev-properties.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qemu/module.h"
#include "virtio-ccw-mem.h"
#include "hw/mem/memory-device.h"
@@ -205,7 +206,7 @@ static void virtio_ccw_mem_instance_init(Object *obj)
OBJECT(&dev->vdev), VIRTIO_MEM_BLOCK_SIZE_PROP);
object_property_add_alias(obj, VIRTIO_MEM_SIZE_PROP, OBJECT(&dev->vdev),
VIRTIO_MEM_SIZE_PROP);
- object_property_add(obj, VIRTIO_MEM_REQUESTED_SIZE_PROP, "size",
+ object_property_add_qapi(obj, VIRTIO_MEM_REQUESTED_SIZE_PROP, &size_type_info,
virtio_ccw_mem_get_requested_size,
virtio_ccw_mem_set_requested_size, NULL, NULL);
}
diff --git a/hw/sensor/adc128d818.c b/hw/sensor/adc128d818.c
index c65508cba144..7efc48a036ec 100644
--- a/hw/sensor/adc128d818.c
+++ b/hw/sensor/adc128d818.c
@@ -8,6 +8,7 @@
#include "qemu/osdep.h"
#include "qemu/log.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qapi/error.h"
#include "qapi/visitor.h"
#include "qom/object.h"
@@ -642,15 +643,18 @@ static void adc128d818_initfn(Object *obj)
for (unsigned ch = 0u; ch < ADC128D818_NUM_CHANNELS; ch++) {
char *name = g_strdup_printf("ain%u", ch);
- object_property_add(obj, name, "int", adc128d818_get_ain,
- adc128d818_set_ain, NULL, NULL);
+ object_property_add_qapi(obj, name, &int_type_info,
+ adc128d818_get_ain,
+ adc128d818_set_ain, NULL, NULL);
g_free(name);
}
- object_property_add(obj, "temperature", "int", adc128d818_get_temperature,
- adc128d818_set_temperature, NULL, NULL);
- object_property_add(obj, "ext-vref-mv", "int", adc128d818_get_ext_vref,
- adc128d818_set_ext_vref, NULL, NULL);
+ object_property_add_qapi(obj, "temperature", &int_type_info,
+ adc128d818_get_temperature,
+ adc128d818_set_temperature, NULL, NULL);
+ object_property_add_qapi(obj, "ext-vref-mv", &int_type_info,
+ adc128d818_get_ext_vref,
+ adc128d818_set_ext_vref, NULL, NULL);
}
static void adc128d818_realize(DeviceState *dev, Error **errp)
diff --git a/hw/sensor/adm1266.c b/hw/sensor/adm1266.c
index 37d1cffd57a9..62f563af7a7a 100644
--- a/hw/sensor/adm1266.c
+++ b/hw/sensor/adm1266.c
@@ -14,6 +14,7 @@
#include "hw/core/irq.h"
#include "migration/vmstate.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qapi/visitor.h"
#include "qemu/log.h"
#include "qemu/module.h"
@@ -217,7 +218,7 @@ static void adm1266_init(Object *obj)
for (int i = 0; i < ADM1266_NUM_PAGES; i++) {
pmbus_page_config(pmdev, i, flags);
- object_property_add(obj, "vout[*]", "uint16",
+ object_property_add_qapi(obj, "vout[*]", &uint16_type_info,
adm1266_get,
adm1266_set, NULL, &pmdev->pages[i].read_vout);
}
diff --git a/hw/sensor/adm1272.c b/hw/sensor/adm1272.c
index 0aa2a8655683..e1c1bf1c54de 100644
--- a/hw/sensor/adm1272.c
+++ b/hw/sensor/adm1272.c
@@ -12,6 +12,7 @@
#include "hw/core/irq.h"
#include "migration/vmstate.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qapi/visitor.h"
#include "qemu/log.h"
#include "qemu/module.h"
@@ -493,19 +494,19 @@ static void adm1272_init(Object *obj)
pmbus_page_config(pmdev, 0, flags);
- object_property_add(obj, "vin", "uint16",
+ object_property_add_qapi(obj, "vin", &uint16_type_info,
adm1272_get,
adm1272_set, NULL, &pmdev->pages[0].read_vin);
- object_property_add(obj, "vout", "uint16",
+ object_property_add_qapi(obj, "vout", &uint16_type_info,
adm1272_get,
adm1272_set, NULL, &pmdev->pages[0].read_vout);
- object_property_add(obj, "iout", "uint16",
+ object_property_add_qapi(obj, "iout", &uint16_type_info,
adm1272_get,
adm1272_set, NULL, &pmdev->pages[0].read_iout);
- object_property_add(obj, "pin", "uint16",
+ object_property_add_qapi(obj, "pin", &uint16_type_info,
adm1272_get,
adm1272_set, NULL, &pmdev->pages[0].read_pin);
diff --git a/hw/sensor/emc141x.c b/hw/sensor/emc141x.c
index a51fc44395ab..5efe94643ca0 100644
--- a/hw/sensor/emc141x.c
+++ b/hw/sensor/emc141x.c
@@ -22,6 +22,7 @@
#include "hw/i2c/i2c.h"
#include "migration/vmstate.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qapi/visitor.h"
#include "qemu/module.h"
#include "qom/object.h"
@@ -251,16 +252,16 @@ static void emc141x_reset(DeviceState *dev)
static void emc141x_initfn(Object *obj)
{
- object_property_add(obj, "temperature0", "int",
+ object_property_add_qapi(obj, "temperature0", &int_type_info,
emc141x_get_temperature,
emc141x_set_temperature, NULL, NULL);
- object_property_add(obj, "temperature1", "int",
+ object_property_add_qapi(obj, "temperature1", &int_type_info,
emc141x_get_temperature,
emc141x_set_temperature, NULL, NULL);
- object_property_add(obj, "temperature2", "int",
+ object_property_add_qapi(obj, "temperature2", &int_type_info,
emc141x_get_temperature,
emc141x_set_temperature, NULL, NULL);
- object_property_add(obj, "temperature3", "int",
+ object_property_add_qapi(obj, "temperature3", &int_type_info,
emc141x_get_temperature,
emc141x_set_temperature, NULL, NULL);
}
diff --git a/hw/sensor/isl_pmbus_vr.c b/hw/sensor/isl_pmbus_vr.c
index 0fad04def773..8923e9e87510 100644
--- a/hw/sensor/isl_pmbus_vr.c
+++ b/hw/sensor/isl_pmbus_vr.c
@@ -9,6 +9,7 @@
#include "qemu/osdep.h"
#include "hw/sensor/isl_pmbus_vr.h"
#include "hw/core/qdev-properties.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qapi/visitor.h"
#include "qemu/log.h"
#include "qemu/module.h"
@@ -136,63 +137,63 @@ static void isl_pmbus_vr_add_props(Object *obj, uint64_t *flags, uint8_t pages)
PMBusDevice *pmdev = PMBUS_DEVICE(obj);
for (int i = 0; i < pages; i++) {
if (flags[i] & PB_HAS_VIN) {
- object_property_add(obj, "vin[*]", "uint16",
+ object_property_add_qapi(obj, "vin[*]", &uint16_type_info,
isl_pmbus_vr_get,
isl_pmbus_vr_set,
NULL, &pmdev->pages[i].read_vin);
}
if (flags[i] & PB_HAS_VOUT) {
- object_property_add(obj, "vout[*]", "uint16",
+ object_property_add_qapi(obj, "vout[*]", &uint16_type_info,
isl_pmbus_vr_get,
isl_pmbus_vr_set,
NULL, &pmdev->pages[i].read_vout);
}
if (flags[i] & PB_HAS_IIN) {
- object_property_add(obj, "iin[*]", "uint16",
+ object_property_add_qapi(obj, "iin[*]", &uint16_type_info,
isl_pmbus_vr_get,
isl_pmbus_vr_set,
NULL, &pmdev->pages[i].read_iin);
}
if (flags[i] & PB_HAS_IOUT) {
- object_property_add(obj, "iout[*]", "uint16",
+ object_property_add_qapi(obj, "iout[*]", &uint16_type_info,
isl_pmbus_vr_get,
isl_pmbus_vr_set,
NULL, &pmdev->pages[i].read_iout);
}
if (flags[i] & PB_HAS_PIN) {
- object_property_add(obj, "pin[*]", "uint16",
+ object_property_add_qapi(obj, "pin[*]", &uint16_type_info,
isl_pmbus_vr_get,
isl_pmbus_vr_set,
NULL, &pmdev->pages[i].read_pin);
}
if (flags[i] & PB_HAS_POUT) {
- object_property_add(obj, "pout[*]", "uint16",
+ object_property_add_qapi(obj, "pout[*]", &uint16_type_info,
isl_pmbus_vr_get,
isl_pmbus_vr_set,
NULL, &pmdev->pages[i].read_pout);
}
if (flags[i] & PB_HAS_TEMPERATURE) {
- object_property_add(obj, "temp1[*]", "uint16",
+ object_property_add_qapi(obj, "temp1[*]", &uint16_type_info,
isl_pmbus_vr_get,
isl_pmbus_vr_set,
NULL, &pmdev->pages[i].read_temperature_1);
}
if (flags[i] & PB_HAS_TEMP2) {
- object_property_add(obj, "temp2[*]", "uint16",
+ object_property_add_qapi(obj, "temp2[*]", &uint16_type_info,
isl_pmbus_vr_get,
isl_pmbus_vr_set,
NULL, &pmdev->pages[i].read_temperature_2);
}
if (flags[i] & PB_HAS_TEMP3) {
- object_property_add(obj, "temp3[*]", "uint16",
+ object_property_add_qapi(obj, "temp3[*]", &uint16_type_info,
isl_pmbus_vr_get,
isl_pmbus_vr_set,
NULL, &pmdev->pages[i].read_temperature_3);
diff --git a/hw/sensor/lsm303dlhc_mag.c b/hw/sensor/lsm303dlhc_mag.c
index cd5773ae64e8..c8085739ca47 100644
--- a/hw/sensor/lsm303dlhc_mag.c
+++ b/hw/sensor/lsm303dlhc_mag.c
@@ -25,6 +25,7 @@
#include "hw/i2c/i2c.h"
#include "migration/vmstate.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qapi/visitor.h"
#include "qemu/module.h"
#include "qemu/log.h"
@@ -509,19 +510,19 @@ static void lsm303dlhc_mag_reset(DeviceState *dev)
*/
static void lsm303dlhc_mag_initfn(Object *obj)
{
- object_property_add(obj, "mag-x", "int",
+ object_property_add_qapi(obj, "mag-x", &int_type_info,
lsm303dlhc_mag_get_x,
lsm303dlhc_mag_set_x, NULL, NULL);
- object_property_add(obj, "mag-y", "int",
+ object_property_add_qapi(obj, "mag-y", &int_type_info,
lsm303dlhc_mag_get_y,
lsm303dlhc_mag_set_y, NULL, NULL);
- object_property_add(obj, "mag-z", "int",
+ object_property_add_qapi(obj, "mag-z", &int_type_info,
lsm303dlhc_mag_get_z,
lsm303dlhc_mag_set_z, NULL, NULL);
- object_property_add(obj, "temperature", "int",
+ object_property_add_qapi(obj, "temperature", &int_type_info,
lsm303dlhc_mag_get_temperature,
lsm303dlhc_mag_set_temperature, NULL, NULL);
}
diff --git a/hw/sensor/max34451.c b/hw/sensor/max34451.c
index 4d64434f3af4..3c8fa3d4a861 100644
--- a/hw/sensor/max34451.c
+++ b/hw/sensor/max34451.c
@@ -11,6 +11,7 @@
#include "hw/core/irq.h"
#include "migration/vmstate.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qapi/visitor.h"
#include "qemu/log.h"
#include "qemu/module.h"
@@ -727,7 +728,7 @@ static void max34451_init(Object *obj)
/* get and set the voltage in millivolts, max is 32767 mV */
for (int i = 0; i < MAX34451_NUM_PWR_DEVICES; i++) {
- object_property_add(obj, "vout[*]", "uint16",
+ object_property_add_qapi(obj, "vout[*]", &uint16_type_info,
max34451_get,
max34451_set, NULL, &pmdev->pages[i].read_vout);
}
@@ -737,7 +738,7 @@ static void max34451_init(Object *obj)
* centidegrees Celsius i.e.: 2500 -> 25.00 C, max is 327.67 C
*/
for (int i = 0; i < MAX34451_NUM_TEMP_DEVICES; i++) {
- object_property_add(obj, "temperature[*]", "uint16",
+ object_property_add_qapi(obj, "temperature[*]", &uint16_type_info,
max34451_get,
max34451_set,
NULL,
diff --git a/hw/sensor/tmp105.c b/hw/sensor/tmp105.c
index ece0650d703f..5b6cc3ba2dc5 100644
--- a/hw/sensor/tmp105.c
+++ b/hw/sensor/tmp105.c
@@ -28,6 +28,7 @@
#include "qemu/osdep.h"
#include "qemu/module.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qapi/visitor.h"
#include "qom/object.h"
#include "hw/sensor/tmp105.h"
@@ -408,7 +409,7 @@ static void tmp105_realize(DeviceState *dev, Error **errp)
static void tmp105_initfn(Object *obj)
{
- object_property_add(obj, "temperature", "int",
+ object_property_add_qapi(obj, "temperature", &int_type_info,
tmp105_get_temperature,
tmp105_set_temperature, NULL, NULL);
object_property_set_description(obj, "temperature",
diff --git a/hw/sensor/tmp421.c b/hw/sensor/tmp421.c
index 127edd0ba568..60844e76b21f 100644
--- a/hw/sensor/tmp421.c
+++ b/hw/sensor/tmp421.c
@@ -28,6 +28,7 @@
#include "hw/i2c/i2c.h"
#include "migration/vmstate.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qapi/visitor.h"
#include "qemu/module.h"
#include "qom/object.h"
@@ -350,16 +351,16 @@ static void tmp421_class_init(ObjectClass *klass, const void *data)
dc->vmsd = &vmstate_tmp421;
sc->dev = (DeviceInfo *) data;
- object_class_property_add(klass, "temperature0", "int",
+ object_class_property_add_qapi(klass, "temperature0", &int_type_info,
tmp421_get_temperature,
tmp421_set_temperature, NULL, NULL);
- object_class_property_add(klass, "temperature1", "int",
+ object_class_property_add_qapi(klass, "temperature1", &int_type_info,
tmp421_get_temperature,
tmp421_set_temperature, NULL, NULL);
- object_class_property_add(klass, "temperature2", "int",
+ object_class_property_add_qapi(klass, "temperature2", &int_type_info,
tmp421_get_temperature,
tmp421_set_temperature, NULL, NULL);
- object_class_property_add(klass, "temperature3", "int",
+ object_class_property_add_qapi(klass, "temperature3", &int_type_info,
tmp421_get_temperature,
tmp421_set_temperature, NULL, NULL);
}
diff --git a/hw/usb/dev-storage-classic.c b/hw/usb/dev-storage-classic.c
index 977151c4a087..06584092bcae 100644
--- a/hw/usb/dev-storage-classic.c
+++ b/hw/usb/dev-storage-classic.c
@@ -9,6 +9,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qapi/visitor.h"
#include "hw/usb/usb.h"
#include "hw/usb/desc.h"
@@ -122,7 +123,7 @@ out:
static void usb_msd_instance_init(Object *obj)
{
- object_property_add(obj, "bootindex", "int32",
+ object_property_add_qapi(obj, "bootindex", &int32_type_info,
usb_msd_get_bootindex,
usb_msd_set_bootindex, NULL, NULL);
object_property_set_int(obj, "bootindex", -1, NULL);
diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c
index 07d519cf6d77..7ffbe48e5134 100644
--- a/hw/virtio/virtio-balloon.c
+++ b/hw/virtio/virtio-balloon.c
@@ -27,6 +27,7 @@
#include "hw/virtio/virtio-balloon.h"
#include "system/address-spaces.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qapi/qapi-events-machine.h"
#include "qapi/visitor.h"
#include "trace.h"
@@ -1039,7 +1040,7 @@ static void virtio_balloon_instance_init(Object *obj)
object_property_add(obj, "guest-stats", "guest statistics",
balloon_stats_get_all, NULL, NULL, NULL);
- object_property_add(obj, "guest-stats-polling-interval", "int",
+ object_property_add_qapi(obj, "guest-stats-polling-interval", &int_type_info,
balloon_stats_get_poll_interval,
balloon_stats_set_poll_interval,
NULL, NULL);
diff --git a/hw/virtio/virtio-mem-pci.c b/hw/virtio/virtio-mem-pci.c
index f592eb1a7849..80e9bfedd9f5 100644
--- a/hw/virtio/virtio-mem-pci.c
+++ b/hw/virtio/virtio-mem-pci.c
@@ -14,6 +14,7 @@
#include "virtio-mem-pci.h"
#include "hw/mem/memory-device.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qapi/qapi-events-machine.h"
#include "qapi/qapi-events-misc.h"
@@ -211,7 +212,7 @@ static void virtio_mem_pci_instance_init(Object *obj)
OBJECT(&dev->vdev), VIRTIO_MEM_BLOCK_SIZE_PROP);
object_property_add_alias(obj, VIRTIO_MEM_SIZE_PROP, OBJECT(&dev->vdev),
VIRTIO_MEM_SIZE_PROP);
- object_property_add(obj, VIRTIO_MEM_REQUESTED_SIZE_PROP, "size",
+ object_property_add_qapi(obj, VIRTIO_MEM_REQUESTED_SIZE_PROP, &size_type_info,
virtio_mem_pci_get_requested_size,
virtio_mem_pci_set_requested_size, NULL, NULL);
}
diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c
index 7130ed852d9c..42dc028e3bdc 100644
--- a/hw/virtio/virtio-mem.c
+++ b/hw/virtio/virtio-mem.c
@@ -26,6 +26,7 @@
#include "hw/virtio/virtio-bus.h"
#include "hw/virtio/virtio-mem.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qapi/visitor.h"
#include "migration/misc.h"
#include "hw/core/boards.h"
@@ -1533,14 +1534,15 @@ static void virtio_mem_instance_init(Object *obj)
notifier_list_init(&vmem->size_change_notifiers);
- object_property_add(obj, VIRTIO_MEM_SIZE_PROP, "size", virtio_mem_get_size,
- NULL, NULL, NULL);
- object_property_add(obj, VIRTIO_MEM_REQUESTED_SIZE_PROP, "size",
- virtio_mem_get_requested_size,
- virtio_mem_set_requested_size, NULL, NULL);
- object_property_add(obj, VIRTIO_MEM_BLOCK_SIZE_PROP, "size",
- virtio_mem_get_block_size, virtio_mem_set_block_size,
- NULL, NULL);
+ object_property_add_qapi(obj, VIRTIO_MEM_SIZE_PROP, &size_type_info,
+ virtio_mem_get_size,
+ NULL, NULL, NULL);
+ object_property_add_qapi(obj, VIRTIO_MEM_REQUESTED_SIZE_PROP, &size_type_info,
+ virtio_mem_get_requested_size,
+ virtio_mem_set_requested_size, NULL, NULL);
+ object_property_add_qapi(obj, VIRTIO_MEM_BLOCK_SIZE_PROP, &size_type_info,
+ virtio_mem_get_block_size, virtio_mem_set_block_size,
+ NULL, NULL);
}
static void virtio_mem_instance_finalize(Object *obj)
diff --git a/hw/xen/xen-pvh-common.c b/hw/xen/xen-pvh-common.c
index cca37202ffb2..7b4fd933a8fb 100644
--- a/hw/xen/xen-pvh-common.c
+++ b/hw/xen/xen-pvh-common.c
@@ -9,6 +9,7 @@
#include "qemu/osdep.h"
#include "qemu/error-report.h"
#include "qemu/units.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qapi/visitor.h"
#include "hw/core/boards.h"
#include "hw/core/irq.h"
@@ -413,7 +414,7 @@ void xen_pvh_class_setup_common_props(XenPVHMachineClass *xpc)
#define OC_MEMMAP_PROP_BASE(c, prop_name, name) \
do { \
- object_class_property_add(c, prop_name "-base", "uint64_t", \
+ object_class_property_add_qapi(c, prop_name "-base", &uint64_type_info,\
xen_pvh_get_ ## name ## _base, \
xen_pvh_set_ ## name ## _base, NULL, NULL); \
object_class_property_set_description(oc, prop_name "-base", \
@@ -422,7 +423,7 @@ do { \
#define OC_MEMMAP_PROP_SIZE(c, prop_name, name) \
do { \
- object_class_property_add(c, prop_name "-size", "uint64_t", \
+ object_class_property_add_qapi(c, prop_name "-size", &size_type_info, \
xen_pvh_get_ ## name ## _size, \
xen_pvh_set_ ## name ## _size, NULL, NULL); \
object_class_property_set_description(oc, prop_name "-size", \
@@ -458,7 +459,7 @@ do { \
OC_MEMMAP_PROP(oc, "pci-mmio", pci_mmio);
OC_MEMMAP_PROP(oc, "pci-mmio-high", pci_mmio_high);
- object_class_property_add(oc, "pci-intx-irq-base", "uint32_t",
+ object_class_property_add_qapi(oc, "pci-intx-irq-base", &uint32_type_info,
xen_pvh_get_pci_intx_irq_base,
xen_pvh_set_pci_intx_irq_base,
NULL, NULL);
@@ -468,7 +469,7 @@ do { \
#ifdef CONFIG_TPM
if (xpc->has_tpm) {
- object_class_property_add(oc, "tpm-base-addr", "uint64_t",
+ object_class_property_add_qapi(oc, "tpm-base-addr", &uint64_type_info,
xen_pvh_get_tpm_base,
xen_pvh_set_tpm_base,
NULL, NULL);
diff --git a/iothread.c b/iothread.c
index 76eea6df3861..7285135d40a8 100644
--- a/iothread.c
+++ b/iothread.c
@@ -20,6 +20,7 @@
#include "system/event-loop-base.h"
#include "system/iothread.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qapi/qapi-commands-misc.h"
#include "qemu/error-report.h"
#include "qemu/rcu.h"
@@ -315,19 +316,19 @@ static void iothread_class_init(ObjectClass *klass, const void *class_data)
bc->init = iothread_init;
bc->update_params = iothread_set_aio_context_params;
- object_class_property_add(klass, "poll-max-ns", "int64",
+ object_class_property_add_qapi(klass, "poll-max-ns", &int64_type_info,
iothread_get_poll_param,
iothread_set_poll_param,
NULL, &poll_max_ns_info);
- object_class_property_add(klass, "poll-grow", "int64",
+ object_class_property_add_qapi(klass, "poll-grow", &int64_type_info,
iothread_get_poll_param,
iothread_set_poll_param,
NULL, &poll_grow_info);
- object_class_property_add(klass, "poll-shrink", "int64",
+ object_class_property_add_qapi(klass, "poll-shrink", &int64_type_info,
iothread_get_poll_param,
iothread_set_poll_param,
NULL, &poll_shrink_info);
- object_class_property_add(klass, "poll-weight", "int64",
+ object_class_property_add_qapi(klass, "poll-weight", &int64_type_info,
iothread_get_poll_param,
iothread_set_poll_param,
NULL, &poll_weight_info);
diff --git a/net/colo-compare.c b/net/colo-compare.c
index a6910de869ff..4b237a59d120 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -16,6 +16,7 @@
#include "qemu/error-report.h"
#include "trace.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "net/net.h"
#include "net/eth.h"
#include "qom/object_interfaces.h"
@@ -1373,15 +1374,15 @@ static void colo_compare_init(Object *obj)
object_property_add_str(obj, "notify_dev",
compare_get_notify_dev, compare_set_notify_dev);
- object_property_add(obj, "compare_timeout", "uint64",
+ object_property_add_qapi(obj, "compare_timeout", &uint64_type_info,
compare_get_timeout,
compare_set_timeout, NULL, NULL);
- object_property_add(obj, "expired_scan_cycle", "uint32",
+ object_property_add_qapi(obj, "expired_scan_cycle", &uint32_type_info,
compare_get_expired_scan_cycle,
compare_set_expired_scan_cycle, NULL, NULL);
- object_property_add(obj, "max_queue_size", "uint32",
+ object_property_add_qapi(obj, "max_queue_size", &uint32_type_info,
get_max_queue_size,
set_max_queue_size, NULL, NULL);
diff --git a/net/dump.c b/net/dump.c
index 0c39f09892c2..3d7bb36182ec 100644
--- a/net/dump.c
+++ b/net/dump.c
@@ -25,6 +25,7 @@
#include "qemu/osdep.h"
#include "clients.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qemu/error-report.h"
#include "qemu/iov.h"
#include "qemu/module.h"
@@ -238,8 +239,9 @@ static void filter_dump_class_init(ObjectClass *oc, const void *data)
{
NetFilterClass *nfc = NETFILTER_CLASS(oc);
- object_class_property_add(oc, "maxlen", "uint32", filter_dump_get_maxlen,
- filter_dump_set_maxlen, NULL, NULL);
+ object_class_property_add_qapi(oc, "maxlen", &uint32_type_info,
+ filter_dump_get_maxlen,
+ filter_dump_set_maxlen, NULL, NULL);
object_class_property_add_str(oc, "file", file_dump_get_filename,
file_dump_set_filename);
diff --git a/net/filter-buffer.c b/net/filter-buffer.c
index 427da24097f2..9d7a9f5cb2c7 100644
--- a/net/filter-buffer.c
+++ b/net/filter-buffer.c
@@ -10,6 +10,7 @@
#include "net/filter.h"
#include "net/queue.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qemu/timer.h"
#include "qemu/iov.h"
#include "qapi/qapi-builtin-visit.h"
@@ -182,7 +183,7 @@ static void filter_buffer_class_init(ObjectClass *oc, const void *data)
{
NetFilterClass *nfc = NETFILTER_CLASS(oc);
- object_class_property_add(oc, "interval", "uint32",
+ object_class_property_add_qapi(oc, "interval", &uint32_type_info,
filter_buffer_get_interval,
filter_buffer_set_interval, NULL, NULL);
diff --git a/qom/object.c b/qom/object.c
index cc113c0810e7..9f9a2abfa08d 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -22,10 +22,10 @@
#include "qapi/string-output-visitor.h"
#include "qapi/qobject-input-visitor.h"
#include "qapi/forward-visitor.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qapi/qapi-builtin-visit.h"
#include "qapi/compat-policy.h"
#include "qobject/qdict.h"
-#include "qobject/qjson.h"
#include "qemu/id.h"
#include "qapi/qmp/qerror.h"
#include "trace.h"
@@ -2449,7 +2449,7 @@ object_property_add_str(Object *obj, const char *name,
prop->get = get;
prop->set = set;
- return object_property_add(obj, name, "string",
+ return object_property_add_qapi(obj, name, &str_type_info,
get ? property_get_str : NULL,
set ? property_set_str : NULL,
property_release_data,
@@ -2467,7 +2467,7 @@ object_class_property_add_str(ObjectClass *klass, const char *name,
prop->get = get;
prop->set = set;
- return object_class_property_add(klass, name, "string",
+ return object_class_property_add_qapi(klass, name, &str_type_info,
get ? property_get_str : NULL,
set ? property_set_str : NULL,
NULL,
@@ -2519,7 +2519,7 @@ object_property_add_bool(Object *obj, const char *name,
prop->get = get;
prop->set = set;
- return object_property_add(obj, name, "bool",
+ return object_property_add_qapi(obj, name, &bool_type_info,
get ? property_get_bool : NULL,
set ? property_set_bool : NULL,
property_release_data,
@@ -2536,7 +2536,7 @@ object_class_property_add_bool(ObjectClass *klass, const char *name,
prop->get = get;
prop->set = set;
- return object_class_property_add(klass, name, "bool",
+ return object_class_property_add_qapi(klass, name, &bool_type_info,
get ? property_get_bool : NULL,
set ? property_set_bool : NULL,
NULL,
@@ -2945,8 +2945,8 @@ object_property_add_uint8_ptr(Object *obj, const char *name,
setter = property_set_uint8_ptr;
}
- return object_property_add(obj, name, "uint8",
- getter, setter, NULL, (void *)v);
+ return object_property_add_qapi(obj, name, &uint8_type_info,
+ getter, setter, NULL, (void *)v);
}
ObjectProperty *
@@ -2986,8 +2986,8 @@ object_class_static_property_add_uint8_ptr(ObjectClass *klass,
setter = property_set_uint8_ptr;
}
- return object_class_property_add(klass, name, "uint8",
- getter, setter, NULL, (void *)v);
+ return object_class_property_add_qapi(klass, name, &uint8_type_info,
+ getter, setter, NULL, (void *)v);
}
ObjectProperty *
@@ -3006,8 +3006,8 @@ object_property_add_uint16_ptr(Object *obj, const char *name,
setter = property_set_uint16_ptr;
}
- return object_property_add(obj, name, "uint16",
- getter, setter, NULL, (void *)v);
+ return object_property_add_qapi(obj, name, &uint16_type_info,
+ getter, setter, NULL, (void *)v);
}
ObjectProperty *
@@ -3047,8 +3047,8 @@ object_class_static_property_add_uint16_ptr(ObjectClass *klass,
setter = property_set_uint16_ptr;
}
- return object_class_property_add(klass, name, "uint16",
- getter, setter, NULL, (void *)v);
+ return object_class_property_add_qapi(klass, name, &uint16_type_info,
+ getter, setter, NULL, (void *)v);
}
ObjectProperty *
@@ -3067,8 +3067,8 @@ object_property_add_uint32_ptr(Object *obj, const char *name,
setter = property_set_uint32_ptr;
}
- return object_property_add(obj, name, "uint32",
- getter, setter, NULL, (void *)v);
+ return object_property_add_qapi(obj, name, &uint32_type_info,
+ getter, setter, NULL, (void *)v);
}
ObjectProperty *
@@ -3108,8 +3108,8 @@ object_class_static_property_add_uint32_ptr(ObjectClass *klass,
setter = property_set_uint32_ptr;
}
- return object_class_property_add(klass, name, "uint32",
- getter, setter, NULL, (void *)v);
+ return object_class_property_add_qapi(klass, name, &uint32_type_info,
+ getter, setter, NULL, (void *)v);
}
ObjectProperty *
@@ -3128,8 +3128,8 @@ object_property_add_uint64_ptr(Object *obj, const char *name,
setter = property_set_uint64_ptr;
}
- return object_property_add(obj, name, "uint64",
- getter, setter, NULL, (void *)v);
+ return object_property_add_qapi(obj, name, &uint64_type_info,
+ getter, setter, NULL, (void *)v);
}
ObjectProperty *
@@ -3169,8 +3169,8 @@ object_class_static_property_add_uint64_ptr(ObjectClass *klass,
setter = property_set_uint64_ptr;
}
- return object_class_property_add(klass, name, "uint64",
- getter, setter, NULL, (void *)v);
+ return object_class_property_add_qapi(klass, name, &uint64_type_info,
+ getter, setter, NULL, (void *)v);
}
typedef struct {
diff --git a/system/bootdevice.c b/system/bootdevice.c
index 9538b08983f5..7789e464186a 100644
--- a/system/bootdevice.c
+++ b/system/bootdevice.c
@@ -24,6 +24,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "system/system.h"
#include "qapi/visitor.h"
#include "qemu/error-report.h"
@@ -336,7 +337,7 @@ void device_add_bootindex_property(Object *obj, int32_t *bootindex,
prop->suffix = suffix;
prop->dev = dev;
- object_property_add(obj, name, "int32",
+ object_property_add_qapi(obj, name, &int32_type_info,
device_get_bootindex,
device_set_bootindex,
property_release_bootindex,
diff --git a/system/memory.c b/system/memory.c
index f1910af8a010..ff8dae018aa2 100644
--- a/system/memory.c
+++ b/system/memory.c
@@ -16,6 +16,7 @@
#include "qemu/osdep.h"
#include "qemu/log.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "system/memory.h"
#include "qapi/visitor.h"
#include "qemu/bitops.h"
@@ -1293,11 +1294,11 @@ static void memory_region_initfn(Object *obj)
object_property_add_uint64_ptr(OBJECT(mr), "addr",
&mr->addr, OBJ_PROP_FLAG_READ);
- object_property_add(OBJECT(mr), "priority", "int32",
+ object_property_add_qapi(OBJECT(mr), "priority", &int32_type_info,
memory_region_get_priority,
NULL, /* memory_region_set_priority */
NULL, NULL);
- object_property_add(OBJECT(mr), "size", "uint64",
+ object_property_add_qapi(OBJECT(mr), "size", &uint64_type_info,
memory_region_get_size,
NULL, /* memory_region_set_size, */
NULL, NULL);
diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c
index dcd0d698b300..c9e5f294b336 100644
--- a/target/arm/cpu64.c
+++ b/target/arm/cpu64.c
@@ -20,6 +20,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "cpu.h"
#include "cpregs.h"
#include "qemu/module.h"
@@ -328,7 +329,7 @@ static void prop_bool_set_false(Object *obj, Visitor *v, const char *name,
static void prop_add_stub_bool(Object *obj, const char *name)
{
- object_property_add(obj, name, "bool", prop_bool_get_false,
+ object_property_add_qapi(obj, name, &bool_type_info, prop_bool_get_false,
prop_bool_set_false, NULL, NULL);
}
@@ -518,13 +519,13 @@ void aarch64_add_sve_properties(Object *obj)
for (vq = 1; vq <= ARM_MAX_VQ; ++vq) {
char name[8];
snprintf(name, sizeof(name), "sve%d", vq * 128);
- object_property_add(obj, name, "bool", cpu_arm_get_vq,
+ object_property_add_qapi(obj, name, &bool_type_info, cpu_arm_get_vq,
cpu_arm_set_vq, NULL, &cpu->sve_vq);
}
#ifdef CONFIG_USER_ONLY
/* Mirror linux /proc/sys/abi/sve_default_vector_length. */
- object_property_add(obj, "sve-default-vector-length", "int32",
+ object_property_add_qapi(obj, "sve-default-vector-length", &int32_type_info,
cpu_arm_get_default_vec_len,
cpu_arm_set_default_vec_len, NULL,
&cpu->sve_default_vq);
@@ -543,13 +544,13 @@ void aarch64_add_sme_properties(Object *obj)
for (vq = 1; vq <= ARM_MAX_VQ; vq <<= 1) {
char name[8];
snprintf(name, sizeof(name), "sme%d", vq * 128);
- object_property_add(obj, name, "bool", cpu_arm_get_vq,
+ object_property_add_qapi(obj, name, &bool_type_info, cpu_arm_get_vq,
cpu_arm_set_vq, NULL, &cpu->sme_vq);
}
#ifdef CONFIG_USER_ONLY
/* Mirror linux /proc/sys/abi/sme_default_vector_length. */
- object_property_add(obj, "sme-default-vector-length", "int32",
+ object_property_add_qapi(obj, "sme-default-vector-length", &int32_type_info,
cpu_arm_get_default_vec_len,
cpu_arm_set_default_vec_len, NULL,
&cpu->sme_default_vq);
diff --git a/target/arm/kvm.c b/target/arm/kvm.c
index 3d905f8565de..1569a64b3b57 100644
--- a/target/arm/kvm.c
+++ b/target/arm/kvm.c
@@ -20,6 +20,7 @@
#include "qemu/main-loop.h"
#include "qom/object.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "system/system.h"
#include "system/runstate.h"
#include "system/ramblock.h"
@@ -1820,7 +1821,7 @@ static void kvm_arch_set_eager_split_size(Object *obj, Visitor *v,
void kvm_arch_accel_class_init(ObjectClass *oc)
{
- object_class_property_add(oc, "eager-split-size", "size",
+ object_class_property_add_qapi(oc, "eager-split-size", &size_type_info,
kvm_arch_get_eager_split_size,
kvm_arch_set_eager_split_size, NULL, NULL);
diff --git a/target/arm/tcg/cpu64.c b/target/arm/tcg/cpu64.c
index c92e331e7317..db73b7668f42 100644
--- a/target/arm/tcg/cpu64.c
+++ b/target/arm/tcg/cpu64.c
@@ -20,6 +20,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "cpu.h"
#include "qemu/module.h"
#include "qapi/visitor.h"
@@ -1392,9 +1393,9 @@ void aarch64_max_v8_tcg_initfn(Object *obj)
/* v8.2: FEAT_SVE */
cpu->sve_vq.supported = MAKE_64BIT_MASK(0, ARM_MAX_VQ);
aarch64_add_sve_properties(OBJECT(cpu));
- object_property_add(OBJECT(cpu), "sve-max-vq", "uint32",
- cpu_max_get_sve_max_vq, cpu_max_set_sve_max_vq,
- NULL, NULL);
+ object_property_add_qapi(OBJECT(cpu), "sve-max-vq", &uint32_type_info,
+ cpu_max_get_sve_max_vq,
+ cpu_max_set_sve_max_vq, NULL, NULL);
/* v8.2: FEAT_PAuth2 */
aarch64_add_pauth_properties(OBJECT(cpu));
@@ -1529,8 +1530,8 @@ void aarch64_max_v9_tcg_initfn(Object *obj)
object_property_add_bool(obj, "x-rme", cpu_arm_get_rme, cpu_arm_set_rme);
/* v9.4: FEAT_RME_GPC2 */
- object_property_add(obj, "x-l0gptsz", "uint32", cpu_max_get_l0gptsz,
- cpu_max_set_l0gptsz, NULL, NULL);
+ object_property_add_qapi(obj, "x-l0gptsz", &uint32_type_info, cpu_max_get_l0gptsz,
+ cpu_max_set_l0gptsz, NULL, NULL);
}
static const ARMCPUInfo aarch64_cpus[] = {
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 4553ef0892a1..3601a56e6848 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -10457,7 +10457,7 @@ static void x86_cpu_register_bit_prop(X86CPUClass *xcc,
fp = g_new0(BitProperty, 1);
fp->w = w;
fp->mask = mask;
- object_class_property_add(oc, prop_name, "bool",
+ object_class_property_add_qapi(oc, prop_name, &bool_type_info,
x86_cpu_get_bit_prop,
x86_cpu_set_bit_prop,
NULL, fp);
@@ -10977,13 +10977,13 @@ static void x86_cpu_common_class_init(ObjectClass *oc, const void *data)
dc->user_creatable = true;
- object_class_property_add(oc, "family", "uint64",
+ object_class_property_add_qapi(oc, "family", &uint64_type_info,
x86_cpuid_version_get_family,
x86_cpuid_version_set_family, NULL, NULL);
- object_class_property_add(oc, "model", "uint64",
+ object_class_property_add_qapi(oc, "model", &uint64_type_info,
x86_cpuid_version_get_model,
x86_cpuid_version_set_model, NULL, NULL);
- object_class_property_add(oc, "stepping", "uint64",
+ object_class_property_add_qapi(oc, "stepping", &uint64_type_info,
x86_cpuid_version_get_stepping,
x86_cpuid_version_set_stepping, NULL, NULL);
object_class_property_add_str(oc, "vendor",
@@ -10992,7 +10992,7 @@ static void x86_cpu_common_class_init(ObjectClass *oc, const void *data)
object_class_property_add_str(oc, "model-id",
x86_cpuid_get_model_id,
x86_cpuid_set_model_id);
- object_class_property_add(oc, "tsc-frequency", "int",
+ object_class_property_add_qapi(oc, "tsc-frequency", &int_type_info,
x86_cpuid_get_tsc_freq,
x86_cpuid_set_tsc_freq, NULL, NULL);
/*
@@ -11005,7 +11005,7 @@ static void x86_cpu_common_class_init(ObjectClass *oc, const void *data)
x86_cpu_get_unavailable_features,
NULL, NULL, NULL);
- object_class_property_add(oc, "avx10-version", "uint8",
+ object_class_property_add_qapi(oc, "avx10-version", &uint8_type_info,
x86_cpuid_get_avx10_version,
x86_cpuid_set_avx10_version,
NULL, NULL);
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
index f2e8dc8c156d..03c6816cf61e 100644
--- a/target/i386/kvm/kvm.c
+++ b/target/i386/kvm/kvm.c
@@ -7099,7 +7099,7 @@ void kvm_arch_accel_class_init(ObjectClass *oc)
.set = kvm_arch_set_notify_vmexit,
));
- object_class_property_add(oc, "notify-window", "uint32",
+ object_class_property_add_qapi(oc, "notify-window", &uint32_type_info,
kvm_arch_get_notify_window,
kvm_arch_set_notify_window,
NULL, NULL);
@@ -7107,7 +7107,7 @@ void kvm_arch_accel_class_init(ObjectClass *oc)
"Clock cycles without an event window "
"after which a notification VM exit occurs");
- object_class_property_add(oc, "xen-version", "uint32",
+ object_class_property_add_qapi(oc, "xen-version", &uint32_type_info,
kvm_arch_get_xen_version,
kvm_arch_set_xen_version,
NULL, NULL);
@@ -7116,14 +7116,14 @@ void kvm_arch_accel_class_init(ObjectClass *oc)
"(in XENVER_version form "
"e.g. 0x4000a for 4.10)");
- object_class_property_add(oc, "xen-gnttab-max-frames", "uint16",
+ object_class_property_add_qapi(oc, "xen-gnttab-max-frames", &uint16_type_info,
kvm_arch_get_xen_gnttab_max_frames,
kvm_arch_set_xen_gnttab_max_frames,
NULL, NULL);
object_class_property_set_description(oc, "xen-gnttab-max-frames",
"Maximum number of grant table frames");
- object_class_property_add(oc, "xen-evtchn-max-pirq", "uint16",
+ object_class_property_add_qapi(oc, "xen-evtchn-max-pirq", &uint16_type_info,
kvm_arch_get_xen_evtchn_max_pirq,
kvm_arch_set_xen_evtchn_max_pirq,
NULL, NULL);
diff --git a/target/i386/sev.c b/target/i386/sev.c
index b2c7260c80a4..3a36fa4d0b95 100644
--- a/target/i386/sev.c
+++ b/target/i386/sev.c
@@ -3266,7 +3266,7 @@ sev_snp_guest_class_init(ObjectClass *oc, const void *data)
x86_klass->adjust_cpuid_features = sev_snp_adjust_cpuid_features;
x86_klass->kvm_type = sev_snp_kvm_type;
- object_class_property_add(oc, "policy", "uint64",
+ object_class_property_add_qapi(oc, "policy", &uint64_type_info,
sev_snp_guest_get_policy,
sev_snp_guest_set_policy, NULL, NULL);
object_class_property_add_str(oc, "guest-visible-workarounds",
diff --git a/target/ppc/compat.c b/target/ppc/compat.c
index 55de3bd5d5de..4d81225de37f 100644
--- a/target/ppc/compat.c
+++ b/target/ppc/compat.c
@@ -23,6 +23,7 @@
#include "kvm_ppc.h"
#include "system/cpus.h"
#include "qemu/error-report.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qapi/error.h"
#include "qapi/visitor.h"
#include "cpu-models.h"
@@ -335,7 +336,7 @@ void ppc_compat_add_property(Object *obj, const char *name,
gchar *names, *desc;
int i;
- object_property_add(obj, name, "string",
+ object_property_add_qapi(obj, name, &str_type_info,
ppc_compat_prop_get, ppc_compat_prop_set, NULL,
compat_pvr);
diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c
index 08a4d14ea1f6..664c1a767950 100644
--- a/target/riscv/cpu.c
+++ b/target/riscv/cpu.c
@@ -28,6 +28,7 @@
#include "target/riscv/tcg/csr.h"
#include "internals.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qapi/visitor.h"
#include "qemu/error-report.h"
#include "qemu/timer.h"
@@ -1412,20 +1413,20 @@ void riscv_add_satp_mode_properties(Object *obj)
{
RISCVCPU *cpu = RISCV_CPU(obj);
- object_property_add(obj, "svbare", "bool", cpu_riscv_get_satp,
- cpu_riscv_set_satp, NULL, &cpu->satp_modes);
+ object_property_add_qapi(obj, "svbare", &bool_type_info, cpu_riscv_get_satp,
+ cpu_riscv_set_satp, NULL, &cpu->satp_modes);
if (cpu->env.misa_mxl == MXL_RV32) {
- object_property_add(obj, "sv32", "bool", cpu_riscv_get_satp,
+ object_property_add_qapi(obj, "sv32", &bool_type_info, cpu_riscv_get_satp,
cpu_riscv_set_satp, NULL, &cpu->satp_modes);
} else {
- object_property_add(obj, "sv39", "bool", cpu_riscv_get_satp,
+ object_property_add_qapi(obj, "sv39", &bool_type_info, cpu_riscv_get_satp,
cpu_riscv_set_satp, NULL, &cpu->satp_modes);
- object_property_add(obj, "sv48", "bool", cpu_riscv_get_satp,
+ object_property_add_qapi(obj, "sv48", &bool_type_info, cpu_riscv_get_satp,
cpu_riscv_set_satp, NULL, &cpu->satp_modes);
- object_property_add(obj, "sv57", "bool", cpu_riscv_get_satp,
+ object_property_add_qapi(obj, "sv57", &bool_type_info, cpu_riscv_get_satp,
cpu_riscv_set_satp, NULL, &cpu->satp_modes);
- object_property_add(obj, "sv64", "bool", cpu_riscv_get_satp,
+ object_property_add_qapi(obj, "sv64", &bool_type_info, cpu_riscv_get_satp,
cpu_riscv_set_satp, NULL, &cpu->satp_modes);
}
}
diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c
index 45ad5e1525a8..c90db86cda85 100644
--- a/target/riscv/kvm/kvm-cpu.c
+++ b/target/riscv/kvm/kvm-cpu.c
@@ -24,6 +24,7 @@
#include "qemu/timer.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qemu/error-report.h"
#include "qemu/main-loop.h"
#include "qapi/visitor.h"
@@ -539,7 +540,7 @@ static void riscv_cpu_add_kvm_unavail_prop(Object *obj, const char *prop_name)
* unknown to KVM and error out if the user attempts
* to enable any of them.
*/
- object_property_add(obj, prop_name, "bool",
+ object_property_add_qapi(obj, prop_name, &bool_type_info,
cpu_get_cfg_unavailable,
cpu_set_cfg_unavailable,
NULL, (void *)prop_name);
@@ -559,7 +560,7 @@ static void kvm_riscv_add_cpu_user_properties(Object *cpu_obj)
misa_cfg->name = riscv_get_misa_ext_name(bit);
misa_cfg->description = riscv_get_misa_ext_description(bit);
- object_property_add(cpu_obj, misa_cfg->name, "bool",
+ object_property_add_qapi(cpu_obj, misa_cfg->name, &bool_type_info,
kvm_cpu_get_misa_ext_cfg,
kvm_cpu_set_misa_ext_cfg,
NULL, misa_cfg);
@@ -575,7 +576,7 @@ static void kvm_riscv_add_cpu_user_properties(Object *cpu_obj)
for (i = 0; i < ARRAY_SIZE(kvm_multi_ext_cfgs); i++) {
KVMCPUConfig *multi_cfg = &kvm_multi_ext_cfgs[i];
- object_property_add(cpu_obj, multi_cfg->name, "bool",
+ object_property_add_qapi(cpu_obj, multi_cfg->name, &bool_type_info,
kvm_cpu_get_multi_ext_cfg,
kvm_cpu_set_multi_ext_cfg,
NULL, multi_cfg);
diff --git a/target/riscv/tcg/tcg-cpu.c b/target/riscv/tcg/tcg-cpu.c
index e07ca95e49bd..88fdbec4fb4c 100644
--- a/target/riscv/tcg/tcg-cpu.c
+++ b/target/riscv/tcg/tcg-cpu.c
@@ -26,6 +26,7 @@
#include "pmu.h"
#include "time_helper.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qapi/visitor.h"
#include "qemu/accel.h"
#include "qemu/error-report.h"
@@ -1473,7 +1474,7 @@ static void riscv_cpu_add_misa_properties(Object *cpu_obj)
continue;
}
- object_property_add(cpu_obj, name, "bool",
+ object_property_add_qapi(cpu_obj, name, &bool_type_info,
cpu_get_misa_ext_cfg,
cpu_set_misa_ext_cfg,
NULL, (void *)misa_cfg);
@@ -1527,7 +1528,7 @@ static void riscv_cpu_add_profiles(Object *cpu_obj)
for (int i = 0; riscv_profiles[i] != NULL; i++) {
RISCVCPUProfile *profile = riscv_profiles[i];
- object_property_add(cpu_obj, profile->name, "bool",
+ object_property_add_qapi(cpu_obj, profile->name, &bool_type_info,
cpu_get_profile, cpu_set_profile,
NULL, (void *)profile);
@@ -1603,10 +1604,10 @@ static void riscv_cpu_add_user_properties(Object *obj)
for (edata = isa_edata_arr; edata && edata->name; edata++) {
if (edata->prop_name) {
- object_property_add(obj, edata->prop_name, "bool",
- cpu_get_multi_ext_cfg,
- cpu_set_multi_ext_cfg,
- NULL, (void *)&edata->ext_enable_offset);
+ object_property_add_qapi(obj, edata->prop_name, &bool_type_info,
+ cpu_get_multi_ext_cfg,
+ cpu_set_multi_ext_cfg,
+ NULL, (void *)&edata->ext_enable_offset);
}
}
diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
index c41d629d6803..72bf0f48de83 100644
--- a/target/s390x/cpu_models.c
+++ b/target/s390x/cpu_models.c
@@ -17,6 +17,7 @@
#include "system/kvm.h"
#include "system/tcg.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qemu/error-report.h"
#include "qapi/visitor.h"
#include "qemu/module.h"
@@ -915,13 +916,13 @@ void s390_cpu_model_class_register_props(ObjectClass *oc)
for (feat = 0; feat < S390_FEAT_MAX; feat++) {
const S390FeatDef *def = s390_feat_def(feat);
- object_class_property_add(oc, def->name, "bool", get_feature,
+ object_class_property_add_qapi(oc, def->name, &bool_type_info, get_feature,
set_feature, NULL, (void *) feat);
object_class_property_set_description(oc, def->name, def->desc);
}
for (group = 0; group < S390_FEAT_GROUP_MAX; group++) {
const S390FeatGroupDef *def = s390_feat_group_def(group);
- object_class_property_add(oc, def->name, "bool", get_feature_group,
+ object_class_property_add_qapi(oc, def->name, &bool_type_info, get_feature_group,
set_feature_group, NULL, (void *) group);
object_class_property_set_description(oc, def->name, def->desc);
}
diff --git a/tests/unit/test-qdev-global-props.c b/tests/unit/test-qdev-global-props.c
index 8ea362cbb902..204436fb7276 100644
--- a/tests/unit/test-qdev-global-props.c
+++ b/tests/unit/test-qdev-global-props.c
@@ -27,6 +27,7 @@
#include "hw/core/qdev-properties.h"
#include "qom/object.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qapi/visitor.h"
@@ -171,10 +172,12 @@ static void prop2_accessor(Object *obj, Visitor *v, const char *name,
static void dynamic_instance_init(Object *obj)
{
- object_property_add(obj, "prop1", "uint32", prop1_accessor, prop1_accessor,
- NULL, NULL);
- object_property_add(obj, "prop2", "uint32", prop2_accessor, prop2_accessor,
- NULL, NULL);
+ object_property_add_qapi(obj, "prop1", &uint32_type_info,
+ prop1_accessor, prop1_accessor,
+ NULL, NULL);
+ object_property_add_qapi(obj, "prop2", &uint32_type_info,
+ prop2_accessor, prop2_accessor,
+ NULL, NULL);
}
static void dynamic_class_init(ObjectClass *oc, const void *data)
diff --git a/ui/console.c b/ui/console.c
index b7357172007e..840603cb233f 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -28,6 +28,7 @@
#include "ui/vgafont.h"
#include "hw/core/qdev.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qapi/qapi-commands-ui.h"
#include "qapi/visitor.h"
#include "qemu/coroutine.h"
@@ -535,7 +536,7 @@ qemu_graphic_console_class_init(ObjectClass *oc, const void *data)
offsetof(QemuGraphicConsole, device),
object_property_allow_set_link,
OBJ_PROP_LINK_STRONG);
- object_class_property_add(oc, "head", "uint32",
+ object_class_property_add_qapi(oc, "head", &uint32_type_info,
qemu_graphic_console_prop_get_head,
NULL, NULL, NULL);
diff --git a/util/thread-context.c b/util/thread-context.c
index 88d8f0a55a4e..7fa6840dd401 100644
--- a/util/thread-context.c
+++ b/util/thread-context.c
@@ -13,6 +13,7 @@
#include "qemu/osdep.h"
#include "qemu/thread-context.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qapi/qapi-builtin-visit.h"
#include "qapi/visitor.h"
#include "qemu/config-file.h"
@@ -278,13 +279,13 @@ static void thread_context_class_init(ObjectClass *oc, const void *data)
UserCreatableClass *ucc = USER_CREATABLE_CLASS(oc);
ucc->complete = thread_context_instance_complete;
- object_class_property_add(oc, "thread-id", "uint64",
+ object_class_property_add_qapi(oc, "thread-id", &uint64_type_info,
thread_context_get_thread_id, NULL, NULL,
NULL);
- object_class_property_add(oc, "cpu-affinity", "[uint16]",
+ object_class_property_add_qapi(oc, "cpu-affinity", &uint16List_type_info,
thread_context_get_cpu_affinity,
thread_context_set_cpu_affinity, NULL, NULL);
- object_class_property_add(oc, "node-affinity", "[uint16]", NULL,
+ object_class_property_add_qapi(oc, "node-affinity", &uint16List_type_info, NULL,
thread_context_set_node_affinity, NULL, NULL);
}
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 39/65] i386/cpu: convert strList property to QAPI-aware registration
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (37 preceding siblings ...)
2026-10-20 10:45 ` [PATCH v7 38/65] qom: convert scalar properties to QAPI-aware registration Marc-André Lureau
@ 2026-10-20 10:45 ` Marc-André Lureau
2026-10-20 10:45 ` [PATCH v7 40/65] accel/hvf: convert OnOffSplit " Marc-André Lureau
` (25 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:45 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
target/i386/cpu.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 3601a56e6848..0a9acfa74600 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -11001,7 +11001,8 @@ static void x86_cpu_common_class_init(ObjectClass *oc, const void *data)
* QMP command: they list the features that would have prevented the
* CPU from running if the "enforce" flag was set.
*/
- object_class_property_add(oc, "unavailable-features", "strList",
+ object_class_property_add_qapi(oc, "unavailable-features",
+ &strList_type_info,
x86_cpu_get_unavailable_features,
NULL, NULL, NULL);
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 40/65] accel/hvf: convert OnOffSplit property to QAPI-aware registration
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (38 preceding siblings ...)
2026-10-20 10:45 ` [PATCH v7 39/65] i386/cpu: convert strList property " Marc-André Lureau
@ 2026-10-20 10:45 ` Marc-André Lureau
2026-10-20 10:45 ` [PATCH v7 41/65] i386/x86: convert SgxEPCList " Marc-André Lureau
` (24 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:45 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
Convert the OnOffSplit property from manual visitor-based
callbacks to property_add_qapi_enum().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
accel/hvf/hvf-all.c | 29 +++++++++++------------------
1 file changed, 11 insertions(+), 18 deletions(-)
diff --git a/accel/hvf/hvf-all.c b/accel/hvf/hvf-all.c
index 8bd9154a50b6..2fd594ad156f 100644
--- a/accel/hvf/hvf-all.c
+++ b/accel/hvf/hvf-all.c
@@ -11,6 +11,7 @@
#include "qemu/osdep.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
+#include "qapi/qapi-type-infos-common.h"
#include "qapi/qapi-visit-common.h"
#include "accel/accel-ops.h"
#include "exec/cpu-common.h"
@@ -230,18 +231,12 @@ static int hvf_accel_init(AccelState *as, MachineState *ms)
return hvf_arch_init();
}
-static void hvf_set_kernel_irqchip(Object *obj, Visitor *v,
- const char *name, void *opaque,
+static void hvf_set_kernel_irqchip(Object *obj, int value,
Error **errp)
{
- OnOffSplit mode;
-
hvf_kernel_irqchip_override = true;
- if (!visit_type_OnOffSplit(v, name, &mode, errp)) {
- return;
- }
- switch (mode) {
+ switch (value) {
case ON_OFF_SPLIT_ON:
#ifdef HOST_X86_64
/* macOS 12 onwards exposes an HVF virtual APIC. */
@@ -261,11 +256,7 @@ static void hvf_set_kernel_irqchip(Object *obj, Visitor *v,
break;
default:
- /*
- * The value was checked in visit_type_OnOffSplit() above. If
- * we get here, then something is wrong in QEMU.
- */
- abort();
+ g_assert_not_reached();
}
}
@@ -277,11 +268,13 @@ static void hvf_accel_class_init(ObjectClass *oc, const void *data)
ac->allowed = &hvf_allowed;
hvf_kernel_irqchip_override = false;
hvf_kernel_irqchip = false;
- object_class_property_add(oc, "kernel-irqchip", "on|off|split",
- NULL, hvf_set_kernel_irqchip,
- NULL, NULL);
- object_class_property_set_description(oc, "kernel-irqchip",
- "Configure HVF irqchip");
+
+ object_class_property_add_qapi_enum(oc, QAPI_ENUM_PROP(
+ .name = "kernel-irqchip",
+ .qapi_type = &OnOffSplit_type_info,
+ .set = hvf_set_kernel_irqchip,
+ .description = "Configure HVF irqchip",
+ ));
}
static const TypeInfo hvf_accel_type = {
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 41/65] i386/x86: convert SgxEPCList property to QAPI-aware registration
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (39 preceding siblings ...)
2026-10-20 10:45 ` [PATCH v7 40/65] accel/hvf: convert OnOffSplit " Marc-André Lureau
@ 2026-10-20 10:45 ` Marc-André Lureau
2026-10-20 10:45 ` [PATCH v7 42/65] virtio-balloon: convert guest-stats property to QAPI type Marc-André Lureau
` (23 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:45 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
hw/i386/x86.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/hw/i386/x86.c b/hw/i386/x86.c
index d0c782ec8544..ed38760d798d 100644
--- a/hw/i386/x86.c
+++ b/hw/i386/x86.c
@@ -25,6 +25,7 @@
#include "qemu/units.h"
#include "qapi/error.h"
#include "qapi/qapi-type-infos-common.h"
+#include "qapi/qapi-type-infos-machine.h"
#include "qapi/qapi-visit-machine.h"
#include "qapi/visitor.h"
#include "system/qtest.h"
@@ -426,7 +427,7 @@ static void x86_machine_class_init(ObjectClass *oc, const void *data)
object_class_property_set_description(oc, X86_MACHINE_BUS_LOCK_RATELIMIT,
"Set the ratelimit for the bus locks acquired in VMs");
- object_class_property_add(oc, "sgx-epc", "SgxEPC",
+ object_class_property_add_qapi(oc, "sgx-epc", &SgxEPCList_type_info,
machine_get_sgx_epc, machine_set_sgx_epc,
NULL, NULL);
object_class_property_set_description(oc, "sgx-epc",
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 42/65] virtio-balloon: convert guest-stats property to QAPI type
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (40 preceding siblings ...)
2026-10-20 10:45 ` [PATCH v7 41/65] i386/x86: convert SgxEPCList " Marc-André Lureau
@ 2026-10-20 10:45 ` Marc-André Lureau
2026-10-20 12:59 ` Markus Armbruster
2026-10-20 10:46 ` [PATCH v7 43/65] qom: replace object_property_add_tm with StructTm " Marc-André Lureau
` (22 subsequent siblings)
64 siblings, 1 reply; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:45 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
Define VirtioBalloonStats and VirtioBalloonGuestStats QAPI struct types
in the schema, replacing the hand-rolled visitor in balloon_stats_get_all()
with a generated visit_type_VirtioBalloonGuestStats() call.
The wire format is preserved: the JSON output from qom-get is identical
to the previous hand-rolled visitor output.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
docs/interop/virtio-balloon-stats.rst | 22 +--------
hw/virtio/virtio-balloon.c | 84 ++++++++++++--------------------
qapi/machine.json | 92 +++++++++++++++++++++++++++++++++++
3 files changed, 123 insertions(+), 75 deletions(-)
diff --git a/docs/interop/virtio-balloon-stats.rst b/docs/interop/virtio-balloon-stats.rst
index b9a6a6edb229..88d3271bbb02 100644
--- a/docs/interop/virtio-balloon-stats.rst
+++ b/docs/interop/virtio-balloon-stats.rst
@@ -22,27 +22,7 @@ polling the guest's balloon driver for new stats in the specified time
interval.
To retrieve those stats, clients have to query the guest-stats property,
-which will return a dictionary containing:
-
- * A key named 'stats', containing all available stats. If the guest
- doesn't support a particular stat, or if it couldn't be retrieved,
- its value will be -1. Currently, the following stats are supported:
-
- - stat-swap-in
- - stat-swap-out
- - stat-major-faults
- - stat-minor-faults
- - stat-free-memory
- - stat-total-memory
- - stat-available-memory
- - stat-disk-caches
- - stat-htlb-pgalloc
- - stat-htlb-pgfail
-
- * A key named last-update, which contains the last stats update
- timestamp in seconds. Since this timestamp is generated by the host,
- a buggy guest can't influence its value. The value is 0 if the guest
- has not updated the stats (yet).
+which will return a VirtioBalloonGuestStats (see QAPI documentation).
It's also important to note the following:
diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c
index 7ffbe48e5134..bfc75f5dfc72 100644
--- a/hw/virtio/virtio-balloon.c
+++ b/hw/virtio/virtio-balloon.c
@@ -29,6 +29,8 @@
#include "qapi/error.h"
#include "qapi/qapi-builtin-type-infos.h"
#include "qapi/qapi-events-machine.h"
+#include "qapi/qapi-type-infos-machine.h"
+#include "qapi/qapi-visit-machine.h"
#include "qapi/visitor.h"
#include "trace.h"
#include "qemu/error-report.h"
@@ -170,33 +172,8 @@ static void balloon_deflate_page(VirtIOBalloon *balloon,
}
}
-/*
- * All stats upto VIRTIO_BALLOON_S_NR /must/ have a
- * non-NULL name declared here, since these are used
- * as keys for populating the QDict with stats
- */
-static const char *balloon_stat_names[] = {
- [VIRTIO_BALLOON_S_SWAP_IN] = "stat-swap-in",
- [VIRTIO_BALLOON_S_SWAP_OUT] = "stat-swap-out",
- [VIRTIO_BALLOON_S_MAJFLT] = "stat-major-faults",
- [VIRTIO_BALLOON_S_MINFLT] = "stat-minor-faults",
- [VIRTIO_BALLOON_S_MEMFREE] = "stat-free-memory",
-
- [VIRTIO_BALLOON_S_MEMTOT] = "stat-total-memory",
- [VIRTIO_BALLOON_S_AVAIL] = "stat-available-memory",
- [VIRTIO_BALLOON_S_CACHES] = "stat-disk-caches",
- [VIRTIO_BALLOON_S_HTLB_PGALLOC] = "stat-htlb-pgalloc",
- [VIRTIO_BALLOON_S_HTLB_PGFAIL] = "stat-htlb-pgfail",
-
- [VIRTIO_BALLOON_S_OOM_KILL] = "stat-oom-kills",
- [VIRTIO_BALLOON_S_ALLOC_STALL] = "stat-alloc-stalls",
- [VIRTIO_BALLOON_S_ASYNC_SCAN] = "stat-async-scans",
- [VIRTIO_BALLOON_S_DIRECT_SCAN] = "stat-direct-scans",
- [VIRTIO_BALLOON_S_ASYNC_RECLAIM] = "stat-async-reclaims",
-
- [VIRTIO_BALLOON_S_DIRECT_RECLAIM] = "stat-direct-reclaims",
-};
-G_STATIC_ASSERT(G_N_ELEMENTS(balloon_stat_names) == VIRTIO_BALLOON_S_NR);
+/* Update VirtioBalloonStats QAPI type when new stats are added */
+G_STATIC_ASSERT(VIRTIO_BALLOON_S_NR == 16);
/*
* reset_stats - Mark all items in the stats array as unset
@@ -258,33 +235,31 @@ static void balloon_stats_get_all(Object *obj, Visitor *v, const char *name,
void *opaque, Error **errp)
{
VirtIOBalloon *s = VIRTIO_BALLOON(obj);
- bool ok = false;
- int i;
+ VirtioBalloonStats stats = {
+ .stat_swap_in = s->stats[VIRTIO_BALLOON_S_SWAP_IN],
+ .stat_swap_out = s->stats[VIRTIO_BALLOON_S_SWAP_OUT],
+ .stat_major_faults = s->stats[VIRTIO_BALLOON_S_MAJFLT],
+ .stat_minor_faults = s->stats[VIRTIO_BALLOON_S_MINFLT],
+ .stat_free_memory = s->stats[VIRTIO_BALLOON_S_MEMFREE],
+ .stat_total_memory = s->stats[VIRTIO_BALLOON_S_MEMTOT],
+ .stat_available_memory = s->stats[VIRTIO_BALLOON_S_AVAIL],
+ .stat_disk_caches = s->stats[VIRTIO_BALLOON_S_CACHES],
+ .stat_htlb_pgalloc = s->stats[VIRTIO_BALLOON_S_HTLB_PGALLOC],
+ .stat_htlb_pgfail = s->stats[VIRTIO_BALLOON_S_HTLB_PGFAIL],
+ .stat_oom_kills = s->stats[VIRTIO_BALLOON_S_OOM_KILL],
+ .stat_alloc_stalls = s->stats[VIRTIO_BALLOON_S_ALLOC_STALL],
+ .stat_async_scans = s->stats[VIRTIO_BALLOON_S_ASYNC_SCAN],
+ .stat_direct_scans = s->stats[VIRTIO_BALLOON_S_DIRECT_SCAN],
+ .stat_async_reclaims = s->stats[VIRTIO_BALLOON_S_ASYNC_RECLAIM],
+ .stat_direct_reclaims = s->stats[VIRTIO_BALLOON_S_DIRECT_RECLAIM],
+ };
+ VirtioBalloonGuestStats guest_stats = {
+ .last_update = s->stats_last_update,
+ .stats = &stats,
+ };
+ VirtioBalloonGuestStats *argp = &guest_stats;
- if (!visit_start_struct(v, name, NULL, 0, errp)) {
- return;
- }
- if (!visit_type_int(v, "last-update", &s->stats_last_update, errp)) {
- goto out_end;
- }
-
- if (!visit_start_struct(v, "stats", NULL, 0, errp)) {
- goto out_end;
- }
- for (i = 0; i < VIRTIO_BALLOON_S_NR; i++) {
- if (!visit_type_uint64(v, balloon_stat_names[i], &s->stats[i], errp)) {
- goto out_nested;
- }
- }
- ok = visit_check_struct(v, errp);
-out_nested:
- visit_end_struct(v, NULL);
-
- if (ok) {
- visit_check_struct(v, errp);
- }
-out_end:
- visit_end_struct(v, NULL);
+ visit_type_VirtioBalloonGuestStats(v, name, &argp, errp);
}
static void balloon_stats_get_poll_interval(Object *obj, Visitor *v,
@@ -1037,7 +1012,8 @@ static void virtio_balloon_instance_init(Object *obj)
s->free_page_hint_cmd_id = VIRTIO_BALLOON_FREE_PAGE_HINT_CMD_ID_MIN;
s->free_page_hint_notify.notify = virtio_balloon_free_page_hint_notify;
- object_property_add(obj, "guest-stats", "guest statistics",
+ object_property_add_qapi(obj, "guest-stats",
+ &VirtioBalloonGuestStats_type_info,
balloon_stats_get_all, NULL, NULL, NULL);
object_property_add_qapi(obj, "guest-stats-polling-interval", &int_type_info,
diff --git a/qapi/machine.json b/qapi/machine.json
index 9b145c635baf..34be3156270c 100644
--- a/qapi/machine.json
+++ b/qapi/machine.json
@@ -1126,6 +1126,98 @@
##
{ 'struct': 'BalloonInfo', 'data': {'actual': 'int' } }
+##
+# @VirtioBalloonStats:
+#
+# VirtIO balloon device guest memory statistics.
+#
+# If the guest doesn't support a particular stat, or if it couldn't
+# be retrieved, its value will be -1.
+#
+# @stat-swap-in: The amount of memory that has been
+# swapped in (in bytes).
+#
+# @stat-swap-out: The amount of memory that has been
+# swapped out to disk (in bytes).
+#
+# @stat-major-faults: The number of major page faults
+# that have occurred.
+#
+# @stat-minor-faults: The number of minor page faults
+# that have occurred.
+#
+# @stat-free-memory: The amount of memory not being used
+# for any purpose (in bytes).
+#
+# @stat-total-memory: The total amount of memory available
+# (in bytes).
+#
+# @stat-available-memory: An estimate of how much memory is available
+# (in bytes) for starting new applications, without pushing the
+# system to swap.
+#
+# @stat-disk-caches: The amount of memory, in bytes, that can be
+# quickly reclaimed without additional I/O. Typically these pages
+# are used for caching files from disk.
+#
+# @stat-htlb-pgalloc: The number of successful hugetlb page
+# allocations
+#
+# @stat-htlb-pgfail: The number of failed hugetlb page
+# allocations
+#
+# @stat-oom-kills: The number of OOM killer invocations
+#
+# @stat-alloc-stalls: The number of memory allocation stalls
+#
+# @stat-async-scans: The number of memory scanned asynchronously
+#
+# @stat-direct-scans: The number of memory scanned directly
+#
+# @stat-async-reclaims: The number of memory reclaimed asynchronously
+#
+# @stat-direct-reclaims: The number of memory reclaimed directly
+#
+# Since: 11.2
+##
+{ 'struct': 'VirtioBalloonStats',
+ 'data': {
+ 'stat-swap-in': 'uint64',
+ 'stat-swap-out': 'uint64',
+ 'stat-major-faults': 'uint64',
+ 'stat-minor-faults': 'uint64',
+ 'stat-free-memory': 'uint64',
+ 'stat-total-memory': 'uint64',
+ 'stat-available-memory': 'uint64',
+ 'stat-disk-caches': 'uint64',
+ 'stat-htlb-pgalloc': 'uint64',
+ 'stat-htlb-pgfail': 'uint64',
+ 'stat-oom-kills': 'uint64',
+ 'stat-alloc-stalls': 'uint64',
+ 'stat-async-scans': 'uint64',
+ 'stat-direct-scans': 'uint64',
+ 'stat-async-reclaims': 'uint64',
+ 'stat-direct-reclaims': 'uint64' } }
+
+##
+# @VirtioBalloonGuestStats:
+#
+# Guest statistics from the VirtIO balloon device.
+#
+# @last-update: timestamp in seconds of the last stats
+# update from the guest (since this timestamp is generated
+# by the host, a buggy guest can't influence its value),
+# or 0 if no update has been received yet.
+#
+# @stats: balloon memory statistics
+#
+# Since: 11.2
+##
+{ 'struct': 'VirtioBalloonGuestStats',
+ 'data': {
+ 'last-update': 'int',
+ 'stats': 'VirtioBalloonStats' } }
+
##
# @query-balloon:
# Return information about the balloon device.
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* Re: [PATCH v7 42/65] virtio-balloon: convert guest-stats property to QAPI type
2026-10-20 10:45 ` [PATCH v7 42/65] virtio-balloon: convert guest-stats property to QAPI type Marc-André Lureau
@ 2026-10-20 12:59 ` Markus Armbruster
0 siblings, 0 replies; 69+ messages in thread
From: Markus Armbruster @ 2026-10-20 12:59 UTC (permalink / raw)
To: Marc-André Lureau
Cc: qemu-devel, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier
Marc-André Lureau <marcandre.lureau@redhat.com> writes:
> Define VirtioBalloonStats and VirtioBalloonGuestStats QAPI struct types
> in the schema, replacing the hand-rolled visitor in balloon_stats_get_all()
> with a generated visit_type_VirtioBalloonGuestStats() call.
>
> The wire format is preserved: the JSON output from qom-get is identical
> to the previous hand-rolled visitor output.
>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> docs/interop/virtio-balloon-stats.rst | 22 +--------
> hw/virtio/virtio-balloon.c | 84 ++++++++++++--------------------
> qapi/machine.json | 92 +++++++++++++++++++++++++++++++++++
> 3 files changed, 123 insertions(+), 75 deletions(-)
>
> diff --git a/docs/interop/virtio-balloon-stats.rst b/docs/interop/virtio-balloon-stats.rst
> index b9a6a6edb229..88d3271bbb02 100644
> --- a/docs/interop/virtio-balloon-stats.rst
> +++ b/docs/interop/virtio-balloon-stats.rst
> @@ -22,27 +22,7 @@ polling the guest's balloon driver for new stats in the specified time
> interval.
>
> To retrieve those stats, clients have to query the guest-stats property,
> -which will return a dictionary containing:
> -
> - * A key named 'stats', containing all available stats. If the guest
> - doesn't support a particular stat, or if it couldn't be retrieved,
> - its value will be -1. Currently, the following stats are supported:
> -
> - - stat-swap-in
> - - stat-swap-out
> - - stat-major-faults
> - - stat-minor-faults
> - - stat-free-memory
> - - stat-total-memory
> - - stat-available-memory
> - - stat-disk-caches
> - - stat-htlb-pgalloc
> - - stat-htlb-pgfail
Missing here:
- stat-oom-kills
- stat-alloc-stalls
- stat-async-scans
- stat-direct-scans
- stat-async-reclaims
- stat-direct-reclaims
Review note, not a request for anything.
> -
> - * A key named last-update, which contains the last stats update
> - timestamp in seconds. Since this timestamp is generated by the host,
> - a buggy guest can't influence its value. The value is 0 if the guest
> - has not updated the stats (yet).
> +which will return a VirtioBalloonGuestStats (see QAPI documentation).
>
> It's also important to note the following:
>
> diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c
> index 7ffbe48e5134..bfc75f5dfc72 100644
> --- a/hw/virtio/virtio-balloon.c
> +++ b/hw/virtio/virtio-balloon.c
> @@ -29,6 +29,8 @@
> #include "qapi/error.h"
> #include "qapi/qapi-builtin-type-infos.h"
> #include "qapi/qapi-events-machine.h"
> +#include "qapi/qapi-type-infos-machine.h"
> +#include "qapi/qapi-visit-machine.h"
> #include "qapi/visitor.h"
> #include "trace.h"
> #include "qemu/error-report.h"
> @@ -170,33 +172,8 @@ static void balloon_deflate_page(VirtIOBalloon *balloon,
> }
> }
>
> -/*
> - * All stats upto VIRTIO_BALLOON_S_NR /must/ have a
> - * non-NULL name declared here, since these are used
> - * as keys for populating the QDict with stats
> - */
> -static const char *balloon_stat_names[] = {
> - [VIRTIO_BALLOON_S_SWAP_IN] = "stat-swap-in",
> - [VIRTIO_BALLOON_S_SWAP_OUT] = "stat-swap-out",
> - [VIRTIO_BALLOON_S_MAJFLT] = "stat-major-faults",
> - [VIRTIO_BALLOON_S_MINFLT] = "stat-minor-faults",
> - [VIRTIO_BALLOON_S_MEMFREE] = "stat-free-memory",
> -
> - [VIRTIO_BALLOON_S_MEMTOT] = "stat-total-memory",
> - [VIRTIO_BALLOON_S_AVAIL] = "stat-available-memory",
> - [VIRTIO_BALLOON_S_CACHES] = "stat-disk-caches",
> - [VIRTIO_BALLOON_S_HTLB_PGALLOC] = "stat-htlb-pgalloc",
> - [VIRTIO_BALLOON_S_HTLB_PGFAIL] = "stat-htlb-pgfail",
> -
> - [VIRTIO_BALLOON_S_OOM_KILL] = "stat-oom-kills",
> - [VIRTIO_BALLOON_S_ALLOC_STALL] = "stat-alloc-stalls",
> - [VIRTIO_BALLOON_S_ASYNC_SCAN] = "stat-async-scans",
> - [VIRTIO_BALLOON_S_DIRECT_SCAN] = "stat-direct-scans",
> - [VIRTIO_BALLOON_S_ASYNC_RECLAIM] = "stat-async-reclaims",
> -
> - [VIRTIO_BALLOON_S_DIRECT_RECLAIM] = "stat-direct-reclaims",
Not missing here.
> -};
> -G_STATIC_ASSERT(G_N_ELEMENTS(balloon_stat_names) == VIRTIO_BALLOON_S_NR);
> +/* Update VirtioBalloonStats QAPI type when new stats are added */
> +G_STATIC_ASSERT(VIRTIO_BALLOON_S_NR == 16);
The assertion becomes awkward.
What about ...
>
> /*
> * reset_stats - Mark all items in the stats array as unset
> @@ -258,33 +235,31 @@ static void balloon_stats_get_all(Object *obj, Visitor *v, const char *name,
> void *opaque, Error **errp)
> {
> VirtIOBalloon *s = VIRTIO_BALLOON(obj);
> - bool ok = false;
> - int i;
> + VirtioBalloonStats stats = {
> + .stat_swap_in = s->stats[VIRTIO_BALLOON_S_SWAP_IN],
> + .stat_swap_out = s->stats[VIRTIO_BALLOON_S_SWAP_OUT],
> + .stat_major_faults = s->stats[VIRTIO_BALLOON_S_MAJFLT],
> + .stat_minor_faults = s->stats[VIRTIO_BALLOON_S_MINFLT],
> + .stat_free_memory = s->stats[VIRTIO_BALLOON_S_MEMFREE],
> + .stat_total_memory = s->stats[VIRTIO_BALLOON_S_MEMTOT],
> + .stat_available_memory = s->stats[VIRTIO_BALLOON_S_AVAIL],
> + .stat_disk_caches = s->stats[VIRTIO_BALLOON_S_CACHES],
> + .stat_htlb_pgalloc = s->stats[VIRTIO_BALLOON_S_HTLB_PGALLOC],
> + .stat_htlb_pgfail = s->stats[VIRTIO_BALLOON_S_HTLB_PGFAIL],
> + .stat_oom_kills = s->stats[VIRTIO_BALLOON_S_OOM_KILL],
> + .stat_alloc_stalls = s->stats[VIRTIO_BALLOON_S_ALLOC_STALL],
> + .stat_async_scans = s->stats[VIRTIO_BALLOON_S_ASYNC_SCAN],
> + .stat_direct_scans = s->stats[VIRTIO_BALLOON_S_DIRECT_SCAN],
> + .stat_async_reclaims = s->stats[VIRTIO_BALLOON_S_ASYNC_RECLAIM],
> + .stat_direct_reclaims = s->stats[VIRTIO_BALLOON_S_DIRECT_RECLAIM],
> + };
... putting it here? This initializer also needs to be updated when
stats are added.
Another review note... The kernel gives us an array of stats with
well-known indexes. Since we "improved" on that interface, we need to
manually convert to struct. Oh well.
> + VirtioBalloonGuestStats guest_stats = {
> + .last_update = s->stats_last_update,
> + .stats = &stats,
> + };
> + VirtioBalloonGuestStats *argp = &guest_stats;
>
> - if (!visit_start_struct(v, name, NULL, 0, errp)) {
> - return;
> - }
> - if (!visit_type_int(v, "last-update", &s->stats_last_update, errp)) {
> - goto out_end;
> - }
> -
> - if (!visit_start_struct(v, "stats", NULL, 0, errp)) {
> - goto out_end;
> - }
> - for (i = 0; i < VIRTIO_BALLOON_S_NR; i++) {
> - if (!visit_type_uint64(v, balloon_stat_names[i], &s->stats[i], errp)) {
> - goto out_nested;
> - }
> - }
> - ok = visit_check_struct(v, errp);
> -out_nested:
> - visit_end_struct(v, NULL);
> -
> - if (ok) {
> - visit_check_struct(v, errp);
> - }
> -out_end:
> - visit_end_struct(v, NULL);
> + visit_type_VirtioBalloonGuestStats(v, name, &argp, errp);
> }
>
> static void balloon_stats_get_poll_interval(Object *obj, Visitor *v,
> @@ -1037,7 +1012,8 @@ static void virtio_balloon_instance_init(Object *obj)
> s->free_page_hint_cmd_id = VIRTIO_BALLOON_FREE_PAGE_HINT_CMD_ID_MIN;
> s->free_page_hint_notify.notify = virtio_balloon_free_page_hint_notify;
>
> - object_property_add(obj, "guest-stats", "guest statistics",
> + object_property_add_qapi(obj, "guest-stats",
> + &VirtioBalloonGuestStats_type_info,
> balloon_stats_get_all, NULL, NULL, NULL);
The @type reported by qom-list & friends changes from "guest statistics"
to "VirtioBalloonStats". Such changes can be compatibility breaks.
We accept this one, because:
1. What "guest statistics" might mean was never documented.
ObjectPropertyInfo's (flawed) comment covers only "primitive", child
and link types, which misleadingly suggests values like this one
don't exist.
2. We are not aware of anything relying on it, and we can't quite see
why anything would want to rely on it.
3. @type is a bad interface we ought to deprecate in favor of
@qapi-type.
All this needs to be noted in the commit message. Perhaps even in
release notes. I guess the latter will be easier if we do deprecate
@type.
>
> object_property_add_qapi(obj, "guest-stats-polling-interval", &int_type_info,
> diff --git a/qapi/machine.json b/qapi/machine.json
> index 9b145c635baf..34be3156270c 100644
> --- a/qapi/machine.json
> +++ b/qapi/machine.json
> @@ -1126,6 +1126,98 @@
> ##
> { 'struct': 'BalloonInfo', 'data': {'actual': 'int' } }
>
> +##
> +# @VirtioBalloonStats:
> +#
> +# VirtIO balloon device guest memory statistics.
> +#
> +# If the guest doesn't support a particular stat, or if it couldn't
> +# be retrieved, its value will be -1.
Please use the revised syntax for introductions:
##
# @name: introduction, best to keep it brief, but you may continue it
# like this if necessary. If your text need to refer to arguments
# / members, it's almost certainly not brief introduction anymore.
#
# Additional text can go here. But do consider putting it further
# down.
I apologize for the inconvenience. We need this to eliminate certain
syntactic ambiguities that plagued the doc generator. We'll need it
some more for the doc inliner.
> +#
> +# @stat-swap-in: The amount of memory that has been
> +# swapped in (in bytes).
Wrap lines at column 70, please.
> +#
> +# @stat-swap-out: The amount of memory that has been
> +# swapped out to disk (in bytes).
> +#
> +# @stat-major-faults: The number of major page faults
> +# that have occurred.
> +#
> +# @stat-minor-faults: The number of minor page faults
> +# that have occurred.
> +#
> +# @stat-free-memory: The amount of memory not being used
> +# for any purpose (in bytes).
> +#
> +# @stat-total-memory: The total amount of memory available
> +# (in bytes).
> +#
> +# @stat-available-memory: An estimate of how much memory is available
> +# (in bytes) for starting new applications, without pushing the
> +# system to swap.
> +#
> +# @stat-disk-caches: The amount of memory, in bytes, that can be
> +# quickly reclaimed without additional I/O. Typically these pages
> +# are used for caching files from disk.
> +#
> +# @stat-htlb-pgalloc: The number of successful hugetlb page
> +# allocations
> +#
> +# @stat-htlb-pgfail: The number of failed hugetlb page
> +# allocations
> +#
> +# @stat-oom-kills: The number of OOM killer invocations
> +#
> +# @stat-alloc-stalls: The number of memory allocation stalls
> +#
> +# @stat-async-scans: The number of memory scanned asynchronously
> +#
> +# @stat-direct-scans: The number of memory scanned directly
> +#
> +# @stat-async-reclaims: The number of memory reclaimed asynchronously
> +#
> +# @stat-direct-reclaims: The number of memory reclaimed directly
> +#
> +# Since: 11.2
The actual interface, namely the device property, is much older (1.4?).
Do we care? I'm not sure; this isn't part of QMP proper, it's for use
with QOM, where documentation has always been rather weak.
> +##
> +{ 'struct': 'VirtioBalloonStats',
> + 'data': {
> + 'stat-swap-in': 'uint64',
> + 'stat-swap-out': 'uint64',
> + 'stat-major-faults': 'uint64',
> + 'stat-minor-faults': 'uint64',
> + 'stat-free-memory': 'uint64',
> + 'stat-total-memory': 'uint64',
> + 'stat-available-memory': 'uint64',
> + 'stat-disk-caches': 'uint64',
> + 'stat-htlb-pgalloc': 'uint64',
> + 'stat-htlb-pgfail': 'uint64',
> + 'stat-oom-kills': 'uint64',
> + 'stat-alloc-stalls': 'uint64',
> + 'stat-async-scans': 'uint64',
> + 'stat-direct-scans': 'uint64',
> + 'stat-async-reclaims': 'uint64',
> + 'stat-direct-reclaims': 'uint64' } }
I don't like the "stat-" prefix, but we can't change that now.
> +
> +##
> +# @VirtioBalloonGuestStats:
> +#
> +# Guest statistics from the VirtIO balloon device.
Please use the revised syntax for introductions.
> +#
> +# @last-update: timestamp in seconds of the last stats
> +# update from the guest (since this timestamp is generated
> +# by the host, a buggy guest can't influence its value),
> +# or 0 if no update has been received yet.
The original text is
* A key named last-update, which contains the last stats update
timestamp in seconds. Since this timestamp is generated by the host,
a buggy guest can't influence its value. The value is 0 if the guest
has not updated the stats (yet).
Threee sentences instead of one with a parenthesis. I find this easier
to read.
> +#
> +# @stats: balloon memory statistics
> +#
> +# Since: 11.2
> +##
> +{ 'struct': 'VirtioBalloonGuestStats',
> + 'data': {
> + 'last-update': 'int',
> + 'stats': 'VirtioBalloonStats' } }
> +
> ##
> # @query-balloon:
> # Return information about the balloon device.
^ permalink raw reply [flat|nested] 69+ messages in thread
* [PATCH v7 43/65] qom: replace object_property_add_tm with StructTm QAPI type
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (41 preceding siblings ...)
2026-10-20 10:45 ` [PATCH v7 42/65] virtio-balloon: convert guest-stats property to QAPI type Marc-André Lureau
@ 2026-10-20 10:46 ` Marc-André Lureau
2026-10-20 13:25 ` Markus Armbruster
2026-10-20 10:46 ` [PATCH v7 44/65] hw/nvdimm: convert UUID property to QAPI-aware registration Marc-André Lureau
` (21 subsequent siblings)
64 siblings, 1 reply; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:46 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
Define a StructTm QAPI struct in common.json matching the existing
"struct tm" property wire format (tm_year, tm_mon, tm_mday, tm_hour,
tm_min, tm_sec as int32).
Convert the two callers (mc146818rtc and spapr_rtc) to use
object_property_add_qapi() with a standard ObjectPropertyAccessor
that populates a StructTm and calls the generated visitor.
Remove object_property_add_tm(), object_class_property_add_tm(),
the TMProperty type, and the property_get_tm() helper from
qom/object.c, along with their declarations in object.h.
Reviewed-by: Amit Machhiwal <amachhiw@linux.ibm.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
hw/ppc/spapr_rtc.c | 24 +++++++++++++++---
hw/rtc/mc146818rtc.c | 22 ++++++++++++++---
include/qom/object.h | 29 ----------------------
qapi/common.json | 28 +++++++++++++++++++++
qapi/pragma.json | 1 +
qom/object.c | 69 ----------------------------------------------------
6 files changed, 69 insertions(+), 104 deletions(-)
diff --git a/hw/ppc/spapr_rtc.c b/hw/ppc/spapr_rtc.c
index 1f7d2d8f898b..5105cf538f64 100644
--- a/hw/ppc/spapr_rtc.c
+++ b/hw/ppc/spapr_rtc.c
@@ -33,6 +33,9 @@
#include "migration/vmstate.h"
#include "qapi/error.h"
#include "qapi/qapi-events-misc.h"
+#include "qapi/qapi-type-infos-common.h"
+#include "qapi/qapi-visit-common.h"
+#include "qapi/visitor.h"
#include "qemu/cutils.h"
#include "qemu/module.h"
@@ -131,9 +134,23 @@ static void rtas_set_time_of_day(PowerPCCPU *cpu, SpaprMachineState *spapr,
rtas_st(rets, 0, RTAS_OUT_SUCCESS);
}
-static void spapr_rtc_qom_date(Object *obj, struct tm *current_tm, Error **errp)
+static void spapr_rtc_qom_date(Object *obj, Visitor *v, const char *name,
+ void *opaque, Error **errp)
{
- spapr_rtc_read(SPAPR_RTC(obj), current_tm, NULL);
+ struct tm value;
+ StructTm tm, *tmp = &tm;
+
+ spapr_rtc_read(SPAPR_RTC(obj), &value, NULL);
+
+ tm = (StructTm) {
+ .tm_year = value.tm_year,
+ .tm_mon = value.tm_mon,
+ .tm_mday = value.tm_mday,
+ .tm_hour = value.tm_hour,
+ .tm_min = value.tm_min,
+ .tm_sec = value.tm_sec,
+ };
+ visit_type_StructTm(v, name, &tmp, errp);
}
static void spapr_rtc_realize(DeviceState *dev, Error **errp)
@@ -150,7 +167,8 @@ static void spapr_rtc_realize(DeviceState *dev, Error **errp)
rtc_ns = qemu_clock_get_ns(rtc_clock);
rtc->ns_offset = host_s * NANOSECONDS_PER_SECOND - rtc_ns;
- object_property_add_tm(OBJECT(rtc), "date", spapr_rtc_qom_date);
+ object_property_add_qapi(OBJECT(rtc), "date", &StructTm_type_info,
+ spapr_rtc_qom_date, NULL, NULL, NULL);
}
static const VMStateDescription vmstate_spapr_rtc = {
diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c
index ba396435d1af..6010f8587ce0 100644
--- a/hw/rtc/mc146818rtc.c
+++ b/hw/rtc/mc146818rtc.c
@@ -42,6 +42,8 @@
#include "migration/vmstate.h"
#include "qapi/error.h"
#include "qapi/qapi-events-misc.h"
+#include "qapi/qapi-type-infos-common.h"
+#include "qapi/qapi-visit-common.h"
#include "qapi/visitor.h"
#include "trace.h"
@@ -854,12 +856,25 @@ static const MemoryRegionOps cmos_ops = {
.endianness = DEVICE_LITTLE_ENDIAN,
};
-static void rtc_get_date(Object *obj, struct tm *current_tm, Error **errp)
+static void rtc_get_date(Object *obj, Visitor *v, const char *name,
+ void *opaque, Error **errp)
{
MC146818RtcState *s = MC146818_RTC(obj);
+ struct tm value;
+ StructTm tm, *tmp = &tm;
rtc_update_time(s);
- rtc_get_time(s, current_tm);
+ rtc_get_time(s, &value);
+
+ tm = (StructTm) {
+ .tm_year = value.tm_year,
+ .tm_mon = value.tm_mon,
+ .tm_mday = value.tm_mday,
+ .tm_hour = value.tm_hour,
+ .tm_min = value.tm_min,
+ .tm_sec = value.tm_sec,
+ };
+ visit_type_StructTm(v, name, &tmp, errp);
}
static void rtc_realizefn(DeviceState *dev, Error **errp)
@@ -1019,7 +1034,8 @@ static void rtc_class_initfn(ObjectClass *klass, const void *data)
device_class_set_props(dc, mc146818rtc_properties);
set_bit(DEVICE_CATEGORY_MISC, dc->categories);
- object_class_property_add_tm(klass, "date", rtc_get_date);
+ object_class_property_add_qapi(klass, "date", &StructTm_type_info,
+ rtc_get_date, NULL, NULL, NULL);
}
static const TypeInfo mc146818rtc_info = {
diff --git a/include/qom/object.h b/include/qom/object.h
index e04be4caed57..29cbd84b8d03 100644
--- a/include/qom/object.h
+++ b/include/qom/object.h
@@ -2156,35 +2156,6 @@ object_class_property_add_qapi(ObjectClass *klass,
ObjectPropertyRelease *release,
void *opaque);
-/**
- * object_property_add_tm:
- * @obj: the object to add a property to
- * @name: the name of the property
- * @get: the getter or NULL if the property is write-only.
- *
- * Add a read-only struct tm valued property using a getter function.
- * This function will add a property of type 'struct tm'.
- *
- * Returns: The newly added property on success, or %NULL on failure.
- */
-ObjectProperty *object_property_add_tm(Object *obj, const char *name,
- void (*get)(Object *, struct tm *, Error **));
-
-/**
- * object_class_property_add_tm:
- * @klass: the object class to add a property to
- * @name: the name of the property
- * @get: the getter or NULL if the property is write-only.
- *
- * Add a read-only struct tm valued property using a getter function.
- * This function will add a property of type 'struct tm'.
- *
- * Returns: The newly added property on success, or %NULL on failure.
- */
-ObjectProperty *object_class_property_add_tm(ObjectClass *klass,
- const char *name,
- void (*get)(Object *, struct tm *, Error **));
-
typedef enum {
/* Automatically add a getter to the property */
OBJ_PROP_FLAG_READ = 1 << 0,
diff --git a/qapi/common.json b/qapi/common.json
index 1352e664b23e..222037ea0b32 100644
--- a/qapi/common.json
+++ b/qapi/common.json
@@ -218,3 +218,31 @@
##
{ 'enum': 'EndianMode',
'data': [ 'unspecified', 'little', 'big' ] }
+
+##
+# @StructTm:
+#
+# Broken-down time. Field semantics match C ``struct tm``.
+#
+# @tm_year: years since 1900
+#
+# @tm_mon: months since January (0-11)
+#
+# @tm_mday: day of the month (1-31)
+#
+# @tm_hour: hours since midnight (0-23)
+#
+# @tm_min: minutes after the hour (0-59)
+#
+# @tm_sec: seconds after the minute (0-59, 60-61 for leap seconds)
+#
+# Since: 11.2
+##
+{ 'struct': 'StructTm',
+ 'data': {
+ 'tm_year': 'int32',
+ 'tm_mon': 'int32',
+ 'tm_mday': 'int32',
+ 'tm_hour': 'int32',
+ 'tm_min': 'int32',
+ 'tm_sec': 'int32' } }
diff --git a/qapi/pragma.json b/qapi/pragma.json
index 342cedc42e76..9be2819a46bd 100644
--- a/qapi/pragma.json
+++ b/qapi/pragma.json
@@ -109,6 +109,7 @@
'QKeyCode', # send-key, input-sent-event
'QapiErrorClass', # QMP error replies
'SshHostKeyCheckMode', # blockdev-add, -blockdev
+ 'StructTm', # qom-get of RTC date property
'SysEmuTarget', # query-cpu-fast, query-target
'UuidInfo', # query-uuid
'VncClientInfo', # query-vnc, query-vnc-servers, ...
diff --git a/qom/object.c b/qom/object.c
index 9f9a2abfa08d..cf18880c6c0c 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -2721,75 +2721,6 @@ object_class_property_add_qapi(ObjectClass *klass, const char *name,
return prop;
}
-typedef struct TMProperty {
- void (*get)(Object *, struct tm *, Error **);
-} TMProperty;
-
-static void property_get_tm(Object *obj, Visitor *v, const char *name,
- void *opaque, Error **errp)
-{
- TMProperty *prop = opaque;
- Error *err = NULL;
- struct tm value;
-
- prop->get(obj, &value, &err);
- if (err) {
- error_propagate(errp, err);
- return;
- }
-
- if (!visit_start_struct(v, name, NULL, 0, errp)) {
- return;
- }
- if (!visit_type_int32(v, "tm_year", &value.tm_year, errp)) {
- goto out_end;
- }
- if (!visit_type_int32(v, "tm_mon", &value.tm_mon, errp)) {
- goto out_end;
- }
- if (!visit_type_int32(v, "tm_mday", &value.tm_mday, errp)) {
- goto out_end;
- }
- if (!visit_type_int32(v, "tm_hour", &value.tm_hour, errp)) {
- goto out_end;
- }
- if (!visit_type_int32(v, "tm_min", &value.tm_min, errp)) {
- goto out_end;
- }
- if (!visit_type_int32(v, "tm_sec", &value.tm_sec, errp)) {
- goto out_end;
- }
- visit_check_struct(v, errp);
-out_end:
- visit_end_struct(v, NULL);
-}
-
-ObjectProperty *
-object_property_add_tm(Object *obj, const char *name,
- void (*get)(Object *, struct tm *, Error **))
-{
- TMProperty *prop = g_malloc0(sizeof(*prop));
-
- prop->get = get;
-
- return object_property_add(obj, name, "struct tm",
- get ? property_get_tm : NULL, NULL,
- property_release_data,
- prop);
-}
-
-ObjectProperty *
-object_class_property_add_tm(ObjectClass *klass, const char *name,
- void (*get)(Object *, struct tm *, Error **))
-{
- TMProperty *prop = g_malloc0(sizeof(*prop));
-
- prop->get = get;
-
- return object_class_property_add(klass, name, "struct tm",
- get ? property_get_tm : NULL,
- NULL, NULL, prop);
-}
static char *object_get_type(Object *obj, Error **errp)
{
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* Re: [PATCH v7 43/65] qom: replace object_property_add_tm with StructTm QAPI type
2026-10-20 10:46 ` [PATCH v7 43/65] qom: replace object_property_add_tm with StructTm " Marc-André Lureau
@ 2026-10-20 13:25 ` Markus Armbruster
0 siblings, 0 replies; 69+ messages in thread
From: Markus Armbruster @ 2026-10-20 13:25 UTC (permalink / raw)
To: Marc-André Lureau
Cc: qemu-devel, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier
Marc-André Lureau <marcandre.lureau@redhat.com> writes:
> Define a StructTm QAPI struct in common.json matching the existing
> "struct tm" property wire format (tm_year, tm_mon, tm_mday, tm_hour,
> tm_min, tm_sec as int32).
>
> Convert the two callers (mc146818rtc and spapr_rtc) to use
> object_property_add_qapi() with a standard ObjectPropertyAccessor
> that populates a StructTm and calls the generated visitor.
>
> Remove object_property_add_tm(), object_class_property_add_tm(),
> the TMProperty type, and the property_get_tm() helper from
> qom/object.c, along with their declarations in object.h.
>
> Reviewed-by: Amit Machhiwal <amachhiw@linux.ibm.com>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> hw/ppc/spapr_rtc.c | 24 +++++++++++++++---
> hw/rtc/mc146818rtc.c | 22 ++++++++++++++---
> include/qom/object.h | 29 ----------------------
> qapi/common.json | 28 +++++++++++++++++++++
> qapi/pragma.json | 1 +
> qom/object.c | 69 ----------------------------------------------------
> 6 files changed, 69 insertions(+), 104 deletions(-)
>
> diff --git a/hw/ppc/spapr_rtc.c b/hw/ppc/spapr_rtc.c
> index 1f7d2d8f898b..5105cf538f64 100644
> --- a/hw/ppc/spapr_rtc.c
> +++ b/hw/ppc/spapr_rtc.c
> @@ -33,6 +33,9 @@
> #include "migration/vmstate.h"
> #include "qapi/error.h"
> #include "qapi/qapi-events-misc.h"
> +#include "qapi/qapi-type-infos-common.h"
> +#include "qapi/qapi-visit-common.h"
> +#include "qapi/visitor.h"
> #include "qemu/cutils.h"
> #include "qemu/module.h"
>
> @@ -131,9 +134,23 @@ static void rtas_set_time_of_day(PowerPCCPU *cpu, SpaprMachineState *spapr,
> rtas_st(rets, 0, RTAS_OUT_SUCCESS);
> }
>
> -static void spapr_rtc_qom_date(Object *obj, struct tm *current_tm, Error **errp)
> +static void spapr_rtc_qom_date(Object *obj, Visitor *v, const char *name,
> + void *opaque, Error **errp)
> {
> - spapr_rtc_read(SPAPR_RTC(obj), current_tm, NULL);
> + struct tm value;
> + StructTm tm, *tmp = &tm;
> +
> + spapr_rtc_read(SPAPR_RTC(obj), &value, NULL);
> +
> + tm = (StructTm) {
> + .tm_year = value.tm_year,
> + .tm_mon = value.tm_mon,
> + .tm_mday = value.tm_mday,
> + .tm_hour = value.tm_hour,
> + .tm_min = value.tm_min,
> + .tm_sec = value.tm_sec,
> + };
> + visit_type_StructTm(v, name, &tmp, errp);
> }
>
> static void spapr_rtc_realize(DeviceState *dev, Error **errp)
> @@ -150,7 +167,8 @@ static void spapr_rtc_realize(DeviceState *dev, Error **errp)
> rtc_ns = qemu_clock_get_ns(rtc_clock);
> rtc->ns_offset = host_s * NANOSECONDS_PER_SECOND - rtc_ns;
>
> - object_property_add_tm(OBJECT(rtc), "date", spapr_rtc_qom_date);
> + object_property_add_qapi(OBJECT(rtc), "date", &StructTm_type_info,
> + spapr_rtc_qom_date, NULL, NULL, NULL);
The @type reported by qom-list & friends changes from "struct tm"
(visible at the end of this patch) to to "StuctTm". Such changes can be
compatibility breaks.
Same "this is okay" argument as for the previous patch, and same
request: please note the change in the commit message.
> }
>
> static const VMStateDescription vmstate_spapr_rtc = {
> diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c
> index ba396435d1af..6010f8587ce0 100644
> --- a/hw/rtc/mc146818rtc.c
> +++ b/hw/rtc/mc146818rtc.c
> @@ -42,6 +42,8 @@
> #include "migration/vmstate.h"
> #include "qapi/error.h"
> #include "qapi/qapi-events-misc.h"
> +#include "qapi/qapi-type-infos-common.h"
> +#include "qapi/qapi-visit-common.h"
> #include "qapi/visitor.h"
> #include "trace.h"
>
> @@ -854,12 +856,25 @@ static const MemoryRegionOps cmos_ops = {
> .endianness = DEVICE_LITTLE_ENDIAN,
> };
>
> -static void rtc_get_date(Object *obj, struct tm *current_tm, Error **errp)
> +static void rtc_get_date(Object *obj, Visitor *v, const char *name,
> + void *opaque, Error **errp)
> {
> MC146818RtcState *s = MC146818_RTC(obj);
> + struct tm value;
> + StructTm tm, *tmp = &tm;
>
> rtc_update_time(s);
> - rtc_get_time(s, current_tm);
> + rtc_get_time(s, &value);
> +
> + tm = (StructTm) {
> + .tm_year = value.tm_year,
> + .tm_mon = value.tm_mon,
> + .tm_mday = value.tm_mday,
> + .tm_hour = value.tm_hour,
> + .tm_min = value.tm_min,
> + .tm_sec = value.tm_sec,
> + };
> + visit_type_StructTm(v, name, &tmp, errp);
> }
>
> static void rtc_realizefn(DeviceState *dev, Error **errp)
> @@ -1019,7 +1034,8 @@ static void rtc_class_initfn(ObjectClass *klass, const void *data)
> device_class_set_props(dc, mc146818rtc_properties);
> set_bit(DEVICE_CATEGORY_MISC, dc->categories);
>
> - object_class_property_add_tm(klass, "date", rtc_get_date);
> + object_class_property_add_qapi(klass, "date", &StructTm_type_info,
> + rtc_get_date, NULL, NULL, NULL);
> }
>
> static const TypeInfo mc146818rtc_info = {
> diff --git a/include/qom/object.h b/include/qom/object.h
> index e04be4caed57..29cbd84b8d03 100644
> --- a/include/qom/object.h
> +++ b/include/qom/object.h
> @@ -2156,35 +2156,6 @@ object_class_property_add_qapi(ObjectClass *klass,
> ObjectPropertyRelease *release,
> void *opaque);
>
> -/**
> - * object_property_add_tm:
> - * @obj: the object to add a property to
> - * @name: the name of the property
> - * @get: the getter or NULL if the property is write-only.
> - *
> - * Add a read-only struct tm valued property using a getter function.
> - * This function will add a property of type 'struct tm'.
> - *
> - * Returns: The newly added property on success, or %NULL on failure.
> - */
> -ObjectProperty *object_property_add_tm(Object *obj, const char *name,
> - void (*get)(Object *, struct tm *, Error **));
> -
> -/**
> - * object_class_property_add_tm:
> - * @klass: the object class to add a property to
> - * @name: the name of the property
> - * @get: the getter or NULL if the property is write-only.
> - *
> - * Add a read-only struct tm valued property using a getter function.
> - * This function will add a property of type 'struct tm'.
> - *
> - * Returns: The newly added property on success, or %NULL on failure.
> - */
> -ObjectProperty *object_class_property_add_tm(ObjectClass *klass,
> - const char *name,
> - void (*get)(Object *, struct tm *, Error **));
> -
> typedef enum {
> /* Automatically add a getter to the property */
> OBJ_PROP_FLAG_READ = 1 << 0,
> diff --git a/qapi/common.json b/qapi/common.json
> index 1352e664b23e..222037ea0b32 100644
> --- a/qapi/common.json
> +++ b/qapi/common.json
> @@ -218,3 +218,31 @@
> ##
> { 'enum': 'EndianMode',
> 'data': [ 'unspecified', 'little', 'big' ] }
> +
> +##
> +# @StructTm:
> +#
> +# Broken-down time. Field semantics match C ``struct tm``.
Again, please use the revised syntax for introductions.
> +#
> +# @tm_year: years since 1900
> +#
> +# @tm_mon: months since January (0-11)
> +#
> +# @tm_mday: day of the month (1-31)
> +#
> +# @tm_hour: hours since midnight (0-23)
> +#
> +# @tm_min: minutes after the hour (0-59)
> +#
> +# @tm_sec: seconds after the minute (0-59, 60-61 for leap seconds)
> +#
> +# Since: 11.2
Same "do we care?" as for the previous patch.
> +##
> +{ 'struct': 'StructTm',
> + 'data': {
> + 'tm_year': 'int32',
> + 'tm_mon': 'int32',
> + 'tm_mday': 'int32',
> + 'tm_hour': 'int32',
> + 'tm_min': 'int32',
> + 'tm_sec': 'int32' } }
> diff --git a/qapi/pragma.json b/qapi/pragma.json
> index 342cedc42e76..9be2819a46bd 100644
> --- a/qapi/pragma.json
> +++ b/qapi/pragma.json
> @@ -109,6 +109,7 @@
# Externally visible types whose member names may use uppercase
Not this patch's fault, but here goes anyway: the comment should be "may
use uppercase or '_'". I'll fix it.
'member-name-exceptions': [ # visible in:
'ACPISlotType', # query-acpi-ospm-status
[...]
> 'QKeyCode', # send-key, input-sent-event
> 'QapiErrorClass', # QMP error replies
> 'SshHostKeyCheckMode', # blockdev-add, -blockdev
> + 'StructTm', # qom-get of RTC date property
> 'SysEmuTarget', # query-cpu-fast, query-target
> 'UuidInfo', # query-uuid
> 'VncClientInfo', # query-vnc, query-vnc-servers, ...
[...]
^ permalink raw reply [flat|nested] 69+ messages in thread
* [PATCH v7 44/65] hw/nvdimm: convert UUID property to QAPI-aware registration
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (42 preceding siblings ...)
2026-10-20 10:46 ` [PATCH v7 43/65] qom: replace object_property_add_tm with StructTm " Marc-André Lureau
@ 2026-10-20 10:46 ` Marc-André Lureau
2026-10-20 10:46 ` [PATCH v7 45/65] hw/s390-virtio-ccw: convert loadparm " Marc-André Lureau
` (20 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:46 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
Add a QemuUUID_type_info and use object_property_add_qapi() instead of
object_property_add() for the nvdimm UUID property.
The type info is defined manually in uuid.c rather than generated,
since QAPI does not yet support string typedefs. An alternative would
be to extend the QAPI schema language with a 'typedef' construct
(e.g. { 'typedef': 'UUID', 'data': 'str' }), which would let the
generator produce the type info, C typedef, and introspection entry
automatically.
Alternatively, the exposed type being a string, we could change the
property to be str_type_info.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
hw/mem/nvdimm.c | 4 ++--
include/qemu/uuid.h | 4 ++++
util/uuid.c | 5 +++++
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/hw/mem/nvdimm.c b/hw/mem/nvdimm.c
index 123ddc938546..b7ccb5c93678 100644
--- a/hw/mem/nvdimm.c
+++ b/hw/mem/nvdimm.c
@@ -104,8 +104,8 @@ static void nvdimm_init(Object *obj)
nvdimm_get_label_size, nvdimm_set_label_size, NULL,
NULL);
- object_property_add(obj, NVDIMM_UUID_PROP, "QemuUUID", nvdimm_get_uuid,
- nvdimm_set_uuid, NULL, NULL);
+ object_property_add_qapi(obj, NVDIMM_UUID_PROP, &QemuUUID_type_info,
+ nvdimm_get_uuid, nvdimm_set_uuid, NULL, NULL);
}
static void nvdimm_finalize(Object *obj)
diff --git a/include/qemu/uuid.h b/include/qemu/uuid.h
index 869f84af09dd..ed0c62327d4d 100644
--- a/include/qemu/uuid.h
+++ b/include/qemu/uuid.h
@@ -16,6 +16,8 @@
#ifndef QEMU_UUID_H
#define QEMU_UUID_H
+#include "qapi/qapi-type-info.h"
+
/* Version 4 UUID (pseudo random numbers), RFC4122 4.4. */
@@ -99,4 +101,6 @@ QemuUUID qemu_uuid_bswap(QemuUUID uuid);
uint32_t qemu_uuid_hash(const void *uuid);
+extern const QAPITypeInfo QemuUUID_type_info;
+
#endif
diff --git a/util/uuid.c b/util/uuid.c
index 234619dd5e69..363a03051aba 100644
--- a/util/uuid.c
+++ b/util/uuid.c
@@ -17,6 +17,11 @@
#include "qemu/uuid.h"
#include "qemu/bswap.h"
+const QAPITypeInfo QemuUUID_type_info = {
+ .name = "QemuUUID",
+ .masked_name = "str",
+};
+
void qemu_uuid_generate(QemuUUID *uuid)
{
int i;
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 45/65] hw/s390-virtio-ccw: convert loadparm property to QAPI-aware registration
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (43 preceding siblings ...)
2026-10-20 10:46 ` [PATCH v7 44/65] hw/nvdimm: convert UUID property to QAPI-aware registration Marc-André Lureau
@ 2026-10-20 10:46 ` Marc-André Lureau
2026-10-20 10:46 ` [PATCH v7 46/65] hw/ppc/spapr_drc: convert fdt " Marc-André Lureau
` (19 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:46 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
The QAPI type is actually a string. Here also, if we had typedef support
we could expose a more specific type.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
hw/s390x/s390-virtio-ccw.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index fda5ecc9ad3c..3ed425b16c3e 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -43,6 +43,7 @@
#include "system/hostmem.h"
#include "target/s390x/kvm/pv.h"
#include "migration/blocker.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qapi/visitor.h"
#include "qapi/qapi-visit-machine-s390x.h"
#include "hw/s390x/cpu-topology.h"
@@ -908,7 +909,8 @@ static void ccw_machine_class_init(ObjectClass *oc, const void *data)
object_class_property_set_description(oc, "dea-key-wrap",
"enable/disable DEA key wrapping using the CPACF wrapping key");
- object_class_property_add(oc, "loadparm", "loadparm",
+ /* if QAPI learns to typedef str, we could expose a more specific type */
+ object_class_property_add_qapi(oc, "loadparm", &str_type_info,
machine_get_loadparm, machine_set_loadparm,
NULL, NULL);
object_class_property_set_description(oc, "loadparm",
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 46/65] hw/ppc/spapr_drc: convert fdt property to QAPI-aware registration
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (44 preceding siblings ...)
2026-10-20 10:46 ` [PATCH v7 45/65] hw/s390-virtio-ccw: convert loadparm " Marc-André Lureau
@ 2026-10-20 10:46 ` Marc-André Lureau
2026-10-20 10:46 ` [PATCH v7 47/65] hw/s390x: convert BootCertificatesList " Marc-André Lureau
` (18 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:46 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
Use object_property_add_qapi() with any_type_info for the "fdt"
property, since the FDT structure is dynamically shaped at runtime and
cannot be represented as a static QAPI type.
Reviewed-by: Amit Machhiwal <amachhiw@linux.ibm.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
hw/ppc/spapr_drc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c
index 64f9ca29b02e..740149ffdf3e 100644
--- a/hw/ppc/spapr_drc.c
+++ b/hw/ppc/spapr_drc.c
@@ -587,7 +587,7 @@ static void spapr_dr_connector_instance_init(Object *obj)
object_property_add_uint32_ptr(obj, "id", &drc->id, OBJ_PROP_FLAG_READ);
object_property_add_qapi(obj, "index", &uint32_type_info, prop_get_index,
NULL, NULL, NULL);
- object_property_add(obj, "fdt", "struct", prop_get_fdt,
+ object_property_add_qapi(obj, "fdt", &any_type_info, prop_get_fdt,
NULL, NULL, NULL);
drc->state = drck->empty_state;
}
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 47/65] hw/s390x: convert BootCertificatesList to QAPI-aware registration
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (45 preceding siblings ...)
2026-10-20 10:46 ` [PATCH v7 46/65] hw/ppc/spapr_drc: convert fdt " Marc-André Lureau
@ 2026-10-20 10:46 ` Marc-André Lureau
2026-10-20 10:46 ` [PATCH v7 48/65] hw/gpio/pca955x: use QAPI enums for led and pin properties Marc-André Lureau
` (17 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:46 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
hw/s390x/s390-virtio-ccw.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 3ed425b16c3e..8bc09c179552 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -44,6 +44,7 @@
#include "target/s390x/kvm/pv.h"
#include "migration/blocker.h"
#include "qapi/qapi-builtin-type-infos.h"
+#include "qapi/qapi-type-infos-machine-s390x.h"
#include "qapi/visitor.h"
#include "qapi/qapi-visit-machine-s390x.h"
#include "hw/s390x/cpu-topology.h"
@@ -918,8 +919,10 @@ static void ccw_machine_class_init(ObjectClass *oc, const void *data)
" to upper case) to pass to machine loader, boot manager,"
" and guest kernel");
- object_class_property_add(oc, "boot-certs", "BootCertificatesList",
- machine_get_boot_certs, machine_set_boot_certs, NULL, NULL);
+ object_class_property_add_qapi(oc, "boot-certs",
+ &BootCertificatesList_type_info,
+ machine_get_boot_certs,
+ machine_set_boot_certs, NULL, NULL);
object_class_property_set_description(oc, "boot-certs",
"provide paths to a directory and/or a certificate file for secure boot");
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 48/65] hw/gpio/pca955x: use QAPI enums for led and pin properties
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (46 preceding siblings ...)
2026-10-20 10:46 ` [PATCH v7 47/65] hw/s390x: convert BootCertificatesList " Marc-André Lureau
@ 2026-10-20 10:46 ` Marc-André Lureau
2026-10-20 20:28 ` Miles Glenn
2026-10-20 10:46 ` [PATCH v7 49/65] include: add QEMU_REPEAT helper macro Marc-André Lureau
` (16 subsequent siblings)
64 siblings, 1 reply; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:46 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
Replace hand-rolled string lookup tables with QAPI enums
Pca9552LedState and Pca955{2,4}PinState for the led%d and pin%d QOM
properties. This fixes the incorrect property type ("bool" for LEDs,
"str" for pins) and lets QAPI handle string-to-enum conversion in the
visitor, removing the manual string matching in the setters.
Add QEMU_BUILD_BUG_ON guards to ensure the QAPI-generated enum values
stay in sync with the hardware register encoding.
I kept Pca9552PinState & @Pca9554PinState separate types, because I
don't know if they could diverge. We could eventually merge those.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
hw/gpio/pca9552.c | 82 +++++++++++++++++++++----------------------------------
hw/gpio/pca9554.c | 39 ++++++++++----------------
qapi/machine.json | 46 +++++++++++++++++++++++++++++++
3 files changed, 92 insertions(+), 75 deletions(-)
diff --git a/hw/gpio/pca9552.c b/hw/gpio/pca9552.c
index 719149b7174b..16741c22dea3 100644
--- a/hw/gpio/pca9552.c
+++ b/hw/gpio/pca9552.c
@@ -23,7 +23,8 @@
#include "hw/core/irq.h"
#include "migration/vmstate.h"
#include "qapi/error.h"
-#include "qapi/visitor.h"
+#include "qapi/qapi-types-machine.h"
+#include "qapi/qapi-visit-machine.h"
#include "trace.h"
#include "qom/object.h"
@@ -59,16 +60,15 @@ struct PCA955xClass {
/*
* Note: The LED_ON and LED_OFF configuration values for the PCA955X
* chips are the reverse of the PCA953X family of chips.
+ *
+ * The QAPI enums must match the hardware register values.
*/
-#define PCA9552_LED_ON 0x0
-#define PCA9552_LED_OFF 0x1
-#define PCA9552_LED_PWM0 0x2
-#define PCA9552_LED_PWM1 0x3
-#define PCA9552_PIN_LOW 0x0
-#define PCA9552_PIN_HIZ 0x1
-
-static const char *led_state[] = {"on", "off", "pwm0", "pwm1"};
-static const char *pin_state[] = {"low", "high"};
+QEMU_BUILD_BUG_ON(PCA9552_LED_STATE_ON != 0x0);
+QEMU_BUILD_BUG_ON(PCA9552_LED_STATE_OFF != 0x1);
+QEMU_BUILD_BUG_ON(PCA9552_LED_STATE_PWM0 != 0x2);
+QEMU_BUILD_BUG_ON(PCA9552_LED_STATE_PWM1 != 0x3);
+QEMU_BUILD_BUG_ON(PCA9552_PIN_STATE_LOW != 0x0);
+QEMU_BUILD_BUG_ON(PCA9552_PIN_STATE_HIGH != 0x1);
static uint8_t pca955x_pin_get_config(PCA955xState *s, int pin)
{
@@ -142,24 +142,24 @@ static void pca955x_update_pin_input(PCA955xState *s)
uint8_t config = pca955x_pin_get_config(s, i);
switch (config) {
- case PCA9552_LED_ON:
+ case PCA9552_LED_STATE_ON:
/* Pin is set to 0V to turn on LED */
s->regs[input_reg] &= ~bit_mask;
break;
- case PCA9552_LED_OFF:
+ case PCA9552_LED_STATE_OFF:
/*
* Pin is set to Hi-Z to turn off LED and
* pullup sets it to a logical 1 unless
* external device drives it low.
*/
- if (s->ext_state[i] == PCA9552_PIN_LOW) {
+ if (s->ext_state[i] == PCA9552_PIN_STATE_LOW) {
s->regs[input_reg] &= ~bit_mask;
} else {
s->regs[input_reg] |= bit_mask;
}
break;
- case PCA9552_LED_PWM0:
- case PCA9552_LED_PWM1:
+ case PCA9552_LED_STATE_PWM0:
+ case PCA9552_LED_STATE_PWM1:
/* TODO */
default:
break;
@@ -176,7 +176,7 @@ static void pca955x_update_pin_input(PCA955xState *s)
*/
if (s->regs[config_reg] & bit_mask) {
/* Input mode - reflect external state */
- if (s->ext_state[i] == PCA9552_PIN_LOW) {
+ if (s->ext_state[i] == PCA9552_PIN_STATE_LOW) {
s->regs[input_reg] &= ~bit_mask;
} else {
s->regs[input_reg] |= bit_mask;
@@ -360,7 +360,7 @@ static void pca955x_get_led(Object *obj, Visitor *v, const char *name,
PCA955xClass *k = PCA955X_GET_CLASS(obj);
PCA955xState *s = PCA955X(obj);
int led, rc, reg;
- uint8_t state;
+ Pca9552LedState state;
rc = sscanf(name, "led%2d", &led);
if (rc != 1) {
@@ -378,7 +378,7 @@ static void pca955x_get_led(Object *obj, Visitor *v, const char *name,
*/
reg = PCA9552_LS0 + led / 4;
state = (pca955x_read(s, reg) >> ((led % 4) * 2)) & 0x3;
- visit_type_str(v, name, (char **)&led_state[state], errp);
+ visit_type_Pca9552LedState(v, name, &state, errp);
}
/*
@@ -397,10 +397,9 @@ static void pca955x_set_led(Object *obj, Visitor *v, const char *name,
PCA955xClass *k = PCA955X_GET_CLASS(obj);
PCA955xState *s = PCA955X(obj);
int led, rc, reg, val;
- uint8_t state;
- g_autofree char *state_str = NULL;
+ Pca9552LedState state;
- if (!visit_type_str(v, name, &state_str, errp)) {
+ if (!visit_type_Pca9552LedState(v, name, &state, errp)) {
return;
}
rc = sscanf(name, "led%2d", &led);
@@ -413,16 +412,6 @@ static void pca955x_set_led(Object *obj, Visitor *v, const char *name,
return;
}
- for (state = 0; state < ARRAY_SIZE(led_state); state++) {
- if (!strcmp(state_str, led_state[state])) {
- break;
- }
- }
- if (state >= ARRAY_SIZE(led_state)) {
- error_setg(errp, "%s invalid led state %s", __func__, state_str);
- return;
- }
-
reg = PCA9552_LS0 + led / 4;
val = pca955x_read(s, reg);
val = pca955x_ledsel(val, led % 4, state);
@@ -437,7 +426,8 @@ static void pca955x_get_pin(Object *obj, Visitor *v, const char *name,
PCA955xClass *k = PCA955X_GET_CLASS(obj);
PCA955xState *s = PCA955X(obj);
int pin, rc;
- uint8_t input_reg, state;
+ uint8_t input_reg;
+ Pca9552PinState state;
rc = sscanf(name, "pin%2d", &pin);
if (rc != 1) {
@@ -455,7 +445,7 @@ static void pca955x_get_pin(Object *obj, Visitor *v, const char *name,
*/
input_reg = PCA9535_INPUT0 + (pin / 8);
state = (s->regs[input_reg] >> (pin % 8)) & 0x1;
- visit_type_str(v, name, (char **)&pin_state[state], errp);
+ visit_type_Pca9552PinState(v, name, &state, errp);
}
static void pca955x_set_pin(Object *obj, Visitor *v, const char *name,
@@ -464,10 +454,10 @@ static void pca955x_set_pin(Object *obj, Visitor *v, const char *name,
PCA955xClass *k = PCA955X_GET_CLASS(obj);
PCA955xState *s = PCA955X(obj);
int pin, rc;
- uint8_t state, config_reg;
- g_autofree char *state_str = NULL;
+ Pca9552PinState state;
+ uint8_t config_reg;
- if (!visit_type_str(v, name, &state_str, errp)) {
+ if (!visit_type_Pca9552PinState(v, name, &state, errp)) {
return;
}
rc = sscanf(name, "pin%2d", &pin);
@@ -480,16 +470,6 @@ static void pca955x_set_pin(Object *obj, Visitor *v, const char *name,
return;
}
- for (state = 0; state < ARRAY_SIZE(pin_state); state++) {
- if (!strcmp(state_str, pin_state[state])) {
- break;
- }
- }
- if (state >= ARRAY_SIZE(pin_state)) {
- error_setg(errp, "%s invalid pin state %s", __func__, state_str);
- return;
- }
-
/* Only input-configured pins can be driven by an external device. */
config_reg = PCA9535_CONFIG0 + (pin / 8);
if (!((s->regs[config_reg] >> (pin % 8)) & 0x1)) {
@@ -499,7 +479,7 @@ static void pca955x_set_pin(Object *obj, Visitor *v, const char *name,
return;
}
- pca955x_set_ext_state(s, pin, state != PCA9552_PIN_LOW);
+ pca955x_set_ext_state(s, pin, state != PCA9552_PIN_STATE_LOW);
}
static const VMStateDescription pca9552_vmstate = {
@@ -529,7 +509,7 @@ static void pca9552_reset_hold(Object *obj, ResetType type)
s->regs[PCA9552_LS2] = 0x55;
s->regs[PCA9552_LS3] = 0x55;
- memset(s->ext_state, PCA9552_PIN_HIZ, PCA955X_PIN_COUNT_MAX);
+ memset(s->ext_state, PCA9552_PIN_STATE_HIGH, PCA955X_PIN_COUNT_MAX);
pca955x_update_pin_input(s);
s->pointer = 0xFF;
@@ -549,7 +529,7 @@ static void pca9535_reset_hold(Object *obj, ResetType type)
s->regs[PCA9535_CONFIG0] = 0xFF; /* All pins as inputs */
s->regs[PCA9535_CONFIG1] = 0xFF; /* All pins as inputs */
- memset(s->ext_state, PCA9552_PIN_HIZ, PCA955X_PIN_COUNT_MAX);
+ memset(s->ext_state, PCA9552_PIN_STATE_HIGH, PCA955X_PIN_COUNT_MAX);
pca955x_update_pin_input(s);
s->pointer = 0xFF;
@@ -567,12 +547,12 @@ static void pca955x_initfn(Object *obj)
if (k->has_led_support) {
/* LED variant: expose the LED selector state as led%d. */
name = g_strdup_printf("led%d", ix);
- object_property_add(obj, name, "bool",
+ object_property_add(obj, name, "Pca9552LedState",
pca955x_get_led, pca955x_set_led, NULL, NULL);
} else {
/* GPIO variant: expose the pin logic level as pin%d. */
name = g_strdup_printf("pin%d", ix);
- object_property_add(obj, name, "str",
+ object_property_add(obj, name, "Pca9552PinState",
pca955x_get_pin, pca955x_set_pin, NULL, NULL);
}
g_free(name);
diff --git a/hw/gpio/pca9554.c b/hw/gpio/pca9554.c
index 904698cdce85..e4eddc829ef7 100644
--- a/hw/gpio/pca9554.c
+++ b/hw/gpio/pca9554.c
@@ -16,6 +16,8 @@
#include "hw/core/irq.h"
#include "migration/vmstate.h"
#include "qapi/error.h"
+#include "qapi/qapi-types-machine.h"
+#include "qapi/qapi-visit-machine.h"
#include "qapi/visitor.h"
#include "trace.h"
#include "qom/object.h"
@@ -32,10 +34,8 @@ typedef struct PCA9554Class PCA9554Class;
DECLARE_CLASS_CHECKERS(PCA9554Class, PCA9554,
TYPE_PCA9554)
-#define PCA9554_PIN_LOW 0x0
-#define PCA9554_PIN_HIZ 0x1
-
-static const char *pin_state[] = {"low", "high"};
+QEMU_BUILD_BUG_ON(PCA9554_PIN_STATE_LOW != 0x0);
+QEMU_BUILD_BUG_ON(PCA9554_PIN_STATE_HIGH != 0x1);
static void pca9554_update_pin_input(PCA9554State *s)
{
@@ -54,7 +54,7 @@ static void pca9554_update_pin_input(PCA9554State *s)
* Input: the pin is Hi-Z with a pull-up, so it reads high
* unless an external device drives it low.
*/
- if (s->ext_state[i] == PCA9554_PIN_LOW) {
+ if (s->ext_state[i] == PCA9554_PIN_STATE_LOW) {
s->regs[PCA9554_INPUT] &= ~bit_mask;
} else {
s->regs[PCA9554_INPUT] |= bit_mask;
@@ -156,7 +156,7 @@ static void pca9554_get_pin(Object *obj, Visitor *v, const char *name,
{
PCA9554State *s = PCA9554(obj);
int pin, rc;
- uint8_t state;
+ Pca9554PinState state;
rc = sscanf(name, "pin%2d", &pin);
if (rc != 1) {
@@ -175,7 +175,7 @@ static void pca9554_get_pin(Object *obj, Visitor *v, const char *name,
* holds the wire level regardless of the configured direction.
*/
state = (s->regs[PCA9554_INPUT] >> pin) & 0x1;
- visit_type_str(v, name, (char **)&pin_state[state], errp);
+ visit_type_Pca9554PinState(v, name, &state, errp);
}
static void pca9554_set_pin(Object *obj, Visitor *v, const char *name,
@@ -183,10 +183,10 @@ static void pca9554_set_pin(Object *obj, Visitor *v, const char *name,
{
PCA9554State *s = PCA9554(obj);
int pin, rc, val;
- uint8_t state, mask;
- g_autofree char *state_str = NULL;
+ uint8_t mask;
+ Pca9554PinState state;
- if (!visit_type_str(v, name, &state_str, errp)) {
+ if (!visit_type_Pca9554PinState(v, name, &state, errp)) {
return;
}
rc = sscanf(name, "pin%2d", &pin);
@@ -199,16 +199,6 @@ static void pca9554_set_pin(Object *obj, Visitor *v, const char *name,
return;
}
- for (state = 0; state < ARRAY_SIZE(pin_state); state++) {
- if (!strcmp(state_str, pin_state[state])) {
- break;
- }
- }
- if (state >= ARRAY_SIZE(pin_state)) {
- error_setg(errp, "%s invalid pin state %s", __func__, state_str);
- return;
- }
-
if (s->hw_dir) {
/* Warn and ignore if the guest has configured this pin as output */
if (!((s->regs[PCA9554_CONFIG] >> pin) & 0x1)) {
@@ -219,13 +209,13 @@ static void pca9554_set_pin(Object *obj, Visitor *v, const char *name,
return;
}
/* Drive the external input level */
- pca9554_set_ext_state(s, pin, state != PCA9554_PIN_LOW);
+ pca9554_set_ext_state(s, pin, state != PCA9554_PIN_STATE_LOW);
} else {
/* Legacy behavior: force output mode and drive */
/* First, modify the output register bit */
val = pca9554_read(s, PCA9554_OUTPUT);
mask = 0x1 << pin;
- if (state == PCA9554_PIN_LOW) {
+ if (state == PCA9554_PIN_STATE_LOW) {
val &= ~(mask);
} else {
val |= mask;
@@ -264,7 +254,7 @@ static void pca9554_reset(DeviceState *dev)
s->regs[PCA9554_POLARITY] = 0x0; /* No pins are inverted */
s->regs[PCA9554_CONFIG] = pin_mask; /* All pins are inputs */
- memset(s->ext_state, PCA9554_PIN_HIZ, pc->pin_count);
+ memset(s->ext_state, PCA9554_PIN_STATE_HIGH, pc->pin_count);
pca9554_update_pin_input(s);
s->pointer = 0x0;
@@ -280,7 +270,8 @@ static void pca9554_initfn(Object *obj)
char *name;
name = g_strdup_printf("pin%d", pin);
- object_property_add(obj, name, "str", pca9554_get_pin, pca9554_set_pin,
+ object_property_add(obj, name, "Pca9554PinState",
+ pca9554_get_pin, pca9554_set_pin,
NULL, NULL);
g_free(name);
}
diff --git a/qapi/machine.json b/qapi/machine.json
index 34be3156270c..46b6935ab0b8 100644
--- a/qapi/machine.json
+++ b/qapi/machine.json
@@ -416,6 +416,52 @@
{ 'enum': 'LostTickPolicy',
'data': ['discard', 'delay', 'slew' ] }
+##
+# @Pca9552LedState:
+#
+# LED state for PCA9552.
+#
+# @on: LED on
+#
+# @off: LED off
+#
+# @pwm0: LED controlled by PWM0
+#
+# @pwm1: LED controlled by PWM1
+#
+# Since: 11.2
+##
+{ 'enum': 'Pca9552LedState',
+ 'data': ['on', 'off', 'pwm0', 'pwm1'] }
+
+##
+# @Pca9552PinState:
+#
+# Pin state for PCA9552.
+#
+# @low: Pin low
+#
+# @high: Pin high
+#
+# Since: 11.2
+##
+{ 'enum': 'Pca9552PinState',
+ 'data': ['low', 'high'] }
+
+##
+# @Pca9554PinState:
+#
+# Pin state for PCA9554.
+#
+# @low: Pin low
+#
+# @high: Pin high
+#
+# Since: 11.2
+##
+{ 'enum': 'Pca9554PinState',
+ 'data': ['low', 'high'] }
+
##
# @inject-nmi:
# Injects a Non-Maskable Interrupt (machine specific: for example
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* Re: [PATCH v7 48/65] hw/gpio/pca955x: use QAPI enums for led and pin properties
2026-10-20 10:46 ` [PATCH v7 48/65] hw/gpio/pca955x: use QAPI enums for led and pin properties Marc-André Lureau
@ 2026-10-20 20:28 ` Miles Glenn
0 siblings, 0 replies; 69+ messages in thread
From: Miles Glenn @ 2026-10-20 20:28 UTC (permalink / raw)
To: Marc-André Lureau, qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Conor Dooley, Sebastian Huber,
Halil Pasic, Christian Borntraeger, Jason Herne, Titus Rwantare,
Stefano Stabellini, Anthony PERARD, Peter Xu, Chinmay Rath,
Hendrik Brueckner, xen-devel, Roman Bolshakov, Phil Dennis-Jordan,
Fam Zheng, Farhan Ali, Alex Williamson, Tao Tang, Stefan Berger,
Fabiano Rosas, Mark Cave-Ayland, Artyom Tarasenko, Yoshinori Sato,
Jiri Pirko, Eric Auger, Laurent Vivier
Reviewed-by: Glenn Miles <milesg@linux.ibm.com>
Thanks,
Glenn
On Tue, 2026-10-20 at 14:46 +0400, Marc-André Lureau wrote:
> Replace hand-rolled string lookup tables with QAPI enums
> Pca9552LedState and Pca955{2,4}PinState for the led%d and pin%d QOM
> properties. This fixes the incorrect property type ("bool" for LEDs,
> "str" for pins) and lets QAPI handle string-to-enum conversion in the
> visitor, removing the manual string matching in the setters.
>
> Add QEMU_BUILD_BUG_ON guards to ensure the QAPI-generated enum values
> stay in sync with the hardware register encoding.
>
> I kept Pca9552PinState & @Pca9554PinState separate types, because I
> don't know if they could diverge. We could eventually merge those.
>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> hw/gpio/pca9552.c | 82 +++++++++++++++++++++----------------------------------
> hw/gpio/pca9554.c | 39 ++++++++++----------------
> qapi/machine.json | 46 +++++++++++++++++++++++++++++++
> 3 files changed, 92 insertions(+), 75 deletions(-)
>
> diff --git a/hw/gpio/pca9552.c b/hw/gpio/pca9552.c
> index 719149b7174b..16741c22dea3 100644
> --- a/hw/gpio/pca9552.c
> +++ b/hw/gpio/pca9552.c
> @@ -23,7 +23,8 @@
> #include "hw/core/irq.h"
> #include "migration/vmstate.h"
> #include "qapi/error.h"
> -#include "qapi/visitor.h"
> +#include "qapi/qapi-types-machine.h"
> +#include "qapi/qapi-visit-machine.h"
> #include "trace.h"
> #include "qom/object.h"
>
> @@ -59,16 +60,15 @@ struct PCA955xClass {
> /*
> * Note: The LED_ON and LED_OFF configuration values for the PCA955X
> * chips are the reverse of the PCA953X family of chips.
> + *
> + * The QAPI enums must match the hardware register values.
> */
> -#define PCA9552_LED_ON 0x0
> -#define PCA9552_LED_OFF 0x1
> -#define PCA9552_LED_PWM0 0x2
> -#define PCA9552_LED_PWM1 0x3
> -#define PCA9552_PIN_LOW 0x0
> -#define PCA9552_PIN_HIZ 0x1
> -
> -static const char *led_state[] = {"on", "off", "pwm0", "pwm1"};
> -static const char *pin_state[] = {"low", "high"};
> +QEMU_BUILD_BUG_ON(PCA9552_LED_STATE_ON != 0x0);
> +QEMU_BUILD_BUG_ON(PCA9552_LED_STATE_OFF != 0x1);
> +QEMU_BUILD_BUG_ON(PCA9552_LED_STATE_PWM0 != 0x2);
> +QEMU_BUILD_BUG_ON(PCA9552_LED_STATE_PWM1 != 0x3);
> +QEMU_BUILD_BUG_ON(PCA9552_PIN_STATE_LOW != 0x0);
> +QEMU_BUILD_BUG_ON(PCA9552_PIN_STATE_HIGH != 0x1);
>
> static uint8_t pca955x_pin_get_config(PCA955xState *s, int pin)
> {
> @@ -142,24 +142,24 @@ static void pca955x_update_pin_input(PCA955xState *s)
> uint8_t config = pca955x_pin_get_config(s, i);
>
> switch (config) {
> - case PCA9552_LED_ON:
> + case PCA9552_LED_STATE_ON:
> /* Pin is set to 0V to turn on LED */
> s->regs[input_reg] &= ~bit_mask;
> break;
> - case PCA9552_LED_OFF:
> + case PCA9552_LED_STATE_OFF:
> /*
> * Pin is set to Hi-Z to turn off LED and
> * pullup sets it to a logical 1 unless
> * external device drives it low.
> */
> - if (s->ext_state[i] == PCA9552_PIN_LOW) {
> + if (s->ext_state[i] == PCA9552_PIN_STATE_LOW) {
> s->regs[input_reg] &= ~bit_mask;
> } else {
> s->regs[input_reg] |= bit_mask;
> }
> break;
> - case PCA9552_LED_PWM0:
> - case PCA9552_LED_PWM1:
> + case PCA9552_LED_STATE_PWM0:
> + case PCA9552_LED_STATE_PWM1:
> /* TODO */
> default:
> break;
> @@ -176,7 +176,7 @@ static void pca955x_update_pin_input(PCA955xState *s)
> */
> if (s->regs[config_reg] & bit_mask) {
> /* Input mode - reflect external state */
> - if (s->ext_state[i] == PCA9552_PIN_LOW) {
> + if (s->ext_state[i] == PCA9552_PIN_STATE_LOW) {
> s->regs[input_reg] &= ~bit_mask;
> } else {
> s->regs[input_reg] |= bit_mask;
> @@ -360,7 +360,7 @@ static void pca955x_get_led(Object *obj, Visitor *v, const char *name,
> PCA955xClass *k = PCA955X_GET_CLASS(obj);
> PCA955xState *s = PCA955X(obj);
> int led, rc, reg;
> - uint8_t state;
> + Pca9552LedState state;
>
> rc = sscanf(name, "led%2d", &led);
> if (rc != 1) {
> @@ -378,7 +378,7 @@ static void pca955x_get_led(Object *obj, Visitor *v, const char *name,
> */
> reg = PCA9552_LS0 + led / 4;
> state = (pca955x_read(s, reg) >> ((led % 4) * 2)) & 0x3;
> - visit_type_str(v, name, (char **)&led_state[state], errp);
> + visit_type_Pca9552LedState(v, name, &state, errp);
> }
>
> /*
> @@ -397,10 +397,9 @@ static void pca955x_set_led(Object *obj, Visitor *v, const char *name,
> PCA955xClass *k = PCA955X_GET_CLASS(obj);
> PCA955xState *s = PCA955X(obj);
> int led, rc, reg, val;
> - uint8_t state;
> - g_autofree char *state_str = NULL;
> + Pca9552LedState state;
>
> - if (!visit_type_str(v, name, &state_str, errp)) {
> + if (!visit_type_Pca9552LedState(v, name, &state, errp)) {
> return;
> }
> rc = sscanf(name, "led%2d", &led);
> @@ -413,16 +412,6 @@ static void pca955x_set_led(Object *obj, Visitor *v, const char *name,
> return;
> }
>
> - for (state = 0; state < ARRAY_SIZE(led_state); state++) {
> - if (!strcmp(state_str, led_state[state])) {
> - break;
> - }
> - }
> - if (state >= ARRAY_SIZE(led_state)) {
> - error_setg(errp, "%s invalid led state %s", __func__, state_str);
> - return;
> - }
> -
> reg = PCA9552_LS0 + led / 4;
> val = pca955x_read(s, reg);
> val = pca955x_ledsel(val, led % 4, state);
> @@ -437,7 +426,8 @@ static void pca955x_get_pin(Object *obj, Visitor *v, const char *name,
> PCA955xClass *k = PCA955X_GET_CLASS(obj);
> PCA955xState *s = PCA955X(obj);
> int pin, rc;
> - uint8_t input_reg, state;
> + uint8_t input_reg;
> + Pca9552PinState state;
>
> rc = sscanf(name, "pin%2d", &pin);
> if (rc != 1) {
> @@ -455,7 +445,7 @@ static void pca955x_get_pin(Object *obj, Visitor *v, const char *name,
> */
> input_reg = PCA9535_INPUT0 + (pin / 8);
> state = (s->regs[input_reg] >> (pin % 8)) & 0x1;
> - visit_type_str(v, name, (char **)&pin_state[state], errp);
> + visit_type_Pca9552PinState(v, name, &state, errp);
> }
>
> static void pca955x_set_pin(Object *obj, Visitor *v, const char *name,
> @@ -464,10 +454,10 @@ static void pca955x_set_pin(Object *obj, Visitor *v, const char *name,
> PCA955xClass *k = PCA955X_GET_CLASS(obj);
> PCA955xState *s = PCA955X(obj);
> int pin, rc;
> - uint8_t state, config_reg;
> - g_autofree char *state_str = NULL;
> + Pca9552PinState state;
> + uint8_t config_reg;
>
> - if (!visit_type_str(v, name, &state_str, errp)) {
> + if (!visit_type_Pca9552PinState(v, name, &state, errp)) {
> return;
> }
> rc = sscanf(name, "pin%2d", &pin);
> @@ -480,16 +470,6 @@ static void pca955x_set_pin(Object *obj, Visitor *v, const char *name,
> return;
> }
>
> - for (state = 0; state < ARRAY_SIZE(pin_state); state++) {
> - if (!strcmp(state_str, pin_state[state])) {
> - break;
> - }
> - }
> - if (state >= ARRAY_SIZE(pin_state)) {
> - error_setg(errp, "%s invalid pin state %s", __func__, state_str);
> - return;
> - }
> -
> /* Only input-configured pins can be driven by an external device. */
> config_reg = PCA9535_CONFIG0 + (pin / 8);
> if (!((s->regs[config_reg] >> (pin % 8)) & 0x1)) {
> @@ -499,7 +479,7 @@ static void pca955x_set_pin(Object *obj, Visitor *v, const char *name,
> return;
> }
>
> - pca955x_set_ext_state(s, pin, state != PCA9552_PIN_LOW);
> + pca955x_set_ext_state(s, pin, state != PCA9552_PIN_STATE_LOW);
> }
>
> static const VMStateDescription pca9552_vmstate = {
> @@ -529,7 +509,7 @@ static void pca9552_reset_hold(Object *obj, ResetType type)
> s->regs[PCA9552_LS2] = 0x55;
> s->regs[PCA9552_LS3] = 0x55;
>
> - memset(s->ext_state, PCA9552_PIN_HIZ, PCA955X_PIN_COUNT_MAX);
> + memset(s->ext_state, PCA9552_PIN_STATE_HIGH, PCA955X_PIN_COUNT_MAX);
> pca955x_update_pin_input(s);
>
> s->pointer = 0xFF;
> @@ -549,7 +529,7 @@ static void pca9535_reset_hold(Object *obj, ResetType type)
> s->regs[PCA9535_CONFIG0] = 0xFF; /* All pins as inputs */
> s->regs[PCA9535_CONFIG1] = 0xFF; /* All pins as inputs */
>
> - memset(s->ext_state, PCA9552_PIN_HIZ, PCA955X_PIN_COUNT_MAX);
> + memset(s->ext_state, PCA9552_PIN_STATE_HIGH, PCA955X_PIN_COUNT_MAX);
> pca955x_update_pin_input(s);
>
> s->pointer = 0xFF;
> @@ -567,12 +547,12 @@ static void pca955x_initfn(Object *obj)
> if (k->has_led_support) {
> /* LED variant: expose the LED selector state as led%d. */
> name = g_strdup_printf("led%d", ix);
> - object_property_add(obj, name, "bool",
> + object_property_add(obj, name, "Pca9552LedState",
> pca955x_get_led, pca955x_set_led, NULL, NULL);
> } else {
> /* GPIO variant: expose the pin logic level as pin%d. */
> name = g_strdup_printf("pin%d", ix);
> - object_property_add(obj, name, "str",
> + object_property_add(obj, name, "Pca9552PinState",
> pca955x_get_pin, pca955x_set_pin, NULL, NULL);
> }
> g_free(name);
> diff --git a/hw/gpio/pca9554.c b/hw/gpio/pca9554.c
> index 904698cdce85..e4eddc829ef7 100644
> --- a/hw/gpio/pca9554.c
> +++ b/hw/gpio/pca9554.c
> @@ -16,6 +16,8 @@
> #include "hw/core/irq.h"
> #include "migration/vmstate.h"
> #include "qapi/error.h"
> +#include "qapi/qapi-types-machine.h"
> +#include "qapi/qapi-visit-machine.h"
> #include "qapi/visitor.h"
> #include "trace.h"
> #include "qom/object.h"
> @@ -32,10 +34,8 @@ typedef struct PCA9554Class PCA9554Class;
> DECLARE_CLASS_CHECKERS(PCA9554Class, PCA9554,
> TYPE_PCA9554)
>
> -#define PCA9554_PIN_LOW 0x0
> -#define PCA9554_PIN_HIZ 0x1
> -
> -static const char *pin_state[] = {"low", "high"};
> +QEMU_BUILD_BUG_ON(PCA9554_PIN_STATE_LOW != 0x0);
> +QEMU_BUILD_BUG_ON(PCA9554_PIN_STATE_HIGH != 0x1);
>
> static void pca9554_update_pin_input(PCA9554State *s)
> {
> @@ -54,7 +54,7 @@ static void pca9554_update_pin_input(PCA9554State *s)
> * Input: the pin is Hi-Z with a pull-up, so it reads high
> * unless an external device drives it low.
> */
> - if (s->ext_state[i] == PCA9554_PIN_LOW) {
> + if (s->ext_state[i] == PCA9554_PIN_STATE_LOW) {
> s->regs[PCA9554_INPUT] &= ~bit_mask;
> } else {
> s->regs[PCA9554_INPUT] |= bit_mask;
> @@ -156,7 +156,7 @@ static void pca9554_get_pin(Object *obj, Visitor *v, const char *name,
> {
> PCA9554State *s = PCA9554(obj);
> int pin, rc;
> - uint8_t state;
> + Pca9554PinState state;
>
> rc = sscanf(name, "pin%2d", &pin);
> if (rc != 1) {
> @@ -175,7 +175,7 @@ static void pca9554_get_pin(Object *obj, Visitor *v, const char *name,
> * holds the wire level regardless of the configured direction.
> */
> state = (s->regs[PCA9554_INPUT] >> pin) & 0x1;
> - visit_type_str(v, name, (char **)&pin_state[state], errp);
> + visit_type_Pca9554PinState(v, name, &state, errp);
> }
>
> static void pca9554_set_pin(Object *obj, Visitor *v, const char *name,
> @@ -183,10 +183,10 @@ static void pca9554_set_pin(Object *obj, Visitor *v, const char *name,
> {
> PCA9554State *s = PCA9554(obj);
> int pin, rc, val;
> - uint8_t state, mask;
> - g_autofree char *state_str = NULL;
> + uint8_t mask;
> + Pca9554PinState state;
>
> - if (!visit_type_str(v, name, &state_str, errp)) {
> + if (!visit_type_Pca9554PinState(v, name, &state, errp)) {
> return;
> }
> rc = sscanf(name, "pin%2d", &pin);
> @@ -199,16 +199,6 @@ static void pca9554_set_pin(Object *obj, Visitor *v, const char *name,
> return;
> }
>
> - for (state = 0; state < ARRAY_SIZE(pin_state); state++) {
> - if (!strcmp(state_str, pin_state[state])) {
> - break;
> - }
> - }
> - if (state >= ARRAY_SIZE(pin_state)) {
> - error_setg(errp, "%s invalid pin state %s", __func__, state_str);
> - return;
> - }
> -
> if (s->hw_dir) {
> /* Warn and ignore if the guest has configured this pin as output */
> if (!((s->regs[PCA9554_CONFIG] >> pin) & 0x1)) {
> @@ -219,13 +209,13 @@ static void pca9554_set_pin(Object *obj, Visitor *v, const char *name,
> return;
> }
> /* Drive the external input level */
> - pca9554_set_ext_state(s, pin, state != PCA9554_PIN_LOW);
> + pca9554_set_ext_state(s, pin, state != PCA9554_PIN_STATE_LOW);
> } else {
> /* Legacy behavior: force output mode and drive */
> /* First, modify the output register bit */
> val = pca9554_read(s, PCA9554_OUTPUT);
> mask = 0x1 << pin;
> - if (state == PCA9554_PIN_LOW) {
> + if (state == PCA9554_PIN_STATE_LOW) {
> val &= ~(mask);
> } else {
> val |= mask;
> @@ -264,7 +254,7 @@ static void pca9554_reset(DeviceState *dev)
> s->regs[PCA9554_POLARITY] = 0x0; /* No pins are inverted */
> s->regs[PCA9554_CONFIG] = pin_mask; /* All pins are inputs */
>
> - memset(s->ext_state, PCA9554_PIN_HIZ, pc->pin_count);
> + memset(s->ext_state, PCA9554_PIN_STATE_HIGH, pc->pin_count);
> pca9554_update_pin_input(s);
>
> s->pointer = 0x0;
> @@ -280,7 +270,8 @@ static void pca9554_initfn(Object *obj)
> char *name;
>
> name = g_strdup_printf("pin%d", pin);
> - object_property_add(obj, name, "str", pca9554_get_pin, pca9554_set_pin,
> + object_property_add(obj, name, "Pca9554PinState",
> + pca9554_get_pin, pca9554_set_pin,
> NULL, NULL);
> g_free(name);
> }
> diff --git a/qapi/machine.json b/qapi/machine.json
> index 34be3156270c..46b6935ab0b8 100644
> --- a/qapi/machine.json
> +++ b/qapi/machine.json
> @@ -416,6 +416,52 @@
> { 'enum': 'LostTickPolicy',
> 'data': ['discard', 'delay', 'slew' ] }
>
> +##
> +# @Pca9552LedState:
> +#
> +# LED state for PCA9552.
> +#
> +# @on: LED on
> +#
> +# @off: LED off
> +#
> +# @pwm0: LED controlled by PWM0
> +#
> +# @pwm1: LED controlled by PWM1
> +#
> +# Since: 11.2
> +##
> +{ 'enum': 'Pca9552LedState',
> + 'data': ['on', 'off', 'pwm0', 'pwm1'] }
> +
> +##
> +# @Pca9552PinState:
> +#
> +# Pin state for PCA9552.
> +#
> +# @low: Pin low
> +#
> +# @high: Pin high
> +#
> +# Since: 11.2
> +##
> +{ 'enum': 'Pca9552PinState',
> + 'data': ['low', 'high'] }
> +
> +##
> +# @Pca9554PinState:
> +#
> +# Pin state for PCA9554.
> +#
> +# @low: Pin low
> +#
> +# @high: Pin high
> +#
> +# Since: 11.2
> +##
> +{ 'enum': 'Pca9554PinState',
> + 'data': ['low', 'high'] }
> +
> ##
> # @inject-nmi:
> # Injects a Non-Maskable Interrupt (machine specific: for example
>
^ permalink raw reply [flat|nested] 69+ messages in thread
* [PATCH v7 49/65] include: add QEMU_REPEAT helper macro
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (47 preceding siblings ...)
2026-10-20 10:46 ` [PATCH v7 48/65] hw/gpio/pca955x: use QAPI enums for led and pin properties Marc-André Lureau
@ 2026-10-20 10:46 ` Marc-André Lureau
2026-10-20 10:46 ` [PATCH v7 50/65] hw/gpio/pca955x: convert pin/led property to QAPI-aware enum Marc-André Lureau
` (15 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:46 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
Introduce a macro used in following commit, and convert a few existing
candidates. Inspired by a similar macro in Linux kernel/trace/bpf_trace.c
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
hw/misc/tz-ppc.c | 19 ++-----------------
hw/remote/vfio-user-obj.c | 17 +++--------------
include/hw/cxl/cxl_component.h | 5 +----
include/qemu/osdep.h | 33 +++++++++++++++++++++++++++++++++
4 files changed, 39 insertions(+), 35 deletions(-)
diff --git a/hw/misc/tz-ppc.c b/hw/misc/tz-ppc.c
index 6f820430eed8..5f09ce164c19 100644
--- a/hw/misc/tz-ppc.c
+++ b/hw/misc/tz-ppc.c
@@ -303,26 +303,11 @@ static const VMStateDescription tz_ppc_vmstate = {
#define DEFINE_PORT(N) \
DEFINE_PROP_LINK("port[" #N "]", TZPPC, port[N].downstream, \
- TYPE_MEMORY_REGION, MemoryRegion *)
+ TYPE_MEMORY_REGION, MemoryRegion *),
static const Property tz_ppc_properties[] = {
DEFINE_PROP_UINT32("NONSEC_MASK", TZPPC, nonsec_mask, 0),
- DEFINE_PORT(0),
- DEFINE_PORT(1),
- DEFINE_PORT(2),
- DEFINE_PORT(3),
- DEFINE_PORT(4),
- DEFINE_PORT(5),
- DEFINE_PORT(6),
- DEFINE_PORT(7),
- DEFINE_PORT(8),
- DEFINE_PORT(9),
- DEFINE_PORT(10),
- DEFINE_PORT(11),
- DEFINE_PORT(12),
- DEFINE_PORT(13),
- DEFINE_PORT(14),
- DEFINE_PORT(15),
+ QEMU_REPEAT(TZ_NUM_PORTS, DEFINE_PORT)
};
static void tz_ppc_class_init(ObjectClass *klass, const void *data)
diff --git a/hw/remote/vfio-user-obj.c b/hw/remote/vfio-user-obj.c
index 7e6819f670b5..84c3ff05cfb8 100644
--- a/hw/remote/vfio-user-obj.c
+++ b/hw/remote/vfio-user-obj.c
@@ -496,22 +496,11 @@ static size_t vfu_object_bar_rw(PCIDevice *pci_dev, int pci_bar,
buf, count, is_write); \
} \
-VFU_OBJECT_BAR_HANDLER(0)
-VFU_OBJECT_BAR_HANDLER(1)
-VFU_OBJECT_BAR_HANDLER(2)
-VFU_OBJECT_BAR_HANDLER(3)
-VFU_OBJECT_BAR_HANDLER(4)
-VFU_OBJECT_BAR_HANDLER(5)
-VFU_OBJECT_BAR_HANDLER(6)
+QEMU_REPEAT(PCI_NUM_REGIONS, VFU_OBJECT_BAR_HANDLER)
+#define VFU_OBJECT_BAR_HANDLER_PTR(BAR_NO) vfu_object_bar##BAR_NO##_handler,
static vfu_region_access_cb_t *vfu_object_bar_handlers[PCI_NUM_REGIONS] = {
- &vfu_object_bar0_handler,
- &vfu_object_bar1_handler,
- &vfu_object_bar2_handler,
- &vfu_object_bar3_handler,
- &vfu_object_bar4_handler,
- &vfu_object_bar5_handler,
- &vfu_object_bar6_handler,
+ QEMU_REPEAT(PCI_NUM_REGIONS, VFU_OBJECT_BAR_HANDLER_PTR)
};
/**
diff --git a/include/hw/cxl/cxl_component.h b/include/hw/cxl/cxl_component.h
index ffc82202206c..fca8b7055ccd 100644
--- a/include/hw/cxl/cxl_component.h
+++ b/include/hw/cxl/cxl_component.h
@@ -186,10 +186,7 @@ REG32(CXL_HDM_DECODER_GLOBAL_CONTROL, CXL_HDM_REGISTERS_OFFSET + 4)
/* Support 4 decoders at all levels of topology */
#define CXL_HDM_DECODER_COUNT 4
-HDM_DECODER_INIT(0);
-HDM_DECODER_INIT(1);
-HDM_DECODER_INIT(2);
-HDM_DECODER_INIT(3);
+QEMU_REPEAT(CXL_HDM_DECODER_COUNT, HDM_DECODER_INIT)
/*
* CXL r3.1 Section 8.2.4.21: CXL Extended Security Capability Structure
diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
index 1ec5b42230be..a5e7ff99cb89 100644
--- a/include/qemu/osdep.h
+++ b/include/qemu/osdep.h
@@ -191,6 +191,39 @@ extern "C" {
#include "qemu/typedefs.h"
+/*
+ * QEMU_REPEAT(n, m) - invoke m(0) m(1) ... m(n-1)
+ *
+ * Expands to n invocations of m, each with a literal integer argument.
+ * n must be a compile-time constant in 0..16.
+ *
+ * Example - generate 4 per-index function definitions:
+ *
+ * #define DEFINE_GETTER(i) \
+ * static int get_##i(void) { return values[i]; }
+ *
+ * QEMU_REPEAT(4, DEFINE_GETTER)
+ */
+#define QEMU_REPEAT_0(m)
+#define QEMU_REPEAT_1(m) QEMU_REPEAT_0(m) m(0)
+#define QEMU_REPEAT_2(m) QEMU_REPEAT_1(m) m(1)
+#define QEMU_REPEAT_3(m) QEMU_REPEAT_2(m) m(2)
+#define QEMU_REPEAT_4(m) QEMU_REPEAT_3(m) m(3)
+#define QEMU_REPEAT_5(m) QEMU_REPEAT_4(m) m(4)
+#define QEMU_REPEAT_6(m) QEMU_REPEAT_5(m) m(5)
+#define QEMU_REPEAT_7(m) QEMU_REPEAT_6(m) m(6)
+#define QEMU_REPEAT_8(m) QEMU_REPEAT_7(m) m(7)
+#define QEMU_REPEAT_9(m) QEMU_REPEAT_8(m) m(8)
+#define QEMU_REPEAT_10(m) QEMU_REPEAT_9(m) m(9)
+#define QEMU_REPEAT_11(m) QEMU_REPEAT_10(m) m(10)
+#define QEMU_REPEAT_12(m) QEMU_REPEAT_11(m) m(11)
+#define QEMU_REPEAT_13(m) QEMU_REPEAT_12(m) m(12)
+#define QEMU_REPEAT_14(m) QEMU_REPEAT_13(m) m(13)
+#define QEMU_REPEAT_15(m) QEMU_REPEAT_14(m) m(14)
+#define QEMU_REPEAT_16(m) QEMU_REPEAT_15(m) m(15)
+#define QEMU_REPEAT_(n, m) QEMU_REPEAT_##n(m)
+#define QEMU_REPEAT(n, m) QEMU_REPEAT_(n, m)
+
/**
* Mark a function that executes in coroutine context
*
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 50/65] hw/gpio/pca955x: convert pin/led property to QAPI-aware enum
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (48 preceding siblings ...)
2026-10-20 10:46 ` [PATCH v7 49/65] include: add QEMU_REPEAT helper macro Marc-André Lureau
@ 2026-10-20 10:46 ` Marc-André Lureau
2026-10-20 10:46 ` [PATCH v7 51/65] hw/pci: change the busnr type to uint8 Marc-André Lureau
` (14 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:46 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
Replaces the runtime-parsed visitor-based QOM property accessors with
compile-time per-pin/per-LED accessor functions using QEMU_REPEAT.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
hw/gpio/pca9552.c | 205 +++++++++++++++++++++---------------------------------
hw/gpio/pca9554.c | 136 ++++++++++++++----------------------
2 files changed, 131 insertions(+), 210 deletions(-)
diff --git a/hw/gpio/pca9552.c b/hw/gpio/pca9552.c
index 16741c22dea3..0a007bbbe4ac 100644
--- a/hw/gpio/pca9552.c
+++ b/hw/gpio/pca9552.c
@@ -25,6 +25,7 @@
#include "qapi/error.h"
#include "qapi/qapi-types-machine.h"
#include "qapi/qapi-visit-machine.h"
+#include "qapi/qapi-type-infos-machine.h"
#include "trace.h"
#include "qom/object.h"
@@ -354,33 +355,6 @@ static int pca955x_event(I2CSlave *i2c, enum i2c_event event)
return 0;
}
-static void pca955x_get_led(Object *obj, Visitor *v, const char *name,
- void *opaque, Error **errp)
-{
- PCA955xClass *k = PCA955X_GET_CLASS(obj);
- PCA955xState *s = PCA955X(obj);
- int led, rc, reg;
- Pca9552LedState state;
-
- rc = sscanf(name, "led%2d", &led);
- if (rc != 1) {
- error_setg(errp, "%s: error reading %s", __func__, name);
- return;
- }
- if (led < 0 || led >= k->pin_count) {
- error_setg(errp, "%s: invalid led %s", __func__, name);
- return;
- }
- /*
- * Get the LSx register as the qom interface should expose the device
- * state, not the modeled 'input line' behaviour which would come from
- * reading the INPUTx reg
- */
- reg = PCA9552_LS0 + led / 4;
- state = (pca955x_read(s, reg) >> ((led % 4) * 2)) & 0x3;
- visit_type_Pca9552LedState(v, name, &state, errp);
-}
-
/*
* Return an LED selector register value based on an existing one, with
* the appropriate 2-bit state value set for the given LED number (0-3).
@@ -391,97 +365,8 @@ static inline uint8_t pca955x_ledsel(uint8_t oldval, int led_num, int state)
((state & 0x3) << (led_num << 1));
}
-static void pca955x_set_led(Object *obj, Visitor *v, const char *name,
- void *opaque, Error **errp)
-{
- PCA955xClass *k = PCA955X_GET_CLASS(obj);
- PCA955xState *s = PCA955X(obj);
- int led, rc, reg, val;
- Pca9552LedState state;
-
- if (!visit_type_Pca9552LedState(v, name, &state, errp)) {
- return;
- }
- rc = sscanf(name, "led%2d", &led);
- if (rc != 1) {
- error_setg(errp, "%s: error reading %s", __func__, name);
- return;
- }
- if (led < 0 || led >= k->pin_count) {
- error_setg(errp, "%s: invalid led %s", __func__, name);
- return;
- }
-
- reg = PCA9552_LS0 + led / 4;
- val = pca955x_read(s, reg);
- val = pca955x_ledsel(val, led % 4, state);
- pca955x_write(s, reg, val);
-}
-
static void pca955x_set_ext_state(PCA955xState *s, int pin, int level);
-static void pca955x_get_pin(Object *obj, Visitor *v, const char *name,
- void *opaque, Error **errp)
-{
- PCA955xClass *k = PCA955X_GET_CLASS(obj);
- PCA955xState *s = PCA955X(obj);
- int pin, rc;
- uint8_t input_reg;
- Pca9552PinState state;
-
- rc = sscanf(name, "pin%2d", &pin);
- if (rc != 1) {
- error_setg(errp, "%s: error reading %s", __func__, name);
- return;
- }
- if (pin < 0 || pin >= k->pin_count) {
- error_setg(errp, "%s invalid pin %s", __func__, name);
- return;
- }
-
- /*
- * Report the raw pin logic level; polarity inversion is a read-time
- * transform applied to the INPUT register, not to the pin state itself.
- */
- input_reg = PCA9535_INPUT0 + (pin / 8);
- state = (s->regs[input_reg] >> (pin % 8)) & 0x1;
- visit_type_Pca9552PinState(v, name, &state, errp);
-}
-
-static void pca955x_set_pin(Object *obj, Visitor *v, const char *name,
- void *opaque, Error **errp)
-{
- PCA955xClass *k = PCA955X_GET_CLASS(obj);
- PCA955xState *s = PCA955X(obj);
- int pin, rc;
- Pca9552PinState state;
- uint8_t config_reg;
-
- if (!visit_type_Pca9552PinState(v, name, &state, errp)) {
- return;
- }
- rc = sscanf(name, "pin%2d", &pin);
- if (rc != 1) {
- error_setg(errp, "%s: error reading %s", __func__, name);
- return;
- }
- if (pin < 0 || pin >= k->pin_count) {
- error_setg(errp, "%s invalid pin %s", __func__, name);
- return;
- }
-
- /* Only input-configured pins can be driven by an external device. */
- config_reg = PCA9535_CONFIG0 + (pin / 8);
- if (!((s->regs[config_reg] >> (pin % 8)) & 0x1)) {
- qemu_log_mask(LOG_UNIMP,
- "%s: pin %d is configured as output, ignoring set\n",
- s->description, pin);
- return;
- }
-
- pca955x_set_ext_state(s, pin, state != PCA9552_PIN_STATE_LOW);
-}
-
static const VMStateDescription pca9552_vmstate = {
.name = "PCA9552",
.version_id = 0,
@@ -536,26 +421,92 @@ static void pca9535_reset_hold(Object *obj, ResetType type)
s->len = 0;
}
+/*
+ * Get the LSx register as the qom interface should expose the device
+ * state, not the modeled 'input line' behaviour which would come from
+ * reading the INPUTx reg
+ */
+#define DEFINE_LED_ACCESSORS(n) \
+static int prop_get_led##n(Object *obj, Error **errp) \
+{ \
+ PCA955xState *s = PCA955X(obj); \
+ uint8_t reg = PCA9552_LS0 + (n) / 4; \
+ return (pca955x_read(s, reg) >> (((n) % 4) * 2)) & 0x3; \
+} \
+static void prop_set_led##n(Object *obj, int val, Error **errp) \
+{ \
+ PCA955xState *s = PCA955X(obj); \
+ uint8_t reg = PCA9552_LS0 + (n) / 4; \
+ uint8_t old = pca955x_read(s, reg); \
+ pca955x_write(s, reg, pca955x_ledsel(old, (n) % 4, val)); \
+}
+
+QEMU_REPEAT(PCA955X_PIN_COUNT_MAX, DEFINE_LED_ACCESSORS)
+
+#define LED_ENUM_PROP(n) { \
+ .name = "led" #n, \
+ .default_value = -1, \
+ .qapi_type = &Pca9552LedState_type_info, \
+ .get = prop_get_led##n, \
+ .set = prop_set_led##n, \
+},
+
+static const QapiEnumProp led_enum_props[] = {
+ QEMU_REPEAT(PCA955X_PIN_COUNT_MAX, LED_ENUM_PROP)
+};
+
+/*
+ * Report the raw pin logic level; polarity inversion is a read-time
+ * transform applied to the INPUT register, not to the pin state
+ * itself.
+ */
+#define DEFINE_PIN_ACCESSORS(n) \
+static int prop_get_pin##n(Object *obj, Error **errp) \
+{ \
+ PCA955xState *s = PCA955X(obj); \
+ uint8_t input_reg = PCA9535_INPUT0 + (n) / 8; \
+ return (s->regs[input_reg] >> ((n) % 8)) & 0x1; \
+} \
+static void prop_set_pin##n(Object *obj, int val, Error **errp) \
+{ \
+ PCA955xState *s = PCA955X(obj); \
+ uint8_t config_reg = PCA9535_CONFIG0 + (n) / 8; \
+ /* Only input-configured pins can be driven by an external device */ \
+ if (!((s->regs[config_reg] >> ((n) % 8)) & 0x1)) { \
+ qemu_log_mask(LOG_UNIMP, \
+ "%s: pin %d configured as output, ignoring set\n", \
+ s->description, (n)); \
+ return; \
+ } \
+ pca955x_set_ext_state(s, (n), val != PCA9552_PIN_STATE_LOW); \
+}
+
+QEMU_REPEAT(PCA955X_PIN_COUNT_MAX, DEFINE_PIN_ACCESSORS)
+
+#define PIN_ENUM_PROP(n) { \
+ .name = "pin" #n, \
+ .default_value = -1, \
+ .qapi_type = &Pca9552PinState_type_info, \
+ .get = prop_get_pin##n, \
+ .set = prop_set_pin##n, \
+},
+
+static const QapiEnumProp pin_enum_props[] = {
+ QEMU_REPEAT(PCA955X_PIN_COUNT_MAX, PIN_ENUM_PROP)
+};
+
static void pca955x_initfn(Object *obj)
{
PCA955xClass *k = PCA955X_GET_CLASS(obj);
assert(k->pin_count <= PCA955X_PIN_COUNT_MAX);
+ /* TODO: use array/list instead of individual QAPI enum properties */
for (int ix = 0; ix < k->pin_count; ix++) {
- char *name;
-
if (k->has_led_support) {
- /* LED variant: expose the LED selector state as led%d. */
- name = g_strdup_printf("led%d", ix);
- object_property_add(obj, name, "Pca9552LedState",
- pca955x_get_led, pca955x_set_led, NULL, NULL);
+ object_property_add_qapi_enum(obj, &led_enum_props[ix]);
} else {
- /* GPIO variant: expose the pin logic level as pin%d. */
- name = g_strdup_printf("pin%d", ix);
- object_property_add(obj, name, "Pca9552PinState",
- pca955x_get_pin, pca955x_set_pin, NULL, NULL);
+ object_property_add_qapi_enum(obj, &pin_enum_props[ix]);
}
- g_free(name);
}
}
diff --git a/hw/gpio/pca9554.c b/hw/gpio/pca9554.c
index e4eddc829ef7..f2a5b94a36d8 100644
--- a/hw/gpio/pca9554.c
+++ b/hw/gpio/pca9554.c
@@ -18,7 +18,7 @@
#include "qapi/error.h"
#include "qapi/qapi-types-machine.h"
#include "qapi/qapi-visit-machine.h"
-#include "qapi/visitor.h"
+#include "qapi/qapi-type-infos-machine.h"
#include "trace.h"
#include "qom/object.h"
@@ -151,83 +151,60 @@ static void pca9554_set_ext_state(PCA9554State *s, int pin, int level)
}
}
-static void pca9554_get_pin(Object *obj, Visitor *v, const char *name,
- void *opaque, Error **errp)
-{
- PCA9554State *s = PCA9554(obj);
- int pin, rc;
- Pca9554PinState state;
-
- rc = sscanf(name, "pin%2d", &pin);
- if (rc != 1) {
- error_setg(errp, "%s: error reading %s", __func__, name);
- return;
- }
- if (pin < 0 || pin >= PCA9554_GET_CLASS(s)->pin_count) {
- error_setg(errp, "%s invalid pin %s", __func__, name);
- return;
- }
-
- /*
- * Report the physical pin level. The input register is kept in sync by
- * pca9554_update_pin_input(): output pins mirror the OUTPUT register and
- * input pins reflect the externally driven (or pulled-up) level, so it
- * holds the wire level regardless of the configured direction.
- */
- state = (s->regs[PCA9554_INPUT] >> pin) & 0x1;
- visit_type_Pca9554PinState(v, name, &state, errp);
+/*
+ * Report the physical pin level. The input register is kept in sync
+ * by pca9554_update_pin_input(): output pins mirror the OUTPUT
+ * register and input pins reflect the externally driven (or
+ * pulled-up) level, so it holds the wire level regardless of the
+ * configured direction.
+ */
+#define DEFINE_PIN_ACCESSORS(n) \
+static int prop_get_pin##n(Object *obj, Error **errp) \
+{ \
+ PCA9554State *s = PCA9554(obj); \
+ return (s->regs[PCA9554_INPUT] >> (n)) & 0x1; \
+} \
+static void prop_set_pin##n(Object *obj, int val, Error **errp) \
+{ \
+ PCA9554State *s = PCA9554(obj); \
+ if (s->hw_dir) { \
+ if (!((s->regs[PCA9554_CONFIG] >> (n)) & 0x1)) { \
+ qemu_log_mask(LOG_UNIMP, \
+ "%s: pin %d configured as output," \
+ " ignoring set\n", \
+ s->description, (n)); \
+ return; \
+ } \
+ pca9554_set_ext_state(s, (n), val != PCA9554_PIN_STATE_LOW); \
+ } else { \
+ /* Legacy behavior: force output mode and drive */ \
+ uint8_t mask = 0x1 << (n); \
+ int v = pca9554_read(s, PCA9554_OUTPUT); \
+ if (val == PCA9554_PIN_STATE_LOW) { \
+ v &= ~mask; \
+ } else { \
+ v |= mask; \
+ } \
+ pca9554_write(s, PCA9554_OUTPUT, v); \
+ v = pca9554_read(s, PCA9554_CONFIG); \
+ v &= ~mask; \
+ pca9554_write(s, PCA9554_CONFIG, v); \
+ } \
}
-static void pca9554_set_pin(Object *obj, Visitor *v, const char *name,
- void *opaque, Error **errp)
-{
- PCA9554State *s = PCA9554(obj);
- int pin, rc, val;
- uint8_t mask;
- Pca9554PinState state;
+QEMU_REPEAT(PCA9554_PIN_COUNT, DEFINE_PIN_ACCESSORS)
- if (!visit_type_Pca9554PinState(v, name, &state, errp)) {
- return;
- }
- rc = sscanf(name, "pin%2d", &pin);
- if (rc != 1) {
- error_setg(errp, "%s: error reading %s", __func__, name);
- return;
- }
- if (pin < 0 || pin >= PCA9554_GET_CLASS(s)->pin_count) {
- error_setg(errp, "%s invalid pin %s", __func__, name);
- return;
- }
+#define PIN_ENUM_PROP(n) { \
+ .name = "pin" #n, \
+ .default_value = -1, \
+ .qapi_type = &Pca9554PinState_type_info, \
+ .get = prop_get_pin##n, \
+ .set = prop_set_pin##n, \
+},
- if (s->hw_dir) {
- /* Warn and ignore if the guest has configured this pin as output */
- if (!((s->regs[PCA9554_CONFIG] >> pin) & 0x1)) {
- qemu_log_mask(LOG_UNIMP,
- "%s: pin %d is configured as output, "
- "ignoring external set\n",
- s->description, pin);
- return;
- }
- /* Drive the external input level */
- pca9554_set_ext_state(s, pin, state != PCA9554_PIN_STATE_LOW);
- } else {
- /* Legacy behavior: force output mode and drive */
- /* First, modify the output register bit */
- val = pca9554_read(s, PCA9554_OUTPUT);
- mask = 0x1 << pin;
- if (state == PCA9554_PIN_STATE_LOW) {
- val &= ~(mask);
- } else {
- val |= mask;
- }
- pca9554_write(s, PCA9554_OUTPUT, val);
-
- /* Then, clear the config register bit for output mode */
- val = pca9554_read(s, PCA9554_CONFIG);
- val &= ~mask;
- pca9554_write(s, PCA9554_CONFIG, val);
- }
-}
+static const QapiEnumProp pin_enum_props[] = {
+ QEMU_REPEAT(PCA9554_PIN_COUNT, PIN_ENUM_PROP)
+};
static const VMStateDescription pca9554_vmstate = {
.name = "PCA9554",
@@ -264,16 +241,9 @@ static void pca9554_reset(DeviceState *dev)
static void pca9554_initfn(Object *obj)
{
PCA9554Class *pc = PCA9554_GET_CLASS(obj);
- int pin;
- for (pin = 0; pin < pc->pin_count; pin++) {
- char *name;
-
- name = g_strdup_printf("pin%d", pin);
- object_property_add(obj, name, "Pca9554PinState",
- pca9554_get_pin, pca9554_set_pin,
- NULL, NULL);
- g_free(name);
+ for (int pin = 0; pin < pc->pin_count; pin++) {
+ object_property_add_qapi_enum(obj, &pin_enum_props[pin]);
}
}
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 51/65] hw/pci: change the busnr type to uint8
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (49 preceding siblings ...)
2026-10-20 10:46 ` [PATCH v7 50/65] hw/gpio/pca955x: convert pin/led property to QAPI-aware enum Marc-André Lureau
@ 2026-10-20 10:46 ` Marc-André Lureau
2026-10-20 10:46 ` [PATCH v7 52/65] qdev: add qapi_type field to PropertyInfo with fallback registration Marc-André Lureau
` (13 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:46 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
It is effectively a u8. The next changes are going to use the
uint8_type_info for it.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
hw/pci/pci.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 0efb4eb4bb03..6edc702776ab 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -80,7 +80,7 @@ static void prop_pci_busnr_get(Object *obj, Visitor *v, const char *name,
}
static const PropertyInfo prop_pci_busnr = {
- .type = "busnr",
+ .type = "uint8",
.get = prop_pci_busnr_get,
};
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 52/65] qdev: add qapi_type field to PropertyInfo with fallback registration
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (50 preceding siblings ...)
2026-10-20 10:46 ` [PATCH v7 51/65] hw/pci: change the busnr type to uint8 Marc-André Lureau
@ 2026-10-20 10:46 ` Marc-André Lureau
2026-10-20 10:46 ` [PATCH v7 53/65] qdev: convert core PropertyInfo definitions to use qapi_type Marc-André Lureau
` (12 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:46 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
Add a qapi_type field to PropertyInfo to prepare for the transition
from string-based type metadata to QAPI type-info.
Add a qdev_prop_qapi_type() helper that resolves the QAPI type for a
property from .qapi_type. It will be later extended to cope with array
types.
Update qdev_property_add_static() and qdev_class_add_property() to
prefer object_property_add_qapi() when a QAPI type is available, falling
back to the old object_property_add() for unconverted properties.
Update the shared enum accessor functions to prefer .qapi_type->lookup
over .enum_table via a new qdev_propinfo_enum_lookup() helper.
No PropertyInfo definitions are changed, all .qapi_type fields
default to NULL, so the fallback paths are always taken. This patch
is no-op for now.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
hw/core/qdev-properties.c | 68 ++++++++++++++++++++++++++++++---------
include/hw/core/qdev-properties.h | 1 +
2 files changed, 53 insertions(+), 16 deletions(-)
diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index 34d7b26a7303..ee50fbb9f570 100644
--- a/hw/core/qdev-properties.c
+++ b/hw/core/qdev-properties.c
@@ -99,13 +99,22 @@ static ObjectPropertyAccessor *field_prop_setter(const PropertyInfo *info)
return info->set ? field_prop_set : NULL;
}
+static const QEnumLookup *qdev_propinfo_enum_lookup(const PropertyInfo *info)
+{
+ if (info->qapi_type) {
+ assert(info->qapi_type->lookup);
+ return info->qapi_type->lookup;
+ }
+ return info->enum_table;
+}
+
void qdev_propinfo_get_enum(Object *obj, Visitor *v, const char *name,
void *opaque, Error **errp)
{
const Property *prop = opaque;
int *ptr = object_field_prop_ptr(obj, prop);
- visit_type_enum(v, name, ptr, prop->info->enum_table, errp);
+ visit_type_enum(v, name, ptr, qdev_propinfo_enum_lookup(prop->info), errp);
}
void qdev_propinfo_set_enum(Object *obj, Visitor *v, const char *name,
@@ -114,14 +123,15 @@ void qdev_propinfo_set_enum(Object *obj, Visitor *v, const char *name,
const Property *prop = opaque;
int *ptr = object_field_prop_ptr(obj, prop);
- visit_type_enum(v, name, ptr, prop->info->enum_table, errp);
+ visit_type_enum(v, name, ptr, qdev_propinfo_enum_lookup(prop->info), errp);
}
void qdev_propinfo_set_default_value_enum(ObjectProperty *op,
const Property *prop)
{
object_property_set_default_str(op,
- qapi_enum_lookup(prop->info->enum_table, prop->defval.i));
+ qapi_enum_lookup(qdev_propinfo_enum_lookup(prop->info),
+ prop->defval.i));
}
/* Bit */
@@ -941,8 +951,8 @@ void qdev_prop_set_enum(DeviceState *dev, const char *name, int value)
prop = qdev_prop_find(dev, name);
object_property_set_str(OBJECT(dev), name,
- qapi_enum_lookup(prop->info->enum_table, value),
- &error_abort);
+ qapi_enum_lookup(qdev_propinfo_enum_lookup(prop->info), value),
+ &error_abort);
}
void qdev_prop_set_array(DeviceState *dev, const char *name, QList *values)
@@ -1143,18 +1153,33 @@ const PropertyInfo qdev_prop_link = {
.set = set_link,
};
+static const QAPITypeInfo *qdev_prop_qapi_type(const Property *prop)
+{
+ /* this will be later extended to cope with QAPI array properties */
+ return prop->info->qapi_type;
+}
+
void qdev_property_add_static(DeviceState *dev, const Property *prop)
{
Object *obj = OBJECT(dev);
ObjectProperty *op;
+ const QAPITypeInfo *qapi_type = qdev_prop_qapi_type(prop);
assert(!prop->info->create);
- op = object_property_add(obj, prop->name, prop->info->type,
- field_prop_getter(prop->info),
- field_prop_setter(prop->info),
- prop->info->release,
- (Property *)prop);
+ if (qapi_type) {
+ op = object_property_add_qapi(obj, prop->name, qapi_type,
+ field_prop_getter(prop->info),
+ field_prop_setter(prop->info),
+ prop->info->release,
+ (Property *)prop);
+ } else {
+ op = object_property_add(obj, prop->name, prop->info->type,
+ field_prop_getter(prop->info),
+ field_prop_setter(prop->info),
+ prop->info->release,
+ (Property *)prop);
+ }
object_property_set_description(obj, prop->name,
prop->info->description);
@@ -1176,12 +1201,23 @@ static void qdev_class_add_property(DeviceClass *klass, const char *name,
if (prop->info->create) {
op = prop->info->create(oc, name, prop);
} else {
- op = object_class_property_add(oc,
- name, prop->info->type,
- field_prop_getter(prop->info),
- field_prop_setter(prop->info),
- prop->info->release,
- (Property *)prop);
+ const QAPITypeInfo *qapi_type = qdev_prop_qapi_type(prop);
+
+ if (qapi_type) {
+ op = object_class_property_add_qapi(oc,
+ name, qapi_type,
+ field_prop_getter(prop->info),
+ field_prop_setter(prop->info),
+ prop->info->release,
+ (Property *)prop);
+ } else {
+ op = object_class_property_add(oc,
+ name, prop->info->type,
+ field_prop_getter(prop->info),
+ field_prop_setter(prop->info),
+ prop->info->release,
+ (Property *)prop);
+ }
}
if (prop->set_default) {
prop->info->set_default_value(op, prop);
diff --git a/include/hw/core/qdev-properties.h b/include/hw/core/qdev-properties.h
index eba5436e53b1..1ea2ba66bb37 100644
--- a/include/hw/core/qdev-properties.h
+++ b/include/hw/core/qdev-properties.h
@@ -34,6 +34,7 @@ struct PropertyInfo {
const char *type;
const char *description;
const QEnumLookup *enum_table;
+ const QAPITypeInfo *qapi_type;
bool realized_set_allowed; /* allow setting property on realized device */
char *(*print)(Object *obj, const Property *prop);
void (*set_default_value)(ObjectProperty *op, const Property *prop);
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 53/65] qdev: convert core PropertyInfo definitions to use qapi_type
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (51 preceding siblings ...)
2026-10-20 10:46 ` [PATCH v7 52/65] qdev: add qapi_type field to PropertyInfo with fallback registration Marc-André Lureau
@ 2026-10-20 10:46 ` Marc-André Lureau
2026-10-20 10:46 ` [PATCH v7 54/65] qdev: adjust PciDevfn declared type Marc-André Lureau
` (11 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:46 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
Replace .type string with .qapi_type pointer on all core PropertyInfo
definitions in qdev-properties.c. Remove .enum_table from enum
definitions, since the lookup is now accessed through .qapi_type->lookup
via the qdev_propinfo_enum_lookup() fallback helper.
Note that qdev_prop_usize now reports "uint32" or "uint64" depending on
the host. If usize is worth preserving, it should be added as a QAPI
builtin type. Or perhaps we should simply use "size" everywhere (u64)?
It's also strange to use type "size" for both u32 (prop_size32) and u64
(prop_size).
Link property are actually strings. The "full type name" is set when
the property is added, as "link<TYPE>".
Array property will be refactored in a subsequent patch.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
hw/core/qdev-properties.c | 42 +++++++++++++++++++++++-------------------
1 file changed, 23 insertions(+), 19 deletions(-)
diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index ee50fbb9f570..abdb380cb9ec 100644
--- a/hw/core/qdev-properties.c
+++ b/hw/core/qdev-properties.c
@@ -12,6 +12,8 @@
#include "qdev-prop-internal.h"
#include "qom/compat-properties.h"
#include "qom/qom-qobject.h"
+#include "qapi/qapi-builtin-type-infos.h"
+#include "qapi/qapi-type-infos-common.h"
void qdev_prop_set_after_realize(DeviceState *dev, const char *name,
Error **errp)
@@ -181,7 +183,7 @@ static void set_default_value_bool(ObjectProperty *op, const Property *prop)
}
const PropertyInfo qdev_prop_bit = {
- .type = "bool",
+ .qapi_type = &bool_type_info,
.description = "on/off",
.get = prop_get_bit,
.set = prop_set_bit,
@@ -231,7 +233,7 @@ static void prop_set_bit64(Object *obj, Visitor *v, const char *name,
}
const PropertyInfo qdev_prop_bit64 = {
- .type = "bool",
+ .qapi_type = &bool_type_info,
.description = "on/off",
.get = prop_get_bit64,
.set = prop_set_bit64,
@@ -293,9 +295,8 @@ static void prop_set_on_off_auto_bit64(Object *obj, Visitor *v,
}
const PropertyInfo qdev_prop_on_off_auto_bit64 = {
- .type = "OnOffAuto",
+ .qapi_type = &OnOffAuto_type_info,
.description = "on/off/auto",
- .enum_table = &OnOffAuto_lookup,
.get = prop_get_on_off_auto_bit64,
.set = prop_set_on_off_auto_bit64,
.set_default_value = qdev_propinfo_set_default_value_enum,
@@ -322,7 +323,7 @@ static void set_bool(Object *obj, Visitor *v, const char *name, void *opaque,
}
const PropertyInfo qdev_prop_bool = {
- .type = "bool",
+ .qapi_type = &bool_type_info,
.description = "on/off",
.get = get_bool,
.set = set_bool,
@@ -362,7 +363,7 @@ void qdev_propinfo_set_default_value_uint(ObjectProperty *op,
}
const PropertyInfo qdev_prop_uint8 = {
- .type = "uint8",
+ .qapi_type = &uint8_type_info,
.get = get_uint8,
.set = set_uint8,
.set_default_value = qdev_propinfo_set_default_value_uint,
@@ -389,7 +390,7 @@ static void set_uint16(Object *obj, Visitor *v, const char *name,
}
const PropertyInfo qdev_prop_uint16 = {
- .type = "uint16",
+ .qapi_type = &uint16_type_info,
.get = get_uint16,
.set = set_uint16,
.set_default_value = qdev_propinfo_set_default_value_uint,
@@ -434,14 +435,14 @@ static void set_int32(Object *obj, Visitor *v, const char *name, void *opaque,
}
const PropertyInfo qdev_prop_uint32 = {
- .type = "uint32",
+ .qapi_type = &uint32_type_info,
.get = get_uint32,
.set = set_uint32,
.set_default_value = qdev_propinfo_set_default_value_uint,
};
const PropertyInfo qdev_prop_int32 = {
- .type = "int32",
+ .qapi_type = &int32_type_info,
.get = qdev_propinfo_get_int32,
.set = set_int32,
.set_default_value = qdev_propinfo_set_default_value_int,
@@ -486,14 +487,14 @@ static void set_int64(Object *obj, Visitor *v, const char *name,
}
const PropertyInfo qdev_prop_uint64 = {
- .type = "uint64",
+ .qapi_type = &uint64_type_info,
.get = get_uint64,
.set = set_uint64,
.set_default_value = qdev_propinfo_set_default_value_uint,
};
const PropertyInfo qdev_prop_int64 = {
- .type = "int64",
+ .qapi_type = &int64_type_info,
.get = get_int64,
.set = set_int64,
.set_default_value = qdev_propinfo_set_default_value_int,
@@ -515,7 +516,7 @@ static void set_uint64_checkmask(Object *obj, Visitor *v, const char *name,
}
const PropertyInfo qdev_prop_uint64_checkmask = {
- .type = "uint64",
+ .qapi_type = &uint64_type_info,
.get = get_uint64,
.set = set_uint64_checkmask,
};
@@ -551,7 +552,11 @@ static void set_usize(Object *obj, Visitor *v, const char *name, void *opaque,
}
const PropertyInfo qdev_prop_usize = {
- .type = "usize",
+#if HOST_LONG_BITS == 32
+ .qapi_type = &uint32_type_info,
+#else
+ .qapi_type = &uint64_type_info,
+#endif
.get = get_usize,
.set = set_usize,
.set_default_value = qdev_propinfo_set_default_value_uint,
@@ -595,7 +600,7 @@ static void set_string(Object *obj, Visitor *v, const char *name,
}
const PropertyInfo qdev_prop_string = {
- .type = "str",
+ .qapi_type = &str_type_info,
.release = release_string,
.get = get_string,
.set = set_string,
@@ -604,9 +609,8 @@ const PropertyInfo qdev_prop_string = {
/* --- on/off/auto --- */
const PropertyInfo qdev_prop_on_off_auto = {
- .type = "OnOffAuto",
+ .qapi_type = &OnOffAuto_type_info,
.description = "on/off/auto",
- .enum_table = &OnOffAuto_lookup,
.get = qdev_propinfo_get_enum,
.set = qdev_propinfo_set_enum,
.set_default_value = qdev_propinfo_set_default_value_enum,
@@ -647,7 +651,7 @@ static void set_size32(Object *obj, Visitor *v, const char *name, void *opaque,
}
const PropertyInfo qdev_prop_size32 = {
- .type = "size",
+ .qapi_type = &size_type_info,
.get = qdev_propinfo_get_size32,
.set = set_size32,
.set_default_value = qdev_propinfo_set_default_value_uint,
@@ -1060,7 +1064,7 @@ static void set_size(Object *obj, Visitor *v, const char *name, void *opaque,
}
const PropertyInfo qdev_prop_size = {
- .type = "size",
+ .qapi_type = &size_type_info,
.get = get_size,
.set = set_size,
.set_default_value = qdev_propinfo_set_default_value_uint,
@@ -1142,7 +1146,7 @@ static void set_link(Object *obj, Visitor *v, const char *name, void *opaque,
}
const PropertyInfo qdev_prop_link = {
- .type = "link",
+ .qapi_type = &str_type_info,
.create = create_link_property,
/*
* Since we have a create method, the get and set are used
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 54/65] qdev: adjust PciDevfn declared type
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (52 preceding siblings ...)
2026-10-20 10:46 ` [PATCH v7 53/65] qdev: convert core PropertyInfo definitions to use qapi_type Marc-André Lureau
@ 2026-10-20 10:46 ` Marc-André Lureau
2026-10-20 10:46 ` [PATCH v7 55/65] qdev: convert system PropertyInfo definitions to use qapi_type Marc-André Lureau
` (10 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:46 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
PciDevfn is a bit special, since it accepts integer and string as
setter, but only output integer as getter.
Unfortunately, we can't declare an alternate str|int QAPI type for it,
since: branch 'string' can't be distinguished from 'integer'
Rather than declaring it as "str", use the common type instead.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
hw/core/qdev-properties-system.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c
index 5bfdfe1ab9d9..3381de1144d6 100644
--- a/hw/core/qdev-properties-system.c
+++ b/hw/core/qdev-properties-system.c
@@ -904,7 +904,8 @@ static char *print_pci_devfn(Object *obj, const Property *prop)
}
const PropertyInfo qdev_prop_pci_devfn = {
- .type = "str",
+ /* The formatted string accepted by the setter is a CLI convenience. */
+ .type = "int32",
.description = "Slot and optional function number, example: 06.0 or 06",
.print = print_pci_devfn,
.get = qdev_propinfo_get_int32,
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 55/65] qdev: convert system PropertyInfo definitions to use qapi_type
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (53 preceding siblings ...)
2026-10-20 10:46 ` [PATCH v7 54/65] qdev: adjust PciDevfn declared type Marc-André Lureau
@ 2026-10-20 10:46 ` Marc-André Lureau
2026-10-20 10:46 ` [PATCH v7 56/65] hw: convert device-local " Marc-André Lureau
` (9 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:46 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
Replace .type string and .enum_table pointer with .qapi_type in all
PropertyInfo definitions in qdev-properties-system.c
Update file-private enum accessor functions to use .qapi_type->lookup
instead of .enum_table.
Note, this should be a faithful conversion, but it would be worth to
consider better types than just "str" for references (block node names,
chardev/netdev IDs, MAC addrs, etc)
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
hw/core/qdev-prop-internal.h | 2 +
hw/core/qdev-properties-system.c | 93 +++++++++++++++++-----------------------
hw/core/qdev-properties.c | 2 +-
3 files changed, 43 insertions(+), 54 deletions(-)
diff --git a/hw/core/qdev-prop-internal.h b/hw/core/qdev-prop-internal.h
index d7b77844fe0b..c190b7b88cf4 100644
--- a/hw/core/qdev-prop-internal.h
+++ b/hw/core/qdev-prop-internal.h
@@ -8,6 +8,8 @@
#ifndef HW_CORE_QDEV_PROP_INTERNAL_H
#define HW_CORE_QDEV_PROP_INTERNAL_H
+const QEnumLookup *qdev_propinfo_enum_lookup(const PropertyInfo *info);
+
void qdev_propinfo_get_enum(Object *obj, Visitor *v, const char *name,
void *opaque, Error **errp);
void qdev_propinfo_set_enum(Object *obj, Visitor *v, const char *name,
diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c
index 3381de1144d6..8819a9a0b748 100644
--- a/hw/core/qdev-properties-system.c
+++ b/hw/core/qdev-properties-system.c
@@ -27,6 +27,7 @@
#include "qemu/uuid.h"
#include "qemu/error-report.h"
#include "qdev-prop-internal.h"
+#include "qapi/qapi-type-infos.h"
#include "qemu/audio.h"
#include "chardev/char-fe.h"
@@ -238,7 +239,7 @@ static void release_drive(Object *obj, const char *name, void *opaque)
}
const PropertyInfo qdev_prop_drive = {
- .type = "str",
+ .qapi_type = &str_type_info,
.description = "Node name or ID of a block device to use as a backend",
.realized_set_allowed = true,
.get = get_drive,
@@ -247,7 +248,7 @@ const PropertyInfo qdev_prop_drive = {
};
const PropertyInfo qdev_prop_drive_iothread = {
- .type = "str",
+ .qapi_type = &str_type_info,
.description = "Node name or ID of a block device to use as a backend",
.realized_set_allowed = true,
.get = get_drive,
@@ -315,7 +316,7 @@ static void release_chr(Object *obj, const char *name, void *opaque)
}
const PropertyInfo qdev_prop_chr = {
- .type = "str",
+ .qapi_type = &str_type_info,
.description = "ID of a chardev to use as a backend",
.get = get_chr,
.set = set_chr,
@@ -389,7 +390,7 @@ inval:
}
const PropertyInfo qdev_prop_macaddr = {
- .type = "str",
+ .qapi_type = &str_type_info,
.description = "Ethernet 6-byte MAC Address, example: 52:54:00:12:34:56",
.get = get_mac,
.set = set_mac,
@@ -477,7 +478,7 @@ out:
}
const PropertyInfo qdev_prop_netdev = {
- .type = "str",
+ .qapi_type = &str_type_info,
.description = "ID of a netdev to use as a backend",
.get = get_netdev,
.set = set_netdev,
@@ -514,7 +515,7 @@ static void set_audiodev(Object *obj, Visitor *v, const char* name,
}
const PropertyInfo qdev_prop_audiodev = {
- .type = "str",
+ .qapi_type = &str_type_info,
.description = "ID of an audiodev to use as a backend",
/* release done on shutdown */
.get = get_audiodev,
@@ -584,7 +585,8 @@ static void qdev_propinfo_set_losttickpolicy(Object *obj, Visitor *v,
int *ptr = object_field_prop_ptr(obj, prop);
int value;
- if (!visit_type_enum(v, name, &value, prop->info->enum_table, errp)) {
+ if (!visit_type_enum(v, name, &value,
+ qdev_propinfo_enum_lookup(prop->info), errp)) {
return;
}
@@ -604,9 +606,8 @@ static void qdev_propinfo_set_losttickpolicy(Object *obj, Visitor *v,
QEMU_BUILD_BUG_ON(sizeof(LostTickPolicy) != sizeof(int));
const PropertyInfo qdev_prop_losttickpolicy = {
- .type = "LostTickPolicy",
+ .qapi_type = &LostTickPolicy_type_info,
.description = "Policy for handling lost ticks (discard/delay/slew)",
- .enum_table = &LostTickPolicy_lookup,
.get = qdev_propinfo_get_enum,
.set = qdev_propinfo_set_losttickpolicy,
.set_default_value = qdev_propinfo_set_default_value_enum,
@@ -631,7 +632,7 @@ static void set_blocksize(Object *obj, Visitor *v, const char *name,
}
const PropertyInfo qdev_prop_blocksize = {
- .type = "size",
+ .qapi_type = &size_type_info,
.description = "A power of two between " MIN_BLOCK_SIZE_STR
" and " MAX_BLOCK_SIZE_STR,
.get = qdev_propinfo_get_size32,
@@ -644,9 +645,8 @@ const PropertyInfo qdev_prop_blocksize = {
QEMU_BUILD_BUG_ON(sizeof(BlockdevOnError) != sizeof(int));
const PropertyInfo qdev_prop_blockdev_on_error = {
- .type = "BlockdevOnError",
+ .qapi_type = &BlockdevOnError_type_info,
.description = "Error handling policy (report/ignore/enospc/stop/auto)",
- .enum_table = &BlockdevOnError_lookup,
.get = qdev_propinfo_get_enum,
.set = qdev_propinfo_set_enum,
.set_default_value = qdev_propinfo_set_default_value_enum,
@@ -657,10 +657,9 @@ const PropertyInfo qdev_prop_blockdev_on_error = {
QEMU_BUILD_BUG_ON(sizeof(BiosAtaTranslation) != sizeof(int));
const PropertyInfo qdev_prop_bios_chs_trans = {
- .type = "BiosAtaTranslation",
+ .qapi_type = &BiosAtaTranslation_type_info,
.description = "Logical CHS translation algorithm "
" (auto/none/lba/large/rechs)",
- .enum_table = &BiosAtaTranslation_lookup,
.get = qdev_propinfo_get_enum,
.set = qdev_propinfo_set_enum,
.set_default_value = qdev_propinfo_set_default_value_enum,
@@ -669,9 +668,8 @@ const PropertyInfo qdev_prop_bios_chs_trans = {
/* --- FDC default drive types */
const PropertyInfo qdev_prop_fdc_drive_type = {
- .type = "FloppyDriveType",
+ .qapi_type = &FloppyDriveType_type_info,
.description = "Floppy drive type (144/288/120/none/auto)",
- .enum_table = &FloppyDriveType_lookup,
.get = qdev_propinfo_get_enum,
.set = qdev_propinfo_set_enum,
.set_default_value = qdev_propinfo_set_default_value_enum,
@@ -680,10 +678,9 @@ const PropertyInfo qdev_prop_fdc_drive_type = {
/* --- MultiFDCompression --- */
const PropertyInfo qdev_prop_multifd_compression = {
- .type = "MultiFDCompression",
+ .qapi_type = &MultiFDCompression_type_info,
.description = "multifd compression method"
" (none/zlib/zstd/qpl/uadk/qatzip)",
- .enum_table = &MultiFDCompression_lookup,
.get = qdev_propinfo_get_enum,
.set = qdev_propinfo_set_enum,
.set_default_value = qdev_propinfo_set_default_value_enum,
@@ -694,9 +691,8 @@ const PropertyInfo qdev_prop_multifd_compression = {
QEMU_BUILD_BUG_ON(sizeof(MigMode) != sizeof(int));
const PropertyInfo qdev_prop_mig_mode = {
- .type = "MigMode",
+ .qapi_type = &MigMode_type_info,
.description = "Migration mode (normal/cpr-reboot)",
- .enum_table = &MigMode_lookup,
.get = qdev_propinfo_get_enum,
.set = qdev_propinfo_set_enum,
.set_default_value = qdev_propinfo_set_default_value_enum,
@@ -707,18 +703,16 @@ const PropertyInfo qdev_prop_mig_mode = {
QEMU_BUILD_BUG_ON(sizeof(GranuleMode) != sizeof(int));
const PropertyInfo qdev_prop_granule_mode = {
- .type = "GranuleMode",
+ .qapi_type = &GranuleMode_type_info,
.description = "Granule page size (4k/8k/16k/64k/host)",
- .enum_table = &GranuleMode_lookup,
.get = qdev_propinfo_get_enum,
.set = qdev_propinfo_set_enum,
.set_default_value = qdev_propinfo_set_default_value_enum,
};
const PropertyInfo qdev_prop_zero_page_detection = {
- .type = "ZeroPageDetection",
+ .qapi_type = &ZeroPageDetection_type_info,
.description = "Zero page detection (none/legacy/multifd)",
- .enum_table = &ZeroPageDetection_lookup,
.get = qdev_propinfo_get_enum,
.set = qdev_propinfo_set_enum,
.set_default_value = qdev_propinfo_set_default_value_enum,
@@ -729,9 +723,8 @@ const PropertyInfo qdev_prop_zero_page_detection = {
QEMU_BUILD_BUG_ON(sizeof(SsidSizeMode) != sizeof(int));
const PropertyInfo qdev_prop_ssidsize_mode = {
- .type = "SsidSizeMode",
+ .qapi_type = &SsidSizeMode_type_info,
.description = "ssidsize mode: auto, 0-20",
- .enum_table = &SsidSizeMode_lookup,
.get = qdev_propinfo_get_enum,
.set = qdev_propinfo_set_enum,
.set_default_value = qdev_propinfo_set_default_value_enum,
@@ -742,9 +735,8 @@ const PropertyInfo qdev_prop_ssidsize_mode = {
QEMU_BUILD_BUG_ON(sizeof(OasMode) != sizeof(int));
const PropertyInfo qdev_prop_oas_mode = {
- .type = "OasMode",
+ .qapi_type = &OasMode_type_info,
.description = "oas mode: auto, 32, 36, 40, 42, 44, 48, 52, 56",
- .enum_table = &OasMode_lookup,
.get = qdev_propinfo_get_enum,
.set = qdev_propinfo_set_enum,
.set_default_value = qdev_propinfo_set_default_value_enum,
@@ -824,7 +816,7 @@ out:
}
const PropertyInfo qdev_prop_reserved_region = {
- .type = "str",
+ .qapi_type = &str_type_info,
.description = "Reserved Region, example: 0xFEE00000:0xFEEFFFFF:0",
.get = get_reserved_region,
.set = set_reserved_region,
@@ -904,8 +896,7 @@ static char *print_pci_devfn(Object *obj, const Property *prop)
}
const PropertyInfo qdev_prop_pci_devfn = {
- /* The formatted string accepted by the setter is a CLI convenience. */
- .type = "int32",
+ .qapi_type = &int32_type_info,
.description = "Slot and optional function number, example: 06.0 or 06",
.print = print_pci_devfn,
.get = qdev_propinfo_get_int32,
@@ -1011,7 +1002,7 @@ inval:
}
const PropertyInfo qdev_prop_pci_host_devaddr = {
- .type = "str",
+ .qapi_type = &str_type_info,
.description = "Address (bus:device.function) of "
"the host device, example: 04:10.0",
.get = get_pci_host_devaddr,
@@ -1021,9 +1012,8 @@ const PropertyInfo qdev_prop_pci_host_devaddr = {
/* --- OffAutoPCIBAR off/auto/bar0/bar1/bar2/bar3/bar4/bar5 --- */
const PropertyInfo qdev_prop_off_auto_pcibar = {
- .type = "OffAutoPCIBAR",
+ .qapi_type = &OffAutoPCIBAR_type_info,
.description = "off/auto/bar0/bar1/bar2/bar3/bar4/bar5",
- .enum_table = &OffAutoPCIBAR_lookup,
.get = qdev_propinfo_get_enum,
.set = qdev_propinfo_set_enum,
.set_default_value = qdev_propinfo_set_default_value_enum,
@@ -1062,7 +1052,8 @@ static void get_prop_pcielinkspeed(Object *obj, Visitor *v, const char *name,
abort();
}
- visit_type_enum(v, name, &speed, prop->info->enum_table, errp);
+ visit_type_enum(v, name, &speed,
+ qdev_propinfo_enum_lookup(prop->info), errp);
}
static void set_prop_pcielinkspeed(Object *obj, Visitor *v, const char *name,
@@ -1072,8 +1063,8 @@ static void set_prop_pcielinkspeed(Object *obj, Visitor *v, const char *name,
PCIExpLinkSpeed *p = object_field_prop_ptr(obj, prop);
int speed;
- if (!visit_type_enum(v, name, &speed, prop->info->enum_table,
- errp)) {
+ if (!visit_type_enum(v, name, &speed,
+ qdev_propinfo_enum_lookup(prop->info), errp)) {
return;
}
@@ -1103,9 +1094,8 @@ static void set_prop_pcielinkspeed(Object *obj, Visitor *v, const char *name,
}
const PropertyInfo qdev_prop_pcie_link_speed = {
- .type = "PCIELinkSpeed",
+ .qapi_type = &PCIELinkSpeed_type_info,
.description = "2_5/5/8/16/32/64",
- .enum_table = &PCIELinkSpeed_lookup,
.get = get_prop_pcielinkspeed,
.set = set_prop_pcielinkspeed,
.set_default_value = qdev_propinfo_set_default_value_enum,
@@ -1147,7 +1137,8 @@ static void get_prop_pcielinkwidth(Object *obj, Visitor *v, const char *name,
abort();
}
- visit_type_enum(v, name, &width, prop->info->enum_table, errp);
+ visit_type_enum(v, name, &width,
+ qdev_propinfo_enum_lookup(prop->info), errp);
}
static void set_prop_pcielinkwidth(Object *obj, Visitor *v, const char *name,
@@ -1157,8 +1148,8 @@ static void set_prop_pcielinkwidth(Object *obj, Visitor *v, const char *name,
PCIExpLinkWidth *p = object_field_prop_ptr(obj, prop);
int width;
- if (!visit_type_enum(v, name, &width, prop->info->enum_table,
- errp)) {
+ if (!visit_type_enum(v, name, &width,
+ qdev_propinfo_enum_lookup(prop->info), errp)) {
return;
}
@@ -1191,9 +1182,8 @@ static void set_prop_pcielinkwidth(Object *obj, Visitor *v, const char *name,
}
const PropertyInfo qdev_prop_pcie_link_width = {
- .type = "PCIELinkWidth",
+ .qapi_type = &PCIELinkWidth_type_info,
.description = "1/2/4/8/12/16/32",
- .enum_table = &PCIELinkWidth_lookup,
.get = get_prop_pcielinkwidth,
.set = set_prop_pcielinkwidth,
.set_default_value = qdev_propinfo_set_default_value_enum,
@@ -1241,7 +1231,7 @@ static void set_default_uuid_auto(ObjectProperty *op, const Property *prop)
}
const PropertyInfo qdev_prop_uuid = {
- .type = "str",
+ .qapi_type = &str_type_info,
.description = "UUID (aka GUID) or \"" UUID_VALUE_AUTO
"\" for random value (default)",
.get = get_uuid,
@@ -1254,9 +1244,8 @@ const PropertyInfo qdev_prop_uuid = {
QEMU_BUILD_BUG_ON(sizeof(S390CpuEntitlement) != sizeof(int));
const PropertyInfo qdev_prop_cpus390entitlement = {
- .type = "S390CpuEntitlement",
+ .qapi_type = &S390CpuEntitlement_type_info,
.description = "auto/low/medium/high (default medium)",
- .enum_table = &S390CpuEntitlement_lookup,
.get = qdev_propinfo_get_enum,
.set = qdev_propinfo_set_enum,
.set_default_value = qdev_propinfo_set_default_value_enum,
@@ -1299,7 +1288,7 @@ static void release_iothread_vq_mapping_list(Object *obj,
}
const PropertyInfo qdev_prop_iothread_vq_mapping_list = {
- .type = "IOThreadVirtQueueMappingList",
+ .qapi_type = &IOThreadVirtQueueMappingList_type_info,
.description = "IOThread virtqueue mapping list [{\"iothread\":\"<id>\", "
"\"vqs\":[1,2,3,...]},...]",
.get = get_iothread_vq_mapping_list,
@@ -1310,18 +1299,16 @@ const PropertyInfo qdev_prop_iothread_vq_mapping_list = {
/* --- Endian modes */
const PropertyInfo qdev_prop_endian_mode = {
- .type = "EndianMode",
+ .qapi_type = &EndianMode_type_info,
.description = "Endian mode, big/little/unspecified",
- .enum_table = &EndianMode_lookup,
.get = qdev_propinfo_get_enum,
.set = qdev_propinfo_set_enum,
.set_default_value = qdev_propinfo_set_default_value_enum,
};
const PropertyInfo qdev_prop_vmapple_virtio_blk_variant = {
- .type = "VMAppleVirtioBlkVariant",
+ .qapi_type = &VMAppleVirtioBlkVariant_type_info,
.description = "unspecified/root/aux",
- .enum_table = &VMAppleVirtioBlkVariant_lookup,
.get = qdev_propinfo_get_enum,
.set = qdev_propinfo_set_enum,
.set_default_value = qdev_propinfo_set_default_value_enum,
@@ -1364,7 +1351,7 @@ static void release_virtio_gpu_output_list(Object *obj,
}
const PropertyInfo qdev_prop_virtio_gpu_output_list = {
- .type = "VirtIOGPUOutputList",
+ .qapi_type = &VirtIOGPUOutputList_type_info,
.description = "VirtIO GPU output list [{\"name\":\"<name>\"},...]",
.get = get_virtio_gpu_output_list,
.set = set_virtio_gpu_output_list,
diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index abdb380cb9ec..a9abc646d5d7 100644
--- a/hw/core/qdev-properties.c
+++ b/hw/core/qdev-properties.c
@@ -101,7 +101,7 @@ static ObjectPropertyAccessor *field_prop_setter(const PropertyInfo *info)
return info->set ? field_prop_set : NULL;
}
-static const QEnumLookup *qdev_propinfo_enum_lookup(const PropertyInfo *info)
+const QEnumLookup *qdev_propinfo_enum_lookup(const PropertyInfo *info)
{
if (info->qapi_type) {
assert(info->qapi_type->lookup);
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 56/65] hw: convert device-local PropertyInfo definitions to use qapi_type
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (54 preceding siblings ...)
2026-10-20 10:46 ` [PATCH v7 55/65] qdev: convert system PropertyInfo definitions to use qapi_type Marc-André Lureau
@ 2026-10-20 10:46 ` Marc-André Lureau
2026-10-20 10:46 ` [PATCH v7 57/65] target/riscv: convert " Marc-André Lureau
` (8 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:46 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
Mechanical conversion of PropertyInfo definitions in device-specific
files, replacing .type string with .qapi_type pointer to the
corresponding QAPITypeInfo. Except "display_mode" for apple-gfx, which
is a string of a specific format.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
hw/block/xen-block.c | 3 ++-
hw/display/apple-gfx.m | 3 ++-
hw/misc/xlnx-versal-trng.c | 3 ++-
hw/nvme/nguid.c | 3 ++-
hw/nvram/xlnx-bbram.c | 3 ++-
hw/nvram/xlnx-efuse.c | 3 ++-
hw/pci/pci.c | 3 ++-
hw/s390x/ccw-device.c | 3 ++-
hw/s390x/css.c | 5 +++--
hw/s390x/s390-pci-bus.c | 3 ++-
hw/vfio/pci-quirks.c | 3 ++-
11 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c
index 474c12fe4ac8..d9721c565c5f 100644
--- a/hw/block/xen-block.c
+++ b/hw/block/xen-block.c
@@ -29,6 +29,7 @@
#include "dataplane/xen-block.h"
#include "hw/xen/interface/io/xs_wire.h"
#include "trace.h"
+#include "qapi/qapi-builtin-type-infos.h"
#define XVDA_MAJOR 202
#define XVDQ_MAJOR (1 << 20)
@@ -663,7 +664,7 @@ invalid:
* https://xenbits.xen.org/docs/unstable/man/xen-vbd-interface.7.html
*/
static const PropertyInfo xen_block_prop_vdev = {
- .type = "str",
+ .qapi_type = &str_type_info,
.description = "Virtual Disk specifier (d*p*/xvd*/hd*/sd*)",
.get = xen_block_get_vdev,
.set = xen_block_set_vdev,
diff --git a/hw/display/apple-gfx.m b/hw/display/apple-gfx.m
index be0061b9db25..77c420b30006 100644
--- a/hw/display/apple-gfx.m
+++ b/hw/display/apple-gfx.m
@@ -15,6 +15,7 @@
#include "qemu/lockable.h"
#include "qemu/cutils.h"
#include "qemu/log.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "qapi/visitor.h"
#include "qapi/error.h"
#include "qemu/aio-wait.h"
@@ -871,7 +872,7 @@ static void apple_gfx_set_display_mode(Object *obj, Visitor *v,
}
const PropertyInfo qdev_prop_apple_gfx_display_mode = {
- .type = "display_mode",
+ .qapi_type = &str_type_info,
.description =
"Display mode in pixels and Hertz, as <width>x<height>@<refresh-rate> "
"Example: 3840x2160@60",
diff --git a/hw/misc/xlnx-versal-trng.c b/hw/misc/xlnx-versal-trng.c
index 0584ee089e3c..97bd3c3f8475 100644
--- a/hw/misc/xlnx-versal-trng.c
+++ b/hw/misc/xlnx-versal-trng.c
@@ -36,6 +36,7 @@
#include "qapi/visitor.h"
#include "migration/vmstate.h"
#include "hw/core/qdev-properties.h"
+#include "qapi/qapi-builtin-type-infos.h"
#ifndef XLNX_VERSAL_TRNG_ERR_DEBUG
#define XLNX_VERSAL_TRNG_ERR_DEBUG 0
@@ -662,7 +663,7 @@ static void trng_prop_fault_event_get(Object *obj, Visitor *v,
}
static const PropertyInfo trng_prop_fault_events = {
- .type = "uint32",
+ .qapi_type = &uint32_type_info,
.description = "Set to trigger TRNG fault events",
.set = trng_prop_fault_event_set,
.get = trng_prop_fault_event_get,
diff --git a/hw/nvme/nguid.c b/hw/nvme/nguid.c
index 4cd6fad6ac9b..6eaf90fca88e 100644
--- a/hw/nvme/nguid.c
+++ b/hw/nvme/nguid.c
@@ -18,6 +18,7 @@
#include "qapi/visitor.h"
#include "qemu/ctype.h"
#include "nvme.h"
+#include "qapi/qapi-builtin-type-infos.h"
#define NGUID_SEPARATOR '-'
@@ -179,7 +180,7 @@ static void set_nguid(Object *obj, Visitor *v, const char *name, void *opaque,
}
const PropertyInfo qdev_prop_nguid = {
- .type = "str",
+ .qapi_type = &str_type_info,
.description =
"NGUID or \"" NGUID_VALUE_AUTO "\" for random value",
.get = get_nguid,
diff --git a/hw/nvram/xlnx-bbram.c b/hw/nvram/xlnx-bbram.c
index e336874bdef4..eb032ab8b9c8 100644
--- a/hw/nvram/xlnx-bbram.c
+++ b/hw/nvram/xlnx-bbram.c
@@ -34,6 +34,7 @@
#include "hw/core/qdev-properties.h"
#include "hw/core/qdev-properties-system.h"
#include "hw/nvram/xlnx-efuse.h"
+#include "qapi/qapi-builtin-type-infos.h"
#ifndef XLNX_BBRAM_ERR_DEBUG
#define XLNX_BBRAM_ERR_DEBUG 0
@@ -486,7 +487,7 @@ static void bbram_prop_release_drive(Object *obj, const char *name,
}
static const PropertyInfo bbram_prop_drive = {
- .type = "str",
+ .qapi_type = &str_type_info,
.description = "Node name or ID of a block device to use as BBRAM backend",
.realized_set_allowed = true,
.get = bbram_prop_get_drive,
diff --git a/hw/nvram/xlnx-efuse.c b/hw/nvram/xlnx-efuse.c
index 03c9fbc0d076..b1c9ee4980a0 100644
--- a/hw/nvram/xlnx-efuse.c
+++ b/hw/nvram/xlnx-efuse.c
@@ -34,6 +34,7 @@
#include "system/blockdev.h"
#include "hw/core/qdev-properties.h"
#include "hw/core/qdev-properties-system.h"
+#include "qapi/qapi-builtin-type-infos.h"
#define TBIT0_OFFSET 28
#define TBIT1_OFFSET 29
@@ -251,7 +252,7 @@ static void efuse_prop_release_drive(Object *obj, const char *name,
}
static const PropertyInfo efuse_prop_drive = {
- .type = "str",
+ .qapi_type = &str_type_info,
.description = "Node name or ID of a block device to use as eFUSE backend",
.realized_set_allowed = true,
.get = efuse_prop_get_drive,
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 6edc702776ab..1b22c8d112f3 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -53,6 +53,7 @@
#include "qapi/error.h"
#include "qemu/cutils.h"
#include "pci-internal.h"
+#include "qapi/qapi-builtin-type-infos.h"
#include "hw/xen/xen.h"
#include "hw/i386/kvm/xen_evtchn.h"
@@ -80,7 +81,7 @@ static void prop_pci_busnr_get(Object *obj, Visitor *v, const char *name,
}
static const PropertyInfo prop_pci_busnr = {
- .type = "uint8",
+ .qapi_type = &uint8_type_info,
.get = prop_pci_busnr_get,
};
diff --git a/hw/s390x/ccw-device.c b/hw/s390x/ccw-device.c
index 25c427327957..fd21a4346522 100644
--- a/hw/s390x/ccw-device.c
+++ b/hw/s390x/ccw-device.c
@@ -17,6 +17,7 @@
#include "qapi/visitor.h"
#include "qemu/ctype.h"
#include "qapi/error.h"
+#include "qapi/qapi-builtin-type-infos.h"
static void ccw_device_refill_ids(CcwDevice *dev)
{
@@ -74,7 +75,7 @@ static void ccw_device_set_loadparm(Object *obj, Visitor *v,
}
const PropertyInfo ccw_loadparm = {
- .type = "str",
+ .qapi_type = &str_type_info,
.description = "Up to 8 chars in set of [A-Za-z0-9. ] to select"
" a guest kernel",
.get = ccw_device_get_loadparm,
diff --git a/hw/s390x/css.c b/hw/s390x/css.c
index 65341c68c3bf..50d14ab855f7 100644
--- a/hw/s390x/css.c
+++ b/hw/s390x/css.c
@@ -24,6 +24,7 @@
#include "hw/s390x/s390-virtio-ccw.h"
#include "hw/s390x/s390-ccw.h"
#include "exec/cpu-common.h"
+#include "qapi/qapi-builtin-type-infos.h"
typedef struct CrwContainer {
CRW crw;
@@ -2530,7 +2531,7 @@ out:
}
const PropertyInfo css_devid_propinfo = {
- .type = "str",
+ .qapi_type = &str_type_info,
.description = "Identifier of an I/O device in the channel "
"subsystem, example: fe.1.23ab",
.get = get_css_devid,
@@ -2538,7 +2539,7 @@ const PropertyInfo css_devid_propinfo = {
};
const PropertyInfo css_devid_ro_propinfo = {
- .type = "str",
+ .qapi_type = &str_type_info,
.description = "Read-only identifier of an I/O device in the channel "
"subsystem, example: fe.1.23ab",
.get = get_css_devid,
diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c
index 2724b27ec2a1..96603bfdb8a9 100644
--- a/hw/s390x/s390-pci-bus.c
+++ b/hw/s390x/s390-pci-bus.c
@@ -35,6 +35,7 @@
#include "system/runstate.h"
#include "trace.h"
+#include "qapi/qapi-builtin-type-infos.h"
S390pciState *s390_get_phb(void)
{
@@ -1843,7 +1844,7 @@ static void s390_pci_set_fid(Object *obj, Visitor *v, const char *name,
}
static const PropertyInfo s390_pci_fid_propinfo = {
- .type = "uint32",
+ .qapi_type = &uint32_type_info,
.description = "zpci_fid",
.get = s390_pci_get_fid,
.set = s390_pci_set_fid,
diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c
index c5b4f9091d49..4a3fd374a211 100644
--- a/hw/vfio/pci-quirks.c
+++ b/hw/vfio/pci-quirks.c
@@ -26,6 +26,7 @@
#include "pci.h"
#include "pci-quirks.h"
#include "trace.h"
+#include "qapi/qapi-builtin-type-infos.h"
/*
* List of device ids/vendor ids for which to disable
@@ -1436,7 +1437,7 @@ static void set_nv_gpudirect_clique_id(Object *obj, Visitor *v,
}
const PropertyInfo qdev_prop_nv_gpudirect_clique = {
- .type = "uint8",
+ .qapi_type = &uint8_type_info,
.description = "NVIDIA GPUDirect Clique ID (0 - 15)",
.get = get_nv_gpudirect_clique_id,
.set = set_nv_gpudirect_clique_id,
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 57/65] target/riscv: convert PropertyInfo definitions to use qapi_type
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (55 preceding siblings ...)
2026-10-20 10:46 ` [PATCH v7 56/65] hw: convert device-local " Marc-André Lureau
@ 2026-10-20 10:46 ` Marc-André Lureau
2026-10-20 10:46 ` [PATCH v7 58/65] qdev: " Marc-André Lureau
` (7 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:46 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
Mechanical conversion of all local PropertyInfo definitions in
target/riscv/cpu.c
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
target/riscv/cpu.c | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c
index 664c1a767950..28bfcb36ecb7 100644
--- a/target/riscv/cpu.c
+++ b/target/riscv/cpu.c
@@ -1704,7 +1704,7 @@ static void prop_pmu_num_get(Object *obj, Visitor *v, const char *name,
}
static const PropertyInfo prop_pmu_num = {
- .type = "uint8",
+ .qapi_type = &uint8_type_info,
.description = "pmu-num",
.get = prop_pmu_num_get,
.set = prop_pmu_num_set,
@@ -1746,7 +1746,7 @@ static void prop_pmu_mask_get(Object *obj, Visitor *v, const char *name,
}
static const PropertyInfo prop_pmu_mask = {
- .type = "uint32",
+ .qapi_type = &uint32_type_info,
.description = "pmu-mask",
.get = prop_pmu_mask_get,
.set = prop_pmu_mask_set,
@@ -1778,7 +1778,7 @@ static void prop_mmu_get(Object *obj, Visitor *v, const char *name,
}
static const PropertyInfo prop_mmu = {
- .type = "bool",
+ .qapi_type = &bool_type_info,
.description = "mmu",
.get = prop_mmu_get,
.set = prop_mmu_set,
@@ -1811,7 +1811,7 @@ static void prop_pmp_get(Object *obj, Visitor *v, const char *name,
}
static const PropertyInfo prop_pmp = {
- .type = "bool",
+ .qapi_type = &bool_type_info,
.description = "pmp",
.get = prop_pmp_get,
.set = prop_pmp_set,
@@ -1851,7 +1851,7 @@ static void prop_num_pmp_regions_get(Object *obj, Visitor *v, const char *name,
}
static const PropertyInfo prop_num_pmp_regions = {
- .type = "uint8",
+ .qapi_type = &uint8_type_info,
.description = "num-pmp-regions",
.get = prop_num_pmp_regions_get,
.set = prop_num_pmp_regions_set,
@@ -1889,7 +1889,7 @@ static void prop_pmp_granularity_get(Object *obj, Visitor *v, const char *name,
}
static const PropertyInfo prop_pmp_granularity = {
- .type = "uint32",
+ .qapi_type = &uint32_type_info,
.description = "pmp-granularity",
.get = prop_pmp_granularity_get,
.set = prop_pmp_granularity_set,
@@ -1965,7 +1965,7 @@ static void prop_priv_spec_get(Object *obj, Visitor *v, const char *name,
}
static const PropertyInfo prop_priv_spec = {
- .type = "str",
+ .qapi_type = &str_type_info,
.description = "priv_spec",
/* FIXME enum? */
.get = prop_priv_spec_get,
@@ -1998,7 +1998,7 @@ static void prop_vext_spec_get(Object *obj, Visitor *v, const char *name,
}
static const PropertyInfo prop_vext_spec = {
- .type = "str",
+ .qapi_type = &str_type_info,
.description = "vext_spec",
/* FIXME enum? */
.get = prop_vext_spec_get,
@@ -2041,7 +2041,7 @@ static void prop_vlen_get(Object *obj, Visitor *v, const char *name,
}
static const PropertyInfo prop_vlen = {
- .type = "uint16",
+ .qapi_type = &uint16_type_info,
.description = "vlen",
.get = prop_vlen_get,
.set = prop_vlen_set,
@@ -2082,7 +2082,7 @@ static void prop_elen_get(Object *obj, Visitor *v, const char *name,
}
static const PropertyInfo prop_elen = {
- .type = "uint16",
+ .qapi_type = &uint16_type_info,
.description = "elen",
.get = prop_elen_get,
.set = prop_elen_set,
@@ -2118,7 +2118,7 @@ static void prop_cbom_blksize_get(Object *obj, Visitor *v, const char *name,
}
static const PropertyInfo prop_cbom_blksize = {
- .type = "uint16",
+ .qapi_type = &uint16_type_info,
.description = "cbom_blocksize",
.get = prop_cbom_blksize_get,
.set = prop_cbom_blksize_set,
@@ -2154,7 +2154,7 @@ static void prop_cbop_blksize_get(Object *obj, Visitor *v, const char *name,
}
static const PropertyInfo prop_cbop_blksize = {
- .type = "uint16",
+ .qapi_type = &uint16_type_info,
.description = "cbop_blocksize",
.get = prop_cbop_blksize_get,
.set = prop_cbop_blksize_set,
@@ -2190,7 +2190,7 @@ static void prop_cboz_blksize_get(Object *obj, Visitor *v, const char *name,
}
static const PropertyInfo prop_cboz_blksize = {
- .type = "uint16",
+ .qapi_type = &uint16_type_info,
.description = "cboz_blocksize",
.get = prop_cboz_blksize_get,
.set = prop_cboz_blksize_set,
@@ -2226,7 +2226,7 @@ static void prop_mvendorid_get(Object *obj, Visitor *v, const char *name,
}
static const PropertyInfo prop_mvendorid = {
- .type = "uint32",
+ .qapi_type = &uint32_type_info,
.description = "mvendorid",
.get = prop_mvendorid_get,
.set = prop_mvendorid_set,
@@ -2262,7 +2262,7 @@ static void prop_mimpid_get(Object *obj, Visitor *v, const char *name,
}
static const PropertyInfo prop_mimpid = {
- .type = "uint64",
+ .qapi_type = &uint64_type_info,
.description = "mimpid",
.get = prop_mimpid_get,
.set = prop_mimpid_set,
@@ -2319,7 +2319,7 @@ static void prop_marchid_get(Object *obj, Visitor *v, const char *name,
}
static const PropertyInfo prop_marchid = {
- .type = "uint64",
+ .qapi_type = &uint64_type_info,
.description = "marchid",
.get = prop_marchid_get,
.set = prop_marchid_set,
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 58/65] qdev: convert PropertyInfo definitions to use qapi_type
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (56 preceding siblings ...)
2026-10-20 10:46 ` [PATCH v7 57/65] target/riscv: convert " Marc-André Lureau
@ 2026-10-20 10:46 ` Marc-André Lureau
2026-10-20 10:46 ` [PATCH v7 59/65] qdev: introduce typed array PropertyInfos Marc-André Lureau
` (6 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:46 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau, Stefan Berger
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: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
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 7019f7fd3eb9..dc6d4b211567 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 46d040fc3f25..029282a1605c 100644
--- a/migration/options.c
+++ b/migration/options.c
@@ -37,6 +37,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
@@ -294,7 +296,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,
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 59/65] qdev: introduce typed array PropertyInfos
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (57 preceding siblings ...)
2026-10-20 10:46 ` [PATCH v7 58/65] qdev: " Marc-André Lureau
@ 2026-10-20 10:46 ` Marc-André Lureau
2026-10-20 10:46 ` [PATCH v7 60/65] qdev: simplify DEFINE_PROP_ARRAY and remove generic array PropertyInfo Marc-André Lureau
` (5 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:46 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
Add element_info and element_size fields to PropertyInfo, and extend
qdev_prop_qapi_type() to derive QAPI types for array properties via
element_info->qapi_type->list.
Add typed list PropertyInfo definitions that replace the generic
qdev_prop_array. Each typed list PropertyInfo knows its element type
at compile time through the element_info and element_size fields,
which allows the QAPI type to be derived automatically.
Infrastructure changes:
- Add prop_array_info() and prop_array_elem_size() helpers that
prefer the new element_info/element_size fields with fallback to
the old arrayinfo/arrayfieldsize fields for compatibility
- Make get_prop_array, set_prop_array, release_prop_array, and
default_prop_array non-static so they can be used by
DEFINE_PROP_ARRAY_INFO in other translation units
- Add DEFINE_PROP_ARRAY_INFO macro in qdev-prop-internal.h
The array of links needs special care for its "full type name" to follow
the "link<TYPE>List" pattern used by link properties ("link<TYPE>").
The old qdev_prop_array and DEFINE_PROP_ARRAY macro are preserved
for compatibility; they will be replaced in the next patch.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
hw/core/qdev-prop-internal.h | 21 +++++++
hw/core/qdev-properties-system.c | 5 ++
hw/core/qdev-properties.c | 104 ++++++++++++++++++++++++-------
include/hw/core/qdev-properties-system.h | 2 +
include/hw/core/qdev-properties.h | 8 +++
5 files changed, 119 insertions(+), 21 deletions(-)
diff --git a/hw/core/qdev-prop-internal.h b/hw/core/qdev-prop-internal.h
index c190b7b88cf4..40fa4bc63f03 100644
--- a/hw/core/qdev-prop-internal.h
+++ b/hw/core/qdev-prop-internal.h
@@ -27,4 +27,25 @@ void qdev_propinfo_get_int32(Object *obj, Visitor *v, const char *name,
void qdev_propinfo_get_size32(Object *obj, Visitor *v, const char *name,
void *opaque, Error **errp);
+void get_prop_array(Object *obj, Visitor *v, const char *name,
+ void *opaque, Error **errp);
+void set_prop_array(Object *obj, Visitor *v, const char *name,
+ void *opaque, Error **errp);
+void release_prop_array(Object *obj, const char *name, void *opaque);
+void default_prop_array(ObjectProperty *op, const Property *prop);
+
+/*
+ * Note: .qapi_type is derived from element_info->qapi_type->list by
+ * qdev_prop_qapi_type()
+ */
+#define DEFINE_PROP_ARRAY_INFO(_elem_prop_info, _elem_type) \
+ { \
+ .element_info = &(_elem_prop_info), \
+ .element_size = sizeof(_elem_type), \
+ .get = get_prop_array, \
+ .set = set_prop_array, \
+ .release = release_prop_array, \
+ .set_default_value = default_prop_array, \
+ }
+
#endif
diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c
index 8819a9a0b748..ad4a00f776e6 100644
--- a/hw/core/qdev-properties-system.c
+++ b/hw/core/qdev-properties-system.c
@@ -484,6 +484,8 @@ const PropertyInfo qdev_prop_netdev = {
.set = set_netdev,
};
+const PropertyInfo qdev_prop_netdev_list =
+ DEFINE_PROP_ARRAY_INFO(qdev_prop_netdev, NICPeers);
/* --- audiodev --- */
static void get_audiodev(Object *obj, Visitor *v, const char* name,
@@ -822,6 +824,9 @@ const PropertyInfo qdev_prop_reserved_region = {
.set = set_reserved_region,
};
+const PropertyInfo qdev_prop_reserved_region_list =
+ DEFINE_PROP_ARRAY_INFO(qdev_prop_reserved_region, ReservedRegion);
+
/* --- pci address --- */
/*
diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index a9abc646d5d7..bace12b10e36 100644
--- a/hw/core/qdev-properties.c
+++ b/hw/core/qdev-properties.c
@@ -666,6 +666,22 @@ struct ArrayElementList {
void *value;
};
+static const PropertyInfo *prop_array_info(const Property *prop)
+{
+ if (prop->info->element_info) {
+ return prop->info->element_info;
+ }
+ return prop->arrayinfo;
+}
+
+static int prop_array_elem_size(const Property *prop)
+{
+ if (prop->info->element_size) {
+ return prop->info->element_size;
+ }
+ return prop->arrayfieldsize;
+}
+
/*
* Given an array property @parent_prop in @obj, return a Property for a
* specific element of the array. Arrays are backed by an uint32_t length field
@@ -675,7 +691,7 @@ static Property array_elem_prop(Object *obj, const Property *parent_prop,
const char *name, char *elem)
{
return (Property) {
- .info = parent_prop->arrayinfo,
+ .info = prop_array_info(parent_prop),
.name = name,
/*
* This ugly piece of pointer arithmetic sets up the offset so
@@ -693,19 +709,21 @@ static Property array_elem_prop(Object *obj, const Property *parent_prop,
* underlying element's property release hook for each element and free the
* property array.
*/
-static void release_prop_array(Object *obj, const char *name, void *opaque)
+void release_prop_array(Object *obj, const char *name, void *opaque)
{
const Property *prop = opaque;
uint32_t *alenptr = object_field_prop_ptr(obj, prop);
void **arrayptr = (void *)obj + prop->arrayoffset;
char *elem = *arrayptr;
int i;
+ const PropertyInfo *elem_info = prop_array_info(prop);
+ int elem_size = prop_array_elem_size(prop);
- if (prop->arrayinfo->release) {
+ if (elem_info->release) {
for (i = 0; i < *alenptr; i++) {
Property elem_prop = array_elem_prop(obj, prop, name, elem);
- prop->arrayinfo->release(obj, NULL, &elem_prop);
- elem += prop->arrayfieldsize;
+ elem_info->release(obj, NULL, &elem_prop);
+ elem += elem_size;
}
}
@@ -719,8 +737,8 @@ static void release_prop_array(Object *obj, const char *name, void *opaque)
* (a pointer to which is stored in the additional field described by
* prop->arrayoffset).
*/
-static void set_prop_array(Object *obj, Visitor *v, const char *name,
- void *opaque, Error **errp)
+void set_prop_array(Object *obj, Visitor *v, const char *name,
+ void *opaque, Error **errp)
{
ERRP_GUARD();
const Property *prop = opaque;
@@ -728,6 +746,8 @@ static void set_prop_array(Object *obj, Visitor *v, const char *name,
void **arrayptr = (void *)obj + prop->arrayoffset;
ArrayElementList *list, *elem, *next;
const size_t size = sizeof(*list);
+ const PropertyInfo *elem_info = prop_array_info(prop);
+ int elem_size = prop_array_elem_size(prop);
char *elemptr;
bool ok = true;
@@ -746,9 +766,9 @@ static void set_prop_array(Object *obj, Visitor *v, const char *name,
while (elem) {
Property elem_prop;
- elem->value = g_malloc0(prop->arrayfieldsize);
+ elem->value = g_malloc0(elem_size);
elem_prop = array_elem_prop(obj, prop, name, elem->value);
- prop->arrayinfo->set(obj, v, NULL, &elem_prop, errp);
+ elem_info->set(obj, v, NULL, &elem_prop, errp);
if (*errp) {
ok = false;
goto out_obj;
@@ -770,8 +790,8 @@ out_obj:
for (elem = list; elem; elem = next) {
Property elem_prop = array_elem_prop(obj, prop, name,
elem->value);
- if (prop->arrayinfo->release) {
- prop->arrayinfo->release(obj, NULL, &elem_prop);
+ if (elem_info->release) {
+ elem_info->release(obj, NULL, &elem_prop);
}
next = elem->next;
g_free(elem->value);
@@ -784,19 +804,19 @@ out_obj:
* Now that we know how big the array has to be, move the data over to a
* linear array and free the temporary list.
*/
- *arrayptr = g_malloc_n(*alenptr, prop->arrayfieldsize);
+ *arrayptr = g_malloc_n(*alenptr, elem_size);
elemptr = *arrayptr;
for (elem = list; elem; elem = next) {
- memcpy(elemptr, elem->value, prop->arrayfieldsize);
- elemptr += prop->arrayfieldsize;
+ memcpy(elemptr, elem->value, elem_size);
+ elemptr += elem_size;
next = elem->next;
g_free(elem->value);
g_free(elem);
}
}
-static void get_prop_array(Object *obj, Visitor *v, const char *name,
- void *opaque, Error **errp)
+void get_prop_array(Object *obj, Visitor *v, const char *name,
+ void *opaque, Error **errp)
{
ERRP_GUARD();
const Property *prop = opaque;
@@ -806,6 +826,8 @@ static void get_prop_array(Object *obj, Visitor *v, const char *name,
ArrayElementList *list = NULL, *elem;
ArrayElementList **tail = &list;
const size_t size = sizeof(*list);
+ const PropertyInfo *elem_info = prop_array_info(prop);
+ int elem_size = prop_array_elem_size(prop);
int i;
bool ok;
@@ -813,7 +835,7 @@ static void get_prop_array(Object *obj, Visitor *v, const char *name,
for (i = 0; i < *alenptr; i++) {
elem = g_new0(ArrayElementList, 1);
elem->value = elemptr;
- elemptr += prop->arrayfieldsize;
+ elemptr += elem_size;
*tail = elem;
tail = &elem->next;
@@ -826,7 +848,7 @@ static void get_prop_array(Object *obj, Visitor *v, const char *name,
elem = list;
while (elem) {
Property elem_prop = array_elem_prop(obj, prop, name, elem->value);
- prop->arrayinfo->get(obj, v, NULL, &elem_prop, errp);
+ elem_info->get(obj, v, NULL, &elem_prop, errp);
if (*errp) {
goto out_obj;
}
@@ -848,7 +870,7 @@ out_obj:
}
}
-static void default_prop_array(ObjectProperty *op, const Property *prop)
+void default_prop_array(ObjectProperty *op, const Property *prop)
{
object_property_set_default_list(op);
}
@@ -861,6 +883,39 @@ const PropertyInfo qdev_prop_array = {
.set_default_value = default_prop_array,
};
+const PropertyInfo qdev_prop_uint8_list =
+ DEFINE_PROP_ARRAY_INFO(qdev_prop_uint8, uint8_t);
+const PropertyInfo qdev_prop_uint16_list =
+ DEFINE_PROP_ARRAY_INFO(qdev_prop_uint16, uint16_t);
+const PropertyInfo qdev_prop_uint32_list =
+ DEFINE_PROP_ARRAY_INFO(qdev_prop_uint32, uint32_t);
+const PropertyInfo qdev_prop_uint64_list =
+ DEFINE_PROP_ARRAY_INFO(qdev_prop_uint64, uint64_t);
+const PropertyInfo qdev_prop_string_list =
+ DEFINE_PROP_ARRAY_INFO(qdev_prop_string, char *);
+
+static ObjectProperty *create_link_list_property(ObjectClass *oc,
+ const char *name,
+ const Property *prop)
+{
+ g_autofree char *full_type = g_strdup_printf("link<%s>List",
+ prop->link_type);
+
+ return object_class_property_add(oc, name, full_type,
+ get_prop_array, set_prop_array,
+ release_prop_array, (Property *)prop);
+}
+
+const PropertyInfo qdev_prop_link_list = {
+ .element_info = &qdev_prop_link,
+ .element_size = sizeof(void *),
+ .create = create_link_list_property,
+ .get = get_prop_array,
+ .set = set_prop_array,
+ .release = release_prop_array,
+ .set_default_value = default_prop_array,
+};
+
/* --- public helpers --- */
static const Property *qdev_prop_walk(DeviceClass *cls, const char *name)
@@ -1159,8 +1214,15 @@ const PropertyInfo qdev_prop_link = {
static const QAPITypeInfo *qdev_prop_qapi_type(const Property *prop)
{
- /* this will be later extended to cope with QAPI array properties */
- return prop->info->qapi_type;
+ if (prop->info->qapi_type) {
+ return prop->info->qapi_type;
+ }
+ if (prop->info->element_info) {
+ assert(prop->info->element_info->qapi_type);
+ assert(prop->info->element_info->qapi_type->list);
+ return prop->info->element_info->qapi_type->list;
+ }
+ return NULL;
}
void qdev_property_add_static(DeviceState *dev, const Property *prop)
diff --git a/include/hw/core/qdev-properties-system.h b/include/hw/core/qdev-properties-system.h
index 2cbea16d615e..819dce7d5e5d 100644
--- a/include/hw/core/qdev-properties-system.h
+++ b/include/hw/core/qdev-properties-system.h
@@ -23,6 +23,8 @@ extern const PropertyInfo qdev_prop_fdc_drive_type;
extern const PropertyInfo qdev_prop_drive;
extern const PropertyInfo qdev_prop_drive_iothread;
extern const PropertyInfo qdev_prop_netdev;
+extern const PropertyInfo qdev_prop_netdev_list;
+extern const PropertyInfo qdev_prop_reserved_region_list;
extern const PropertyInfo qdev_prop_pci_devfn;
extern const PropertyInfo qdev_prop_blocksize;
extern const PropertyInfo qdev_prop_pci_host_devaddr;
diff --git a/include/hw/core/qdev-properties.h b/include/hw/core/qdev-properties.h
index 1ea2ba66bb37..0c067170079d 100644
--- a/include/hw/core/qdev-properties.h
+++ b/include/hw/core/qdev-properties.h
@@ -35,6 +35,8 @@ struct PropertyInfo {
const char *description;
const QEnumLookup *enum_table;
const QAPITypeInfo *qapi_type;
+ const struct PropertyInfo *element_info;
+ int element_size;
bool realized_set_allowed; /* allow setting property on realized device */
char *(*print)(Object *obj, const Property *prop);
void (*set_default_value)(ObjectProperty *op, const Property *prop);
@@ -75,7 +77,13 @@ extern const PropertyInfo qdev_prop_string;
extern const PropertyInfo qdev_prop_on_off_auto;
extern const PropertyInfo qdev_prop_size32;
extern const PropertyInfo qdev_prop_array;
+extern const PropertyInfo qdev_prop_uint8_list;
+extern const PropertyInfo qdev_prop_uint16_list;
+extern const PropertyInfo qdev_prop_uint32_list;
+extern const PropertyInfo qdev_prop_uint64_list;
+extern const PropertyInfo qdev_prop_string_list;
extern const PropertyInfo qdev_prop_link;
+extern const PropertyInfo qdev_prop_link_list;
#define DEFINE_PROP(_name, _state, _field, _prop, _type, ...) { \
.name = (_name), \
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 60/65] qdev: simplify DEFINE_PROP_ARRAY and remove generic array PropertyInfo
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (58 preceding siblings ...)
2026-10-20 10:46 ` [PATCH v7 59/65] qdev: introduce typed array PropertyInfos Marc-André Lureau
@ 2026-10-20 10:46 ` Marc-André Lureau
2026-10-20 10:46 ` [PATCH v7 61/65] qdev: remove deprecated PropertyInfo.type and .enum_table fields Marc-André Lureau
` (4 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:46 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
Change DEFINE_PROP_ARRAY, the macro now uses _arrayprop##_list to
resolve the typed list PropertyInfo (introduced in the previous patch)
instead of the generic qdev_prop_array.
This means the element type and size information is carried by the
PropertyInfo itself rather than duplicated at each callsite. Since
the typed list PropertyInfos encode element_info and element_size,
the .arrayinfo and .arrayfieldsize fields are no longer set by the
macro (they will be removed from the Property struct in the next patch).
Remove qdev_prop_array, which is now unused.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
hw/core/qdev-properties.c | 8 --------
hw/display/apple-gfx-mmio.m | 2 +-
hw/display/apple-gfx-pci.m | 2 +-
hw/display/apple-gfx.h | 1 +
hw/display/apple-gfx.m | 4 ++++
hw/input/stellaris_gamepad.c | 2 +-
hw/intc/arm_gicv3_common.c | 2 +-
hw/intc/arm_gicv5_common.c | 4 ++--
hw/intc/rx_icu.c | 4 ++--
hw/misc/arm_sysctl.c | 4 ++--
hw/misc/mps2-scc.c | 2 +-
hw/net/rocker/rocker.c | 2 +-
hw/net/virtio-net.c | 2 +-
hw/nvram/xlnx-efuse.c | 2 +-
hw/nvram/xlnx-versal-efuse-ctrl.c | 2 +-
hw/riscv/riscv_hart.c | 6 ++----
hw/virtio/virtio-iommu-pci.c | 2 +-
include/hw/block/block.h | 2 +-
include/hw/core/qdev-properties.h | 27 ++++++++++-----------------
tests/unit/test-qdev.c | 2 +-
20 files changed, 35 insertions(+), 47 deletions(-)
diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index bace12b10e36..5c403cc2e57e 100644
--- a/hw/core/qdev-properties.c
+++ b/hw/core/qdev-properties.c
@@ -875,14 +875,6 @@ void default_prop_array(ObjectProperty *op, const Property *prop)
object_property_set_default_list(op);
}
-const PropertyInfo qdev_prop_array = {
- .type = "list",
- .get = get_prop_array,
- .set = set_prop_array,
- .release = release_prop_array,
- .set_default_value = default_prop_array,
-};
-
const PropertyInfo qdev_prop_uint8_list =
DEFINE_PROP_ARRAY_INFO(qdev_prop_uint8, uint8_t);
const PropertyInfo qdev_prop_uint16_list =
diff --git a/hw/display/apple-gfx-mmio.m b/hw/display/apple-gfx-mmio.m
index 58beaadd1f10..dcd04617eb87 100644
--- a/hw/display/apple-gfx-mmio.m
+++ b/hw/display/apple-gfx-mmio.m
@@ -258,7 +258,7 @@ static void apple_gfx_mmio_reset(Object *obj, ResetType type)
static const Property apple_gfx_mmio_properties[] = {
DEFINE_PROP_ARRAY("display-modes", AppleGFXMMIOState,
common.num_display_modes, common.display_modes,
- qdev_prop_apple_gfx_display_mode, AppleGFXDisplayMode),
+ qdev_prop_apple_gfx_display_mode),
};
static void apple_gfx_mmio_class_init(ObjectClass *klass, const void *data)
diff --git a/hw/display/apple-gfx-pci.m b/hw/display/apple-gfx-pci.m
index b0694f4cb855..74f79c8b157b 100644
--- a/hw/display/apple-gfx-pci.m
+++ b/hw/display/apple-gfx-pci.m
@@ -118,7 +118,7 @@ static void apple_gfx_pci_reset(Object *obj, ResetType type)
static const Property apple_gfx_pci_properties[] = {
DEFINE_PROP_ARRAY("display-modes", AppleGFXPCIState,
common.num_display_modes, common.display_modes,
- qdev_prop_apple_gfx_display_mode, AppleGFXDisplayMode),
+ qdev_prop_apple_gfx_display_mode),
};
static void apple_gfx_pci_class_init(ObjectClass *klass, const void *data)
diff --git a/hw/display/apple-gfx.h b/hw/display/apple-gfx.h
index 3197bd853dab..b7eef7b9b14a 100644
--- a/hw/display/apple-gfx.h
+++ b/hw/display/apple-gfx.h
@@ -69,6 +69,7 @@ void *apple_gfx_host_ptr_for_gpa_range(uint64_t guest_physical,
MemoryRegion **mapping_in_region);
extern const PropertyInfo qdev_prop_apple_gfx_display_mode;
+extern const PropertyInfo qdev_prop_apple_gfx_display_mode_list;
#endif
diff --git a/hw/display/apple-gfx.m b/hw/display/apple-gfx.m
index 77c420b30006..592d692d793d 100644
--- a/hw/display/apple-gfx.m
+++ b/hw/display/apple-gfx.m
@@ -16,6 +16,7 @@
#include "qemu/cutils.h"
#include "qemu/log.h"
#include "qapi/qapi-builtin-type-infos.h"
+#include "hw/core/qdev-prop-internal.h"
#include "qapi/visitor.h"
#include "qapi/error.h"
#include "qemu/aio-wait.h"
@@ -879,3 +880,6 @@ static void apple_gfx_set_display_mode(Object *obj, Visitor *v,
.get = apple_gfx_get_display_mode,
.set = apple_gfx_set_display_mode,
};
+
+const PropertyInfo qdev_prop_apple_gfx_display_mode_list =
+ DEFINE_PROP_ARRAY_INFO(qdev_prop_apple_gfx_display_mode, AppleGFXDisplayMode);
diff --git a/hw/input/stellaris_gamepad.c b/hw/input/stellaris_gamepad.c
index 376d91abad70..20613f649977 100644
--- a/hw/input/stellaris_gamepad.c
+++ b/hw/input/stellaris_gamepad.c
@@ -80,7 +80,7 @@ static void stellaris_gamepad_reset_enter(Object *obj, ResetType type)
static const Property stellaris_gamepad_properties[] = {
DEFINE_PROP_ARRAY("keycodes", StellarisGamepad, num_buttons,
- keycodes, qdev_prop_uint32, uint32_t),
+ keycodes, qdev_prop_uint32),
};
static void stellaris_gamepad_class_init(ObjectClass *klass, const void *data)
diff --git a/hw/intc/arm_gicv3_common.c b/hw/intc/arm_gicv3_common.c
index f7ba74e6d52a..1298b6b735e9 100644
--- a/hw/intc/arm_gicv3_common.c
+++ b/hw/intc/arm_gicv3_common.c
@@ -615,7 +615,7 @@ static const Property arm_gicv3_common_properties[] = {
*/
DEFINE_PROP_BOOL("force-8-bit-prio", GICv3State, force_8bit_prio, 0),
DEFINE_PROP_ARRAY("redist-region-count", GICv3State, nb_redist_regions,
- redist_region_count, qdev_prop_uint32, uint32_t),
+ redist_region_count, qdev_prop_uint32),
DEFINE_PROP_LINK("sysmem", GICv3State, dma, TYPE_MEMORY_REGION,
MemoryRegion *),
DEFINE_PROP_UINT32("first-cpu-index", GICv3State, first_cpu_idx, 0),
diff --git a/hw/intc/arm_gicv5_common.c b/hw/intc/arm_gicv5_common.c
index b155486af65e..61c8ae493021 100644
--- a/hw/intc/arm_gicv5_common.c
+++ b/hw/intc/arm_gicv5_common.c
@@ -191,9 +191,9 @@ static void gicv5_common_realize(DeviceState *dev, Error **errp)
static const Property arm_gicv5_common_properties[] = {
DEFINE_PROP_LINK_ARRAY("cpus", GICv5Common, num_cpus,
- cpus, TYPE_ARM_CPU, ARMCPU *),
+ cpus, TYPE_ARM_CPU),
DEFINE_PROP_ARRAY("cpu-iaffids", GICv5Common, num_cpu_iaffids,
- cpu_iaffids, qdev_prop_uint32, uint32_t),
+ cpu_iaffids, qdev_prop_uint32),
DEFINE_PROP_UINT32("irsid", GICv5Common, irsid, 0),
DEFINE_PROP_UINT32("spi-range", GICv5Common, spi_range, 0),
DEFINE_PROP_UINT32("spi-base", GICv5Common, spi_base, 0),
diff --git a/hw/intc/rx_icu.c b/hw/intc/rx_icu.c
index 992b069ae245..125a6dcb6804 100644
--- a/hw/intc/rx_icu.c
+++ b/hw/intc/rx_icu.c
@@ -356,9 +356,9 @@ static const VMStateDescription vmstate_rxicu = {
static const Property rxicu_properties[] = {
DEFINE_PROP_ARRAY("ipr-map", RXICUState, nr_irqs, map,
- qdev_prop_uint8, uint8_t),
+ qdev_prop_uint8),
DEFINE_PROP_ARRAY("trigger-level", RXICUState, nr_sense, init_sense,
- qdev_prop_uint8, uint8_t),
+ qdev_prop_uint8),
};
static void rxicu_class_init(ObjectClass *klass, const void *data)
diff --git a/hw/misc/arm_sysctl.c b/hw/misc/arm_sysctl.c
index ebc95b9bb54c..1df85593a5cb 100644
--- a/hw/misc/arm_sysctl.c
+++ b/hw/misc/arm_sysctl.c
@@ -626,10 +626,10 @@ static const Property arm_sysctl_properties[] = {
DEFINE_PROP_UINT32("proc_id", arm_sysctl_state, proc_id, 0),
/* Daughterboard power supply voltages (as reported via SYS_CFG) */
DEFINE_PROP_ARRAY("db-voltage", arm_sysctl_state, db_num_vsensors,
- db_voltage, qdev_prop_uint32, uint32_t),
+ db_voltage, qdev_prop_uint32),
/* Daughterboard clock reset values (as reported via SYS_CFG) */
DEFINE_PROP_ARRAY("db-clock", arm_sysctl_state, db_num_clocks,
- db_clock_reset, qdev_prop_uint32, uint32_t),
+ db_clock_reset, qdev_prop_uint32),
};
static void arm_sysctl_class_init(ObjectClass *klass, const void *data)
diff --git a/hw/misc/mps2-scc.c b/hw/misc/mps2-scc.c
index 554b504c7203..32f9e166feed 100644
--- a/hw/misc/mps2-scc.c
+++ b/hw/misc/mps2-scc.c
@@ -464,7 +464,7 @@ static const Property mps2_scc_properties[] = {
* motherboard configuration controller to suit the FPGA image.
*/
DEFINE_PROP_ARRAY("oscclk", MPS2SCC, num_oscclk, oscclk_reset,
- qdev_prop_uint32, uint32_t),
+ qdev_prop_uint32),
};
static void mps2_scc_class_init(ObjectClass *klass, const void *data)
diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c
index 910dce901b67..afbc32e99d94 100644
--- a/hw/net/rocker/rocker.c
+++ b/hw/net/rocker/rocker.c
@@ -1466,7 +1466,7 @@ static const Property rocker_properties[] = {
DEFINE_PROP_UINT64("switch_id", Rocker,
switch_id, 0),
DEFINE_PROP_ARRAY("ports", Rocker, fp_ports,
- fp_ports_peers, qdev_prop_netdev, NICPeers),
+ fp_ports_peers, qdev_prop_netdev),
};
static const VMStateDescription rocker_vmsd = {
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index 19f453fb7dfd..56194398742e 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -4377,7 +4377,7 @@ static const Property virtio_net_properties[] = {
DEFINE_PROP_BIT64("hash", VirtIONet, host_features,
VIRTIO_NET_F_HASH_REPORT, false),
DEFINE_PROP_ARRAY("ebpf-rss-fds", VirtIONet, nr_ebpf_rss_fds,
- ebpf_rss_fds, qdev_prop_string, char*),
+ ebpf_rss_fds, qdev_prop_string),
DEFINE_PROP_BIT64("guest_rsc_ext", VirtIONet, host_features,
VIRTIO_NET_F_RSC_EXT, false),
DEFINE_PROP_UINT32("rsc_interval", VirtIONet, rsc_timeout,
diff --git a/hw/nvram/xlnx-efuse.c b/hw/nvram/xlnx-efuse.c
index b1c9ee4980a0..99c16ce76f15 100644
--- a/hw/nvram/xlnx-efuse.c
+++ b/hw/nvram/xlnx-efuse.c
@@ -266,7 +266,7 @@ static const Property efuse_properties[] = {
DEFINE_PROP_UINT32("efuse-size", XlnxEFuse, efuse_size, 64 * 32),
DEFINE_PROP_BOOL("init-factory-tbits", XlnxEFuse, init_tbits, true),
DEFINE_PROP_ARRAY("read-only", XlnxEFuse, ro_bits_cnt, ro_bits,
- qdev_prop_uint32, uint32_t),
+ qdev_prop_uint32),
};
static void efuse_class_init(ObjectClass *klass, const void *data)
diff --git a/hw/nvram/xlnx-versal-efuse-ctrl.c b/hw/nvram/xlnx-versal-efuse-ctrl.c
index f5d5587cb657..101320b82fd9 100644
--- a/hw/nvram/xlnx-versal-efuse-ctrl.c
+++ b/hw/nvram/xlnx-versal-efuse-ctrl.c
@@ -740,7 +740,7 @@ static const Property efuse_ctrl_props[] = {
TYPE_XLNX_EFUSE, XlnxEFuse *),
DEFINE_PROP_ARRAY("pg0-lock",
XlnxVersalEFuseCtrl, extra_pg0_lock_n16,
- extra_pg0_lock_spec, qdev_prop_uint16, uint16_t),
+ extra_pg0_lock_spec, qdev_prop_uint16),
};
static void efuse_ctrl_class_init(ObjectClass *klass, const void *data)
diff --git a/hw/riscv/riscv_hart.c b/hw/riscv/riscv_hart.c
index 32fd39737ff6..132cf8737001 100644
--- a/hw/riscv/riscv_hart.c
+++ b/hw/riscv/riscv_hart.c
@@ -48,11 +48,9 @@ static const Property riscv_harts_props[] = {
* defined by "rnmi-exception-vector".
*/
DEFINE_PROP_ARRAY("rnmi-interrupt-vector", RISCVHartArrayState,
- num_rnmi_irqvec, rnmi_irqvec, qdev_prop_uint64,
- uint64_t),
+ num_rnmi_irqvec, rnmi_irqvec, qdev_prop_uint64),
DEFINE_PROP_ARRAY("rnmi-exception-vector", RISCVHartArrayState,
- num_rnmi_excpvec, rnmi_excpvec, qdev_prop_uint64,
- uint64_t),
+ num_rnmi_excpvec, rnmi_excpvec, qdev_prop_uint64),
DEFINE_PROP_LINK("memory", RISCVHartArrayState, memory,
TYPE_MEMORY_REGION, MemoryRegion *),
};
diff --git a/hw/virtio/virtio-iommu-pci.c b/hw/virtio/virtio-iommu-pci.c
index 7b5ffddc1e97..1f3a07c5d119 100644
--- a/hw/virtio/virtio-iommu-pci.c
+++ b/hw/virtio/virtio-iommu-pci.c
@@ -38,7 +38,7 @@ static const Property virtio_iommu_pci_properties[] = {
DEFINE_PROP_UINT32("class", VirtIOPCIProxy, class_code, 0),
DEFINE_PROP_ARRAY("reserved-regions", VirtIOIOMMUPCI,
vdev.nr_prop_resv_regions, vdev.prop_resv_regions,
- qdev_prop_reserved_region, ReservedRegion),
+ qdev_prop_reserved_region),
};
static void virtio_iommu_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
diff --git a/include/hw/block/block.h b/include/hw/block/block.h
index df941df19f26..70bf03a8de73 100644
--- a/include/hw/block/block.h
+++ b/include/hw/block/block.h
@@ -83,7 +83,7 @@ static inline unsigned int get_physical_block_exp(BlockConf *conf)
_conf.account_failed, ON_OFF_AUTO_AUTO), \
DEFINE_PROP_ARRAY("stats-intervals", _state, \
_conf.num_stats_intervals, _conf.stats_intervals, \
- qdev_prop_uint32, uint32_t)
+ qdev_prop_uint32)
#define DEFINE_BLOCK_PROPERTIES(_state, _conf) \
DEFINE_PROP_DRIVE("drive", _state, _conf.blk), \
diff --git a/include/hw/core/qdev-properties.h b/include/hw/core/qdev-properties.h
index 0c067170079d..39f95ce7a3c6 100644
--- a/include/hw/core/qdev-properties.h
+++ b/include/hw/core/qdev-properties.h
@@ -76,7 +76,6 @@ extern const PropertyInfo qdev_prop_size;
extern const PropertyInfo qdev_prop_string;
extern const PropertyInfo qdev_prop_on_off_auto;
extern const PropertyInfo qdev_prop_size32;
-extern const PropertyInfo qdev_prop_array;
extern const PropertyInfo qdev_prop_uint8_list;
extern const PropertyInfo qdev_prop_uint16_list;
extern const PropertyInfo qdev_prop_uint32_list;
@@ -148,15 +147,15 @@ extern const PropertyInfo qdev_prop_link_list;
* @_name: name of the array
* @_state: name of the device state structure type
* @_field: uint32_t field in @_state to hold the array length
- * @_arrayfield: field in @_state (of type '@_arraytype *') which
- * will point to the array
- * @_arrayprop: PropertyInfo defining what property the array elements have
- * @_arraytype: C type of the array elements
+ * @_arrayfield: field in @_state which will point to the array
+ * @_arrayprop: PropertyInfo for the array elements (e.g. qdev_prop_uint32);
+ * a corresponding list PropertyInfo named @_arrayprop##_list
+ * must exist
*
* Define device properties for a variable-length array _name. The array is
* represented as a list in the visitor interface.
*
- * @_arraytype is required to be movable with memcpy().
+ * The element type must be movable with memcpy().
*
* When the array property is set, the @_field member of the device
* struct is set to the array length, and @_arrayfield is set to point
@@ -166,12 +165,10 @@ extern const PropertyInfo qdev_prop_link_list;
* @_arrayfield memory.
*/
#define DEFINE_PROP_ARRAY(_name, _state, _field, \
- _arrayfield, _arrayprop, _arraytype) \
- DEFINE_PROP(_name, _state, _field, qdev_prop_array, uint32_t, \
+ _arrayfield, _arrayprop) \
+ DEFINE_PROP(_name, _state, _field, _arrayprop##_list, uint32_t, \
.set_default = true, \
.defval.u = 0, \
- .arrayinfo = &(_arrayprop), \
- .arrayfieldsize = sizeof(_arraytype), \
.arrayoffset = offsetof(_state, _arrayfield))
#define DEFINE_PROP_LINK(_name, _state, _field, _type, _ptr_type) \
@@ -183,10 +180,8 @@ extern const PropertyInfo qdev_prop_link_list;
* @_name: name of the array
* @_state: name of the device state structure type
* @_field: uint32_t field in @_state to hold the array length
- * @_arrayfield: field in @_state (of type '@_arraytype *') which
- * will point to the array
+ * @_arrayfield: field in @_state which will point to the array
* @_linktype: QOM type name of the link type
- * @_arraytype: C type of the array elements
*
* Define device properties for a variable-length array _name of links
* (i.e. this is the array version of DEFINE_PROP_LINK).
@@ -195,12 +190,10 @@ extern const PropertyInfo qdev_prop_link_list;
* where each string is the QOM path of the object to be linked.
*/
#define DEFINE_PROP_LINK_ARRAY(_name, _state, _field, _arrayfield, \
- _linktype, _arraytype) \
- DEFINE_PROP(_name, _state, _field, qdev_prop_array, uint32_t, \
+ _linktype) \
+ DEFINE_PROP(_name, _state, _field, qdev_prop_link_list, uint32_t, \
.set_default = true, \
.defval.u = 0, \
- .arrayinfo = &qdev_prop_link, \
- .arrayfieldsize = sizeof(_arraytype), \
.arrayoffset = offsetof(_state, _arrayfield), \
.link_type = _linktype)
diff --git a/tests/unit/test-qdev.c b/tests/unit/test-qdev.c
index 77c3eee71713..8cd004b1efab 100644
--- a/tests/unit/test-qdev.c
+++ b/tests/unit/test-qdev.c
@@ -23,7 +23,7 @@ static const Property my_dev_props[] = {
DEFINE_PROP_UINT32("u32", MyDev, prop_u32, 100),
DEFINE_PROP_STRING("string", MyDev, prop_string),
DEFINE_PROP_ARRAY("array-u32", MyDev, prop_array_u32_nb, prop_array_u32,
- qdev_prop_uint32, uint32_t),
+ qdev_prop_uint32),
};
static void my_dev_class_init(ObjectClass *oc, const void *data)
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 61/65] qdev: remove deprecated PropertyInfo.type and .enum_table fields
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (59 preceding siblings ...)
2026-10-20 10:46 ` [PATCH v7 60/65] qdev: simplify DEFINE_PROP_ARRAY and remove generic array PropertyInfo Marc-André Lureau
@ 2026-10-20 10:46 ` Marc-André Lureau
2026-10-20 10:46 ` [PATCH v7 62/65] hw/i386: convert PCSouthBridgeOption to QAPI enum Marc-André Lureau
` (3 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:46 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
Now that all PropertyInfo definitions use .qapi_type, remove the
legacy .type (string) and .enum_table fields from PropertyInfo, and
the .arrayinfo/.arrayfieldsize fields from Property.
Remove fallback branches in qdev_property_add_static() and
qdev_class_add_property() that used object_property_add() with
prop->info->type: these always use the QAPI-aware registration
path now. Simplify qdev_propinfo_enum_lookup(), prop_array_info()
and prop_array_elem_size() to use the new fields directly.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
hw/core/qdev-properties.c | 58 ++++++++++++---------------------------
include/hw/core/qdev-properties.h | 4 ---
2 files changed, 17 insertions(+), 45 deletions(-)
diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index 5c403cc2e57e..a121878467e1 100644
--- a/hw/core/qdev-properties.c
+++ b/hw/core/qdev-properties.c
@@ -103,11 +103,8 @@ static ObjectPropertyAccessor *field_prop_setter(const PropertyInfo *info)
const QEnumLookup *qdev_propinfo_enum_lookup(const PropertyInfo *info)
{
- if (info->qapi_type) {
- assert(info->qapi_type->lookup);
- return info->qapi_type->lookup;
- }
- return info->enum_table;
+ assert(info->qapi_type->lookup);
+ return info->qapi_type->lookup;
}
void qdev_propinfo_get_enum(Object *obj, Visitor *v, const char *name,
@@ -668,18 +665,12 @@ struct ArrayElementList {
static const PropertyInfo *prop_array_info(const Property *prop)
{
- if (prop->info->element_info) {
- return prop->info->element_info;
- }
- return prop->arrayinfo;
+ return prop->info->element_info;
}
static int prop_array_elem_size(const Property *prop)
{
- if (prop->info->element_size) {
- return prop->info->element_size;
- }
- return prop->arrayfieldsize;
+ return prop->info->element_size;
}
/*
@@ -1224,20 +1215,13 @@ void qdev_property_add_static(DeviceState *dev, const Property *prop)
const QAPITypeInfo *qapi_type = qdev_prop_qapi_type(prop);
assert(!prop->info->create);
+ assert(qapi_type);
- if (qapi_type) {
- op = object_property_add_qapi(obj, prop->name, qapi_type,
- field_prop_getter(prop->info),
- field_prop_setter(prop->info),
- prop->info->release,
- (Property *)prop);
- } else {
- op = object_property_add(obj, prop->name, prop->info->type,
- field_prop_getter(prop->info),
- field_prop_setter(prop->info),
- prop->info->release,
- (Property *)prop);
- }
+ op = object_property_add_qapi(obj, prop->name, qapi_type,
+ field_prop_getter(prop->info),
+ field_prop_setter(prop->info),
+ prop->info->release,
+ (Property *)prop);
object_property_set_description(obj, prop->name,
prop->info->description);
@@ -1261,21 +1245,13 @@ static void qdev_class_add_property(DeviceClass *klass, const char *name,
} else {
const QAPITypeInfo *qapi_type = qdev_prop_qapi_type(prop);
- if (qapi_type) {
- op = object_class_property_add_qapi(oc,
- name, qapi_type,
- field_prop_getter(prop->info),
- field_prop_setter(prop->info),
- prop->info->release,
- (Property *)prop);
- } else {
- op = object_class_property_add(oc,
- name, prop->info->type,
- field_prop_getter(prop->info),
- field_prop_setter(prop->info),
- prop->info->release,
- (Property *)prop);
- }
+ assert(qapi_type);
+ op = object_class_property_add_qapi(oc,
+ name, qapi_type,
+ field_prop_getter(prop->info),
+ field_prop_setter(prop->info),
+ prop->info->release,
+ (Property *)prop);
}
if (prop->set_default) {
prop->info->set_default_value(op, prop);
diff --git a/include/hw/core/qdev-properties.h b/include/hw/core/qdev-properties.h
index 39f95ce7a3c6..2267e734d1fd 100644
--- a/include/hw/core/qdev-properties.h
+++ b/include/hw/core/qdev-properties.h
@@ -23,17 +23,13 @@ struct Property {
int64_t i;
uint64_t u;
} defval;
- const PropertyInfo *arrayinfo;
int arrayoffset;
- int arrayfieldsize;
uint8_t bitnr;
bool set_default;
};
struct PropertyInfo {
- const char *type;
const char *description;
- const QEnumLookup *enum_table;
const QAPITypeInfo *qapi_type;
const struct PropertyInfo *element_info;
int element_size;
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 62/65] hw/i386: convert PCSouthBridgeOption to QAPI enum
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (60 preceding siblings ...)
2026-10-20 10:46 ` [PATCH v7 61/65] qdev: remove deprecated PropertyInfo.type and .enum_table fields Marc-André Lureau
@ 2026-10-20 10:46 ` Marc-André Lureau
2026-10-20 10:46 ` [PATCH v7 63/65] qom: remove old enum property registration API Marc-André Lureau
` (2 subsequent siblings)
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:46 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
Move PCSouthBridgeOption from a hand-rolled C enum to a proper QAPI
enum in qapi/machine.json.
This gives the x-south-bridge property a generated type_info with a
valid masked_name, so it appears in query-qmp-schema introspection and
the qapi-type field of qom-list-properties output.
The south_bridge/default_south_bridge fields change from const char *
to PCSouthBridgeOption, with an explicit mapping table from enum value
to QOM device type name.
Enum values are changed: "PIIX3"->"ppix3", "piix4-isa"->"piix4", this
is under a x-property, so shouldn't be a breaking change.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
hw/i386/pc_piix.c | 61 ++++++++++++++++------------------------------------
include/hw/i386/pc.h | 4 ++--
qapi/machine.json | 14 ++++++++++++
3 files changed, 34 insertions(+), 45 deletions(-)
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 63c4667ea372..5a94a34166d8 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -47,6 +47,7 @@
#include "hw/acpi/acpi.h"
#include "hw/vfio/types.h"
#include "qapi/error.h"
+#include "qapi/qapi-type-infos-machine.h"
#include "qemu/error-report.h"
#include "system/xen.h"
#ifdef CONFIG_XEN
@@ -75,6 +76,11 @@ static GlobalProperty pc_piix_compat_defaults[] = {
static const size_t pc_piix_compat_defaults_len =
G_N_ELEMENTS(pc_piix_compat_defaults);
+static const char *pc_south_bridge_type[] = {
+ [PC_SOUTH_BRIDGE_OPTION_PIIX3] = TYPE_PIIX3_DEVICE,
+ [PC_SOUTH_BRIDGE_OPTION_PIIX4] = TYPE_PIIX4_PCI_DEVICE,
+};
+
/*
* Return the global irq number corresponding to a given device irq
* pin. We could also use the bus number to have a more precise mapping.
@@ -236,7 +242,8 @@ static void pc_init1(MachineState *machine, const char *pci_type)
gsi_state = pc_gsi_create(&x86ms->gsi, true);
- pci_dev = pci_new_multifunction(-1, pcms->south_bridge);
+ pci_dev = pci_new_multifunction(-1,
+ pc_south_bridge_type[pcms->south_bridge]);
object_property_set_bool(OBJECT(pci_dev), "has-usb",
machine_usb(machine), &error_abort);
object_property_set_bool(OBJECT(pci_dev), "has-acpi",
@@ -317,51 +324,18 @@ static void pc_init1(MachineState *machine, const char *pci_type)
}
}
-typedef enum PCSouthBridgeOption {
- PC_SOUTH_BRIDGE_OPTION_PIIX3,
- PC_SOUTH_BRIDGE_OPTION_PIIX4,
- PC_SOUTH_BRIDGE_OPTION_MAX,
-} PCSouthBridgeOption;
-
-static const QEnumLookup PCSouthBridgeOption_lookup = {
- .array = (const char *const[]) {
- [PC_SOUTH_BRIDGE_OPTION_PIIX3] = TYPE_PIIX3_DEVICE,
- [PC_SOUTH_BRIDGE_OPTION_PIIX4] = TYPE_PIIX4_PCI_DEVICE,
- },
- .size = PC_SOUTH_BRIDGE_OPTION_MAX
-};
-
static int pc_get_south_bridge(Object *obj, Error **errp)
{
PCMachineState *pcms = PC_MACHINE(obj);
- int i;
- for (i = 0; i < PCSouthBridgeOption_lookup.size; i++) {
- if (g_strcmp0(PCSouthBridgeOption_lookup.array[i],
- pcms->south_bridge) == 0) {
- return i;
- }
- }
-
- error_setg(errp, "Invalid south bridge value set");
- return 0;
+ return pcms->south_bridge;
}
static void pc_set_south_bridge(Object *obj, int value, Error **errp)
{
PCMachineState *pcms = PC_MACHINE(obj);
- if (value < 0) {
- error_setg(errp, "Value can't be negative");
- return;
- }
-
- if (value >= PCSouthBridgeOption_lookup.size) {
- error_setg(errp, "Value too big");
- return;
- }
-
- pcms->south_bridge = PCSouthBridgeOption_lookup.array[value];
+ pcms->south_bridge = value;
}
#ifdef CONFIG_XEN
@@ -398,7 +372,7 @@ static void pc_i440fx_machine_options(MachineClass *m)
{
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
ObjectClass *oc = OBJECT_CLASS(m);
- pcmc->default_south_bridge = TYPE_PIIX3_DEVICE;
+ pcmc->default_south_bridge = PC_SOUTH_BRIDGE_OPTION_PIIX3;
pcmc->pci_root_uid = 0;
pcmc->default_cpu_version = 1;
@@ -413,12 +387,13 @@ static void pc_i440fx_machine_options(MachineClass *m)
machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE);
machine_class_allow_dynamic_sysbus_dev(m, TYPE_UEFI_VARS_X64);
- object_class_property_add_enum(oc, "x-south-bridge", "PCSouthBridgeOption",
- &PCSouthBridgeOption_lookup,
- pc_get_south_bridge,
- pc_set_south_bridge);
- object_class_property_set_description(oc, "x-south-bridge",
- "Use a different south bridge than PIIX3");
+ object_class_property_add_qapi_enum(oc, QAPI_ENUM_PROP(
+ .name = "x-south-bridge",
+ .description = "Use a different south bridge than PIIX3",
+ .qapi_type = &PCSouthBridgeOption_type_info,
+ .get = pc_get_south_bridge,
+ .set = pc_set_south_bridge,
+ ));
compat_props_add(m->compat_props,
pc_piix_compat_defaults, pc_piix_compat_defaults_len);
}
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 8edec62a1af2..3afd376116b1 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -47,7 +47,7 @@ typedef struct PCMachineState {
uint64_t max_ram_below_4g;
OnOffAuto vmport;
SmbiosEntryPointType smbios_entry_point_type;
- const char *south_bridge;
+ PCSouthBridgeOption south_bridge;
bool acpi_build_enabled;
bool wdat_enabled;
@@ -94,7 +94,7 @@ struct PCMachineClass {
/* Device configuration: */
bool pci_enabled;
- const char *default_south_bridge;
+ PCSouthBridgeOption default_south_bridge;
/* Compat options: */
diff --git a/qapi/machine.json b/qapi/machine.json
index 46b6935ab0b8..cc028e890ae5 100644
--- a/qapi/machine.json
+++ b/qapi/machine.json
@@ -462,6 +462,20 @@
{ 'enum': 'Pca9554PinState',
'data': ['low', 'high'] }
+##
+# @PCSouthBridgeOption:
+#
+# South bridge chipset option for PC i440FX machines.
+#
+# @piix3: Intel PIIX3 (default)
+#
+# @piix4: Intel PIIX4
+#
+# Since: 11.2
+##
+{ 'enum': 'PCSouthBridgeOption',
+ 'data': ['piix3', 'piix4'] }
+
##
# @inject-nmi:
# Injects a Non-Maskable Interrupt (machine specific: for example
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 63/65] qom: remove old enum property registration API
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (61 preceding siblings ...)
2026-10-20 10:46 ` [PATCH v7 62/65] hw/i386: convert PCSouthBridgeOption to QAPI enum Marc-André Lureau
@ 2026-10-20 10:46 ` Marc-André Lureau
2026-10-20 10:46 ` [PATCH v7 64/65] qom: use QAPITypeInfo in object_property_get_enum Marc-André Lureau
2026-10-20 10:46 ` [PATCH v7 65/65] tests/qmp-cmd-test: assert qapi-type resolves in query-qmp-schema Marc-André Lureau
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:46 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
Now that all callers use object_class_property_add_qapi_enum(), remove
the legacy object_property_add_enum() and object_class_property_add_enum()
functions along with their EnumProperty struct and property_get_enum /
property_set_enum helpers.
Simplify object_property_get_enum() to assert on qapi_type rather than
falling back to the old EnumProperty opaque data.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
include/qom/object.h | 45 ++--------------------------
qom/object.c | 82 ++--------------------------------------------------
2 files changed, 4 insertions(+), 123 deletions(-)
diff --git a/include/qom/object.h b/include/qom/object.h
index 29cbd84b8d03..a9bbc44cfcc9 100644
--- a/include/qom/object.h
+++ b/include/qom/object.h
@@ -1697,12 +1697,12 @@ char *object_get_canonical_path(const Object *obj);
* because it was ambiguous, or %NULL. Set to %false on success.
*
* There are two types of supported paths--absolute paths and partial paths.
- *
+ *
* Absolute paths are derived from the root object and can follow child<> or
* link<> properties. Since they can follow link<> properties, they can be
* arbitrarily long. Absolute paths look like absolute filenames and are
* prefixed with a leading slash.
- *
+ *
* Partial paths look like relative filenames. They do not begin with a
* prefix. The matching rules for partial paths are subtle but designed to make
* specifying objects easy. At each level of the composition tree, the partial
@@ -1986,47 +1986,6 @@ ObjectProperty *object_class_property_add_bool(ObjectClass *klass,
bool (*get)(Object *, Error **),
void (*set)(Object *, bool, Error **));
-/**
- * object_property_add_enum:
- * @obj: the object to add a property to
- * @name: the name of the property
- * @typename: the name of the enum data type
- * @lookup: enum value namelookup table
- * @get: the getter or %NULL if the property is write-only.
- * @set: the setter or %NULL if the property is read-only
- *
- * Add an enum property using getters/setters. This function will add a
- * property of type '@typename'.
- *
- * Returns: The newly added property on success, or %NULL on failure.
- */
-ObjectProperty *object_property_add_enum(Object *obj, const char *name,
- const char *typename,
- const QEnumLookup *lookup,
- int (*get)(Object *, Error **),
- void (*set)(Object *, int, Error **));
-
-/**
- * object_class_property_add_enum:
- * @klass: the object class to add a property to
- * @name: the name of the property
- * @typename: the name of the enum data type
- * @lookup: enum value namelookup table
- * @get: the getter or %NULL if the property is write-only.
- * @set: the setter or %NULL if the property is read-only
- *
- * Add an enum property using getters/setters. This function will add a
- * property of type '@typename'.
- *
- * Returns: The newly added property on success, or %NULL on failure.
- */
-ObjectProperty *object_class_property_add_enum(ObjectClass *klass,
- const char *name,
- const char *typename,
- const QEnumLookup *lookup,
- int (*get)(Object *, Error **),
- void (*set)(Object *, int, Error **));
-
/**
* struct QapiEnumProp: Descriptor for a property backed by a QAPI enum type
*
diff --git a/qom/object.c b/qom/object.c
index cf18880c6c0c..791d981dc689 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -1774,12 +1774,6 @@ uint64_t object_property_get_uint(Object *obj, const char *name,
return retval;
}
-typedef struct EnumProperty {
- const QEnumLookup *lookup;
- int (*get)(Object *, Error **);
- void (*set)(Object *, int, Error **);
-} EnumProperty;
-
int object_property_get_enum(Object *obj, const char *name,
const char *typename, Error **errp)
{
@@ -1803,12 +1797,8 @@ int object_property_get_enum(Object *obj, const char *name,
return -1;
}
- if (prop->qapi_type) {
- ret = qapi_enum_parse(prop->qapi_type->lookup, str, -1, errp);
- } else {
- EnumProperty *enumprop = prop->opaque;
- ret = qapi_enum_parse(enumprop->lookup, str, -1, errp);
- }
+ assert(prop->qapi_type);
+ ret = qapi_enum_parse(prop->qapi_type->lookup, str, -1, errp);
g_free(str);
return ret;
@@ -2543,74 +2533,6 @@ object_class_property_add_bool(ObjectClass *klass, const char *name,
prop);
}
-static void property_get_enum(Object *obj, Visitor *v, const char *name,
- void *opaque, Error **errp)
-{
- EnumProperty *prop = opaque;
- int value;
- Error *err = NULL;
-
- value = prop->get(obj, &err);
- if (err) {
- error_propagate(errp, err);
- return;
- }
-
- visit_type_enum(v, name, &value, prop->lookup, errp);
-}
-
-static void property_set_enum(Object *obj, Visitor *v, const char *name,
- void *opaque, Error **errp)
-{
- EnumProperty *prop = opaque;
- int value;
-
- if (!visit_type_enum(v, name, &value, prop->lookup, errp)) {
- return;
- }
- prop->set(obj, value, errp);
-}
-
-ObjectProperty *
-object_property_add_enum(Object *obj, const char *name,
- const char *typename,
- const QEnumLookup *lookup,
- int (*get)(Object *, Error **),
- void (*set)(Object *, int, Error **))
-{
- EnumProperty *prop = g_malloc(sizeof(*prop));
-
- prop->lookup = lookup;
- prop->get = get;
- prop->set = set;
-
- return object_property_add(obj, name, typename,
- get ? property_get_enum : NULL,
- set ? property_set_enum : NULL,
- property_release_data,
- prop);
-}
-
-ObjectProperty *
-object_class_property_add_enum(ObjectClass *klass, const char *name,
- const char *typename,
- const QEnumLookup *lookup,
- int (*get)(Object *, Error **),
- void (*set)(Object *, int, Error **))
-{
- EnumProperty *prop = g_malloc(sizeof(*prop));
-
- prop->lookup = lookup;
- prop->get = get;
- prop->set = set;
-
- return object_class_property_add(klass, name, typename,
- get ? property_get_enum : NULL,
- set ? property_set_enum : NULL,
- NULL,
- prop);
-}
-
static void get_qapi_enum(Object *obj, Visitor *v, const char *name,
void *opaque, Error **errp)
{
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 64/65] qom: use QAPITypeInfo in object_property_get_enum
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (62 preceding siblings ...)
2026-10-20 10:46 ` [PATCH v7 63/65] qom: remove old enum property registration API Marc-André Lureau
@ 2026-10-20 10:46 ` Marc-André Lureau
2026-10-20 10:46 ` [PATCH v7 65/65] tests/qmp-cmd-test: assert qapi-type resolves in query-qmp-schema Marc-André Lureau
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:46 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
The typename parameter becomes a QAPITypeInfo pointer, and the
validation compares prop->qapi_type against it instead of matching
prop->type strings.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
hw/core/machine-qmp-cmds.c | 4 +++-
include/qom/object.h | 4 ++--
qom/object.c | 8 ++++----
tests/unit/check-qom-proplist.c | 6 +++---
4 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c
index 3fee45d568da..6b425baeb2da 100644
--- a/hw/core/machine-qmp-cmds.c
+++ b/hw/core/machine-qmp-cmds.c
@@ -18,6 +18,7 @@
#include "qapi/qapi-commands-accelerator.h"
#include "qapi/qapi-commands-machine.h"
#include "qobject/qobject.h"
+#include "qapi/qapi-type-infos-common.h"
#include "qapi/qobject-input-visitor.h"
#include "qapi/type-helpers.h"
#include "qemu/uuid.h"
@@ -252,7 +253,8 @@ static int query_memdev(Object *obj, void *opaque)
} else {
m->has_reserve = true;
}
- m->policy = object_property_get_enum(obj, "policy", "HostMemPolicy",
+ m->policy = object_property_get_enum(obj, "policy",
+ &HostMemPolicy_type_info,
&error_abort);
host_nodes = object_property_get_qobject(obj,
"host-nodes",
diff --git a/include/qom/object.h b/include/qom/object.h
index a9bbc44cfcc9..9f937e30dae5 100644
--- a/include/qom/object.h
+++ b/include/qom/object.h
@@ -1566,7 +1566,7 @@ uint64_t object_property_get_uint(Object *obj, const char *name,
* object_property_get_enum:
* @obj: the object
* @name: the name of the property
- * @typename: the name of the enum data type
+ * @type_info: the QAPITypeInfo of the enum
* @errp: returns an error if this function fails
*
* Returns: the value of the property, converted to an integer (which
@@ -1574,7 +1574,7 @@ uint64_t object_property_get_uint(Object *obj, const char *name,
* value is not an enum).
*/
int object_property_get_enum(Object *obj, const char *name,
- const char *typename, Error **errp);
+ const QAPITypeInfo *type_info, Error **errp);
/**
* object_property_set:
diff --git a/qom/object.c b/qom/object.c
index 791d981dc689..40b569d4d574 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -1775,7 +1775,7 @@ uint64_t object_property_get_uint(Object *obj, const char *name,
}
int object_property_get_enum(Object *obj, const char *name,
- const char *typename, Error **errp)
+ const QAPITypeInfo *type_info, Error **errp)
{
char *str;
int ret;
@@ -1785,10 +1785,10 @@ int object_property_get_enum(Object *obj, const char *name,
return -1;
}
- if (!g_str_equal(prop->type, typename)) {
+ if (prop->qapi_type != type_info) {
error_setg(errp, "Property %s on %s is not '%s' enum type",
- name, object_class_get_name(
- object_get_class(obj)), typename);
+ name, object_class_get_name(object_get_class(obj)),
+ type_info->name);
return -1;
}
diff --git a/tests/unit/check-qom-proplist.c b/tests/unit/check-qom-proplist.c
index 69155e720751..1cb48c7490ef 100644
--- a/tests/unit/check-qom-proplist.c
+++ b/tests/unit/check-qom-proplist.c
@@ -582,14 +582,14 @@ static void test_dummy_getenum(void)
val = object_property_get_enum(OBJECT(dobj),
"av",
- "DummyAnimal",
+ &dummy_animal_qapi_type_info,
&error_abort);
g_assert(val == DUMMY_PLATYPUS);
/* A bad enum type name */
val = object_property_get_enum(OBJECT(dobj),
"av",
- "BadAnimal",
+ &dummy_str_qapi_type_info,
&err);
g_assert(val == -1);
error_free_or_abort(&err);
@@ -597,7 +597,7 @@ static void test_dummy_getenum(void)
/* A non-enum property name */
val = object_property_get_enum(OBJECT(dobj),
"iv",
- "DummyAnimal",
+ &dummy_animal_qapi_type_info,
&err);
g_assert(val == -1);
error_free_or_abort(&err);
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH v7 65/65] tests/qmp-cmd-test: assert qapi-type resolves in query-qmp-schema
2026-10-20 10:45 [PATCH v7 00/65] Hi marcandre.lureau
` (63 preceding siblings ...)
2026-10-20 10:46 ` [PATCH v7 64/65] qom: use QAPITypeInfo in object_property_get_enum Marc-André Lureau
@ 2026-10-20 10:46 ` Marc-André Lureau
64 siblings, 0 replies; 69+ messages in thread
From: Marc-André Lureau @ 2026-10-20 10:46 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Michael Roth, John Snow, Peter Maydell,
Mauro Carvalho Chehab, Pierrick Bouvier, Paolo Bonzini,
Daniel P. Berrangé, Kostiantyn Kostiuk, Eric Blake,
David Hildenbrand, Igor Mammedov, Edgar E. Iglesias, Jason Wang,
Marcelo Tosatti, kvm, Alberto Garcia, Kevin Wolf, Hanna Reitz,
Philippe Mathieu-Daudé, Zhao Liu, Jonathan Cameron,
Junjie Cao, Anisa Su, Elena Ufimtseva, Jagannathan Raman,
John Levon, Thanos Makatos, Cédric Le Goater, Cornelia Huck,
Eric Farman, Matthew Rosato, Richard Henderson, Ilya Leoshkevich,
qemu-block, linux-cxl, qemu-s390x, Michael S. Tsirkin,
Sergio Lopez, qemu-arm, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Chao Liu,
qemu-riscv, Song Gao, Bibo Mao, Xianglai Li, Jiaxun Yang,
Pedro Barbuda, Mohamed Mediouni, Nicholas Piggin,
Harsh Prateek Bora, Amit Machhiwal, qemu-ppc, Zhang Chen,
Li Zhijian, Alistair Francis, Alexander Graf, Gonglei (Arei),
zhenwei pi, Ani Sinha, Luc Michel, Cédric Le Goater,
Jamin Lin, Kane Chen, Samuel Tardieu, Denis V. Lunev,
FangSheng Huang, Tyrone Ting, Hao Wu, Keith Busch, Klaus Jensen,
Jesper Devantier, Aditya Gupta, Glenn Miles, Conor Dooley,
Sebastian Huber, Halil Pasic, Christian Borntraeger, Jason Herne,
Titus Rwantare, Stefano Stabellini, Anthony PERARD, Peter Xu,
Chinmay Rath, Hendrik Brueckner, xen-devel, Roman Bolshakov,
Phil Dennis-Jordan, Fam Zheng, Farhan Ali, Alex Williamson,
Tao Tang, Stefan Berger, Fabiano Rosas, Mark Cave-Ayland,
Artyom Tarasenko, Yoshinori Sato, Jiri Pirko, Eric Auger,
Laurent Vivier, Marc-André Lureau
For every QOM type returned by qom-list-types, call qom-list-properties
and verify that each property's qapi-type value (when present) maps to
a valid entry in the query-qmp-schema introspection output.
The test is gated behind g_test_slow() since it iterates all registered
QOM types.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
tests/qtest/qmp-cmd-test.c | 55 +++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 54 insertions(+), 1 deletion(-)
diff --git a/tests/qtest/qmp-cmd-test.c b/tests/qtest/qmp-cmd-test.c
index 279a8f5614e9..acb7b0dd6a9f 100644
--- a/tests/qtest/qmp-cmd-test.c
+++ b/tests/qtest/qmp-cmd-test.c
@@ -15,6 +15,7 @@
#include "qapi/error.h"
#include "qapi/qapi-visit-introspect.h"
#include "qobject/qdict.h"
+#include "qobject/qlist.h"
#include "qapi/qobject-input-visitor.h"
const char common_args[] = "-nodefaults -machine none";
@@ -131,6 +132,8 @@ typedef struct {
GHashTable *hash;
} QmpSchema;
+static QmpSchema schema;
+
static void qmp_schema_init(QmpSchema *schema)
{
QDict *resp;
@@ -343,9 +346,56 @@ static void test_object_add_failure_modes(void)
qtest_quit(qts);
}
+static void test_qapi_type(void)
+{
+ QTestState *qts;
+ g_autoptr(QDict) resp = NULL;
+ QList *types;
+ QListEntry *type_entry, *prop_entry;
+
+ qts = qtest_init(common_args);
+
+ resp = qtest_qmp(qts,
+ "{ 'execute': 'qom-list-types',"
+ " 'arguments': { 'abstract': true } }");
+ g_assert(qdict_haskey(resp, "return"));
+ types = qdict_get_qlist(resp, "return");
+
+ QLIST_FOREACH_ENTRY(types, type_entry) {
+ QDict *type = qobject_to(QDict, qlist_entry_obj(type_entry));
+ const char *name = qdict_get_str(type, "name");
+ g_autoptr(QDict) props_resp = NULL;
+ QList *props;
+
+ props_resp = qtest_qmp(qts,
+ "{ 'execute': 'qom-list-properties',"
+ " 'arguments': { 'typename': %s } }",
+ name);
+ if (!qdict_haskey(props_resp, "return")) {
+ continue;
+ }
+ props = qdict_get_qlist(props_resp, "return");
+
+ QLIST_FOREACH_ENTRY(props, prop_entry) {
+ QDict *prop = qobject_to(QDict, qlist_entry_obj(prop_entry));
+ const char *qapi_type = qdict_get_try_str(prop, "qapi-type");
+ const char *propname = qdict_get_str(prop, "name");
+ const char *ty = qdict_get_str(prop, "type");
+
+ if (qapi_type) {
+ g_assert_nonnull(qmp_schema_lookup(&schema, qapi_type));
+ } else if (!g_str_has_prefix(ty, "child<") &&
+ !g_str_has_prefix(ty, "link<")) {
+ g_test_message("%s.%s %s has no associated qapi-type",
+ name, propname, ty);
+ }
+ }
+ }
+ qtest_quit(qts);
+}
+
int main(int argc, char *argv[])
{
- QmpSchema schema;
int ret;
g_test_init(&argc, &argv, NULL);
@@ -355,6 +405,9 @@ int main(int argc, char *argv[])
qtest_add_func("qmp/object-add-failure-modes",
test_object_add_failure_modes);
+ if (g_test_slow()) {
+ qtest_add_func("qmp/qapi-type", test_qapi_type);
+ }
ret = g_test_run();
--
2.56.0.116.g6de20f6092dc
^ permalink raw reply related [flat|nested] 69+ messages in thread