External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-05 22:05:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu_command: Switch from VIR_ENUM_IMPL(qemuDeviceVideo) to explicit switch()

Browse Source 
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 <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Michal Privoznik 2021-06-11 14:35:56 +02:00
parent 44d7a77c81
commit 104271c084
1 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/qemu/qemu_command.c
View File

@ -104,25 +104,6 @@ VIR_ENUM_IMPL(qemuVideo,
"", /* ramfb can't be used with -vga */
);
VIR_ENUM_DECL(qemuDeviceVideo);
VIR_ENUM_IMPL(qemuDeviceVideo,
VIR_DOMAIN_VIDEO_TYPE_LAST,
"", /* default value, we shouldn't see this */
"VGA",
"cirrus-vga",
"vmware-svga",
"", /* don't support xen */
"", /* don't support vbox */
"qxl-vga",
"", /* don't support parallels */
"virtio-vga",
"" /* don't support gop */,
"" /* 'none' doesn't make sense here */,
"bochs-display",
"ramfb",
);
VIR_ENUM_DECL(qemuDeviceVideoSecondary);
VIR_ENUM_IMPL(qemuDeviceVideoSecondary,
@ -4215,10 +4196,41 @@ qemuDeviceVideoGetModel(virQEMUCaps *qemuCaps,
else
model = "vhost-user-gpu";
} else {
if (primaryVga)
model = qemuDeviceVideoTypeToString(video->type);
else
if (primaryVga) {
switch ((virDomainVideoType) video->type) {
case VIR_DOMAIN_VIDEO_TYPE_VGA:
model = "VGA";
break;
case VIR_DOMAIN_VIDEO_TYPE_CIRRUS:
model = "cirrus-vga";
break;
case VIR_DOMAIN_VIDEO_TYPE_VMVGA:
model = "vmware-svga";
break;
case VIR_DOMAIN_VIDEO_TYPE_QXL:
model = "qxl-vga";
break;
case VIR_DOMAIN_VIDEO_TYPE_VIRTIO:
model = "virtio-vga";
break;
case VIR_DOMAIN_VIDEO_TYPE_BOCHS:
model = "bochs-display";
break;
case VIR_DOMAIN_VIDEO_TYPE_RAMFB:
model = "ramfb";
break;
case VIR_DOMAIN_VIDEO_TYPE_DEFAULT:
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_LAST:
break;
}
} else {
model = qemuDeviceVideoSecondaryTypeToString(video->type);
}
}
if (!model || STREQ(model, "")) {