From: Marc-André Lureau <[email protected]> Convert the vmport 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]> Message-ID: <[email protected]> --- hw/i386/pc.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 1fce96f5ec..649ae27156 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) @@ -1729,9 +1725,11 @@ 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", NULL, - pc_machine_get_vmport, pc_machine_set_vmport, - NULL, NULL); + object_class_property_add_enum(oc, PC_MACHINE_VMPORT, + "OnOffAuto", + &OnOffAuto_type_info, NULL, + pc_machine_get_vmport, + pc_machine_set_vmport); object_class_property_set_description(oc, PC_MACHINE_VMPORT, "Enable vmport (pc & q35)"); -- 2.55.0
