qdev: Typed array properties for better QOM introspection
Subsystems (2)
v3 cover qdev: Typed array properties for better QOM introspection
In my "[PATCH v8 RESEND 00/56] qom/qdev: associate properties with QAPI schema types", I noted under "Changes in v8":
* Drop typed array PropertyInfos
Why? They complicate matters, and I ran out of time.
This series brings them back. It's an updated version of PATCH 59+60 and a small part of PATCH 61 from Marc-André's v7. I managed to do without the QAPI generator changes from v7's PATCH 07+09.
With this applied, @qapi-type is always present, and the QAPI schema reflects that.
Based-on: <[email protected]>
v3:
* PATCH 3: Update tests/qtest/qmp-cmd-test.c
v2:
* PATCH 1: Fix qdev_prop_link_array.qapi_type, expand tabs (Marc-André)
* PATCH 3: New
Marc-André Lureau (2):
qdev: Convert array properties to QAPI-aware registration
qdev: Remove unused DEFINE_PROP_ARRAY parameter _arraytype
Markus Armbruster (1):
qapi/qom: Make @qapi-type mandatory in output of qom-list etc.
qapi/qom.json | 10 ++-- hw/core/qdev-prop-internal.h | 19 +++++++ hw/display/apple-gfx.h | 1 + include/hw/block/block.h | 2 +- include/hw/core/qdev-properties-system.h | 2 + include/hw/core/qdev-properties.h | 37 +++++++------- hw/core/qdev-properties-system.c | 6 +++ hw/core/qdev-properties.c | 64 ++++++++++++++---------- 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 +- tests/qtest/qmp-cmd-test.c | 9 +--- tests/unit/test-qdev.c | 2 +- hw/display/apple-gfx-mmio.m | 2 +- hw/display/apple-gfx-pci.m | 2 +- hw/display/apple-gfx.m | 6 +++ 25 files changed, 115 insertions(+), 81 deletions(-)
Signature · 1 line
2.55.0
PATCH v3 1/3 qdev: Convert array properties to QAPI-aware registration
From: Marc-André Lureau <[email protected]>
Add element_info and element_size fields to PropertyInfo.
Add typed array PropertyInfo definitions. Each one knows its element type at compile time through the new element_info and element_size fields of PropertyInfo.
Update DEFINE_PROP_ARRAY() to use them instead of the generic qdev_prop_array.
Use PropertyInfo fields element_info and element_size instead of Property fields arrayinfo and arrayfieldsize. Remove arrayinfo and arrayfieldsize.
Infrastructure changes:
- 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
--- hw/core/qdev-prop-internal.h | 19 +++++++ hw/display/apple-gfx.h | 1 + include/hw/core/qdev-properties-system.h | 2 + include/hw/core/qdev-properties.h | 23 +++++---- hw/core/qdev-properties-system.c | 6 +++ hw/core/qdev-properties.c | 64 ++++++++++++++---------- hw/display/apple-gfx.m | 6 +++ 7 files changed, 85 insertions(+), 36 deletions(-)
hw/core/qdev-prop-internal.h +19 -0
@@ -25,4 +25,23 @@ 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); + +#define DEFINE_PROP_ARRAY_INFO (_prop_info, _c_type, _type_info) \ + { \ + .type = "list", \ + .qapi_type = (_type_info), \ + .element_info = &(_prop_info), \ + .element_size = sizeof(_c_type), \ + .get = get_prop_array, \ + .set = set_prop_array, \ + .release = release_prop_array, \ + .set_default_value = default_prop_array, \ + } +#endif
hw/display/apple-gfx.h +1 -0
@@ -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_array;#endif
include/hw/core/qdev-properties-system.h +2 -0
@@ -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_array; +extern const PropertyInfo qdev_prop_reserved_region_array;extern const PropertyInfo qdev_prop_pci_devfn;extern const PropertyInfo qdev_prop_blocksize;extern const PropertyInfo qdev_prop_pci_host_devaddr;
include/hw/core/qdev-properties.h +13 -10
@@ -23,9 +23,7 @@ struct Property {int64_t i;uint64_t u; } defval; -const PropertyInfo *arrayinfo;int arrayoffset; -int arrayfieldsize;uint8_t bitnr;bool set_default; };
@@ -34,6 +32,8 @@ struct PropertyInfo {const char *type;const char *description;const QAPITypeInfo *qapi_type; +const struct PropertyInfo *element_info; +size_t 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);
@@ -73,8 +73,13 @@ 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_array; +extern const PropertyInfo qdev_prop_uint16_array; +extern const PropertyInfo qdev_prop_uint32_array; +extern const PropertyInfo qdev_prop_uint64_array; +extern const PropertyInfo qdev_prop_string_array;extern const PropertyInfo qdev_prop_link; +extern const PropertyInfo qdev_prop_link_array;#define DEFINE_PROP (_name, _state, _field, _prop, _type, ...) { \ .name = (_name), \
@@ -141,7 +146,9 @@ extern const PropertyInfo qdev_prop_link;* @_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 +* @_arrayprop: PropertyInfo for the array elements (e.g. qdev_prop_uint32); +* a corresponding array PropertyInfo named @_arrayprop##_array +* must exist * @_arraytype: C type of the array elements * * Define device properties for a variable-length array _name. The array is
@@ -158,11 +165,9 @@ extern const PropertyInfo qdev_prop_link;*/ #define DEFINE_PROP_ARRAY (_name, _state, _field, \ _arrayfield, _arrayprop, _arraytype) \ - DEFINE_PROP(_name, _state, _field, qdev_prop_array, uint32_t, \ + DEFINE_PROP(_name, _state, _field, _arrayprop##_array, 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) \
@@ -187,11 +192,9 @@ extern const PropertyInfo qdev_prop_link;*/ #define DEFINE_PROP_LINK_ARRAY (_name, _state, _field, _arrayfield, \ _linktype, _arraytype) \ - DEFINE_PROP(_name, _state, _field, qdev_prop_array, uint32_t, \ + DEFINE_PROP(_name, _state, _field, qdev_prop_link_array, uint32_t, \ .set_default = true, \ .defval.u = 0, \ - .arrayinfo = &qdev_prop_link, \ - .arrayfieldsize = sizeof(_arraytype), \ .arrayoffset = offsetof(_state, _arrayfield), \ .link_type = _linktype)
hw/core/qdev-properties-system.c +6 -0
@@ -486,6 +486,8 @@ const PropertyInfo qdev_prop_netdev = { .set = set_netdev, }; +const PropertyInfo qdev_prop_netdev_array = +DEFINE_PROP_ARRAY_INFO (qdev_prop_netdev, NICPeers, &strList_type_info);/* --- audiodev --- */ static void get_audiodev(Object *obj, Visitor *v, const char* name,
@@ -837,6 +839,10 @@ const PropertyInfo qdev_prop_reserved_region = { .set = set_reserved_region, }; +const PropertyInfo qdev_prop_reserved_region_array = +DEFINE_PROP_ARRAY_INFO (qdev_prop_reserved_region, ReservedRegion, + &strList_type_info); +/* --- pci address --- */ /*
hw/core/qdev-properties.c +38 -26
152 lines not on this page · raw message
hw/display/apple-gfx.m +6 -0
@@ -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"
@@ -880,3 +881,8 @@ 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_array = + DEFINE_PROP_ARRAY_INFO(qdev_prop_apple_gfx_display_mode, + AppleGFXDisplayMode, + &strList_type_info);
Signature · 1 line
2.55.0
PATCH v3 2/3 qdev: Remove unused DEFINE_PROP_ARRAY parameter _arraytype
In reply to Markus ArmbrusterFrom: Marc-André Lureau <[email protected]>
--- include/hw/block/block.h | 2 +- include/hw/core/qdev-properties.h | 14 +++++--------- 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 +- tests/unit/test-qdev.c | 2 +- hw/display/apple-gfx-mmio.m | 2 +- hw/display/apple-gfx-pci.m | 2 +- 17 files changed, 25 insertions(+), 31 deletions(-)
include/hw/block/block.h +1 -1
@@ -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), \
include/hw/core/qdev-properties.h +5 -9
@@ -144,17 +144,15 @@ extern const PropertyInfo qdev_prop_link_array;* @_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 * @_arrayprop: PropertyInfo for the array elements (e.g. qdev_prop_uint32); * a corresponding array PropertyInfo named @_arrayprop##_array * must exist -* @_arraytype: C type of the array elements * * 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
@@ -164,7 +162,7 @@ extern const PropertyInfo qdev_prop_link_array;* @_arrayfield memory. */ #define DEFINE_PROP_ARRAY (_name, _state, _field, \ - _arrayfield, _arrayprop, _arraytype) \ + _arrayfield, _arrayprop) \ DEFINE_PROP(_name, _state, _field, _arrayprop##_array, uint32_t, \ .set_default = true, \ .defval.u = 0, \
@@ -179,10 +177,8 @@ extern const PropertyInfo qdev_prop_link_array;* @_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).
@@ -191,7 +187,7 @@ extern const PropertyInfo qdev_prop_link_array;* where each string is the QOM path of the object to be linked. */ #define DEFINE_PROP_LINK_ARRAY (_name, _state, _field, _arrayfield, \ - _linktype, _arraytype) \ + _linktype) \ DEFINE_PROP(_name, _state, _field, qdev_prop_link_array, uint32_t, \ .set_default = true, \ .defval.u = 0, \
hw/input/stellaris_gamepad.c +1 -1
@@ -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)
hw/intc/arm_gicv3_common.c +1 -1
@@ -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),
hw/intc/arm_gicv5_common.c +2 -2
@@ -194,9 +194,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 ),
hw/intc/rx_icu.c +2 -2
@@ -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)
hw/misc/arm_sysctl.c +2 -2
@@ -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)
hw/misc/mps2-scc.c +1 -1
@@ -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)
hw/net/rocker/rocker.c +1 -1
@@ -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 = {
hw/net/virtio-net.c +1 -1
@@ -4380,7 +4380,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,
hw/nvram/xlnx-efuse.c +1 -1
@@ -267,7 +267,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)
hw/nvram/xlnx-versal-efuse-ctrl.c +1 -1
@@ -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)
hw/riscv/riscv_hart.c +2 -4
@@ -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 *), };
hw/virtio/virtio-iommu-pci.c +1 -1
@@ -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)
tests/unit/test-qdev.c +1 -1
@@ -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)
hw/display/apple-gfx-mmio.m +1 -1
@@ -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)
hw/display/apple-gfx-pci.m +1 -1
@@ -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)
Signature · 1 line
2.55.0
PATCH v3 3/3 qapi/qom: Make @qapi-type mandatory in output of qom-list etc.
In reply to Markus ArmbrusterCommit 0eee31cf108 (qapi/qom: add qapi-type to qom-list, qom-list-properties, qom-list-get) had to make @qapi-type optional to enable incremental conversion to QAPI-aware property registration. This conversion is now complete: @qapi-type is always present. Make it mandatory.
--- qapi/qom.json | 10 ++++------ tests/qtest/qmp-cmd-test.c | 9 +-------- 2 files changed, 5 insertions(+), 14 deletions(-)
qapi/qom.json +4 -6
@@ -36,8 +36,7 @@ # 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) +# output of ``query-qmp-schema``. (since 11.2) # # @description: if specified, the description of the property. #
@@ -52,7 +51,7 @@ { 'struct': 'ObjectPropertyInfo', 'data': { 'name': 'str', 'type': 'str', - '*qapi-type': { 'type': 'str', 'features': [ 'unstable' ] }, + 'qapi-type': { 'type': 'str', 'features': [ 'unstable' ] }, '*description': 'str', '*default-value': 'any' } }
@@ -65,8 +64,7 @@ # `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) +# output of ``query-qmp-schema``. (since 11.2) # # @value: the value of the property. Absent when the property cannot # be read.
@@ -80,7 +78,7 @@ { 'struct': 'ObjectPropertyValue', 'data': { 'name': 'str', 'type': 'str', - '*qapi-type': { 'type': 'str', 'features': [ 'unstable' ] }, + 'qapi-type': { 'type': 'str', 'features': [ 'unstable' ] }, '*value': 'any' } } ##
tests/qtest/qmp-cmd-test.c +1 -8
@@ -379,15 +379,8 @@ static void test_qapi_type(void) 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 { -g_test_message ("%s.%s %s has no associated qapi-type" , - name, propname, ty); - } +g_assert_nonnull (qmp_schema_lookup (&schema, qapi_type)); } }qtest_quit (qts);
Signature · 1 line
2.55.0