From: Marc-André Lureau <[email protected]> Convert the OnOffSplit 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]> --- accel/whpx/whpx-common.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/accel/whpx/whpx-common.c b/accel/whpx/whpx-common.c index 3447c52fb1..068258bf6c 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,9 +508,9 @@ 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, - NULL, whpx_set_kernel_irqchip, - NULL, NULL); + object_class_property_add_enum(oc, "kernel-irqchip", "on|off|split", + &OnOffSplit_type_info, NULL, + NULL, whpx_set_kernel_irqchip); object_class_property_set_description(oc, "kernel-irqchip", "Configure WHPX in-kernel irqchip"); object_class_property_add_enum(oc, "hyperv", "OnOffAuto", -- 2.55.0
