From: Marc-André Lureau <[email protected]> Convert the acpi OnOffAuto property from manual visitor-based callbacks to object_class_property_add_enum().
Signed-off-by: Marc-André Lureau <[email protected]> Signed-off-by: Markus Armbruster <[email protected]> --- hw/arm/virt.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index dad3f8c39b..e39d77eba6 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -72,7 +72,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" @@ -3564,21 +3564,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) @@ -4206,9 +4201,9 @@ 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", NULL, - virt_get_acpi, virt_set_acpi, - NULL, NULL); + object_class_property_add_enum(oc, "acpi", "OnOffAuto", + &OnOffAuto_type_info, NULL, + virt_get_acpi, virt_set_acpi); object_class_property_set_description(oc, "acpi", "Enable ACPI"); object_class_property_add_bool(oc, "secure", virt_get_secure, -- 2.55.0
