Those macros are exactly the same as DEFINE_PROP, we can use DEFINE_PROP directly.
Signed-off-by: Eduardo Habkost <ehabk...@redhat.com> --- This is a new patch added in v3 of this series. --- Cc: Alex Williamson <alex.william...@redhat.com> Cc: Paolo Bonzini <pbonz...@redhat.com> Cc: "Daniel P. Berrangé" <berra...@redhat.com> Cc: Eduardo Habkost <ehabk...@redhat.com> Cc: Peter Maydell <peter.mayd...@linaro.org> Cc: qemu-devel@nongnu.org Cc: qemu-...@nongnu.org --- include/qom/property-types.h | 6 ------ hw/vfio/pci.c | 6 +++--- target/arm/cpu.c | 6 +++--- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/include/qom/property-types.h b/include/qom/property-types.h index 62551c77e0..91b166badf 100644 --- a/include/qom/property-types.h +++ b/include/qom/property-types.h @@ -48,9 +48,6 @@ extern const PropertyInfo prop_info_link; .set_default = true, \ .defval.i = (_type)_defval) -#define DEFINE_PROP_SIGNED_NODEFAULT(_name, _state, _field, _prop, _type) \ - DEFINE_PROP(_name, _state, _field, _prop, _type) - #define DEFINE_PROP_BIT(_name, _state, _field, _bit, _defval) \ DEFINE_PROP(_name, _state, _field, prop_info_bit, uint32_t, \ .bitnr = (_bit), \ @@ -62,9 +59,6 @@ extern const PropertyInfo prop_info_link; .set_default = true, \ .defval.u = (_type)_defval) -#define DEFINE_PROP_UNSIGNED_NODEFAULT(_name, _state, _field, _prop, _type) \ - DEFINE_PROP(_name, _state, _field, _prop, _type) - #define DEFINE_PROP_BIT64(_name, _state, _field, _bit, _defval) \ DEFINE_PROP(_name, _state, _field, prop_info_bit64, uint64_t, \ .bitnr = (_bit), \ diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index edfaed8c9a..f15abacbdf 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -3214,9 +3214,9 @@ static Property vfio_pci_dev_properties[] = { DEFINE_PROP_UINT32("x-pci-sub-device-id", VFIOPCIDevice, sub_device_id, PCI_ANY_ID), DEFINE_PROP_UINT32("x-igd-gms", VFIOPCIDevice, igd_gms, 0), - DEFINE_PROP_UNSIGNED_NODEFAULT("x-nv-gpudirect-clique", VFIOPCIDevice, - nv_gpudirect_clique, - qdev_prop_nv_gpudirect_clique, uint8_t), + DEFINE_PROP("x-nv-gpudirect-clique", VFIOPCIDevice, + nv_gpudirect_clique, + qdev_prop_nv_gpudirect_clique, uint8_t), DEFINE_PROP_OFF_AUTO_PCIBAR("x-msix-relocation", VFIOPCIDevice, msix_relo, OFF_AUTOPCIBAR_OFF), /* diff --git a/target/arm/cpu.c b/target/arm/cpu.c index cef92879b0..7cf2078622 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1106,9 +1106,9 @@ static Property arm_cpu_has_mpu_property = * to override that with an incorrect constant value. */ static Property arm_cpu_pmsav7_dregion_property = - DEFINE_PROP_UNSIGNED_NODEFAULT("pmsav7-dregion", ARMCPU, - pmsav7_dregion, - prop_info_uint32, uint32_t); + DEFINE_PROP("pmsav7-dregion", ARMCPU, + pmsav7_dregion, + prop_info_uint32, uint32_t); static bool arm_get_pmu(Object *obj, Error **errp) { -- 2.28.0