From bdb0bfe8f8e1fd0f131a8f82e4ac7314d4f30e27 Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Fri, 11 Jun 2021 14:42:22 +0200 Subject: [PATCH] qemu_command: Switch from VIR_ENUM_IMPL(qemuDeviceVideoSecondary) to explicit switch() This may look like a step backwards, but it isn't. The point is that in near future the chosen model will depend on more than just video type. Signed-off-by: Michal Privoznik Reviewed-by: Peter Krempa --- src/qemu/qemu_command.c | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 2a09bcdab3..f7368a578d 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -104,25 +104,6 @@ VIR_ENUM_IMPL(qemuVideo, "", /* ramfb can't be used with -vga */ ); -VIR_ENUM_DECL(qemuDeviceVideoSecondary); - -VIR_ENUM_IMPL(qemuDeviceVideoSecondary, - VIR_DOMAIN_VIDEO_TYPE_LAST, - "", /* default value, we shouldn't see this */ - "", /* no secondary device for VGA */ - "", /* no secondary device for cirrus-vga */ - "", /* no secondary device for vmware-svga */ - "", /* don't support xen */ - "", /* don't support vbox */ - "qxl", - "", /* don't support parallels */ - "virtio-gpu", - "" /* don't support gop */, - "" /* 'none' doesn't make sense here */, - "" /* no secondary device for bochs */, - "" /* no secondary device for ramfb */, -); - VIR_ENUM_IMPL(qemuSoundCodec, VIR_DOMAIN_SOUND_CODEC_TYPE_LAST, "hda-duplex", @@ -4229,7 +4210,27 @@ qemuDeviceVideoGetModel(virQEMUCaps *qemuCaps, break; } } else { - model = qemuDeviceVideoSecondaryTypeToString(video->type); + switch ((virDomainVideoType) video->type) { + case VIR_DOMAIN_VIDEO_TYPE_QXL: + model = "qxl"; + break; + case VIR_DOMAIN_VIDEO_TYPE_VIRTIO: + model = "virtio-gpu"; + break; + case VIR_DOMAIN_VIDEO_TYPE_DEFAULT: + case VIR_DOMAIN_VIDEO_TYPE_VGA: + case VIR_DOMAIN_VIDEO_TYPE_CIRRUS: + case VIR_DOMAIN_VIDEO_TYPE_VMVGA: + case VIR_DOMAIN_VIDEO_TYPE_XEN: + case VIR_DOMAIN_VIDEO_TYPE_VBOX: + case VIR_DOMAIN_VIDEO_TYPE_PARALLELS: + case VIR_DOMAIN_VIDEO_TYPE_GOP: + case VIR_DOMAIN_VIDEO_TYPE_NONE: + case VIR_DOMAIN_VIDEO_TYPE_BOCHS: + case VIR_DOMAIN_VIDEO_TYPE_RAMFB: + case VIR_DOMAIN_VIDEO_TYPE_LAST: + break; + } } }