External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 14:15:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu_validate: Deduplicate code for video model check

Browse Source 
In my recent commit of a33279daa8 I've moved video model check
from domain capabilities validator into qemu validator. During
that I had to basically duplicate video model to qemuCaps checks.
Problem with this approach is that after my commit qemu validator
and domCaps are disconnected and thus domCaps might report (in
general) different set of supported video models.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Michal Privoznik 2020-11-17 10:26:14 +01:00
parent 4f8677cee2
commit d009f5b400
3 changed files with 8 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qemu/qemu_capabilities.c
View File

@ -5991,7 +5991,7 @@ virQEMUCapsFillDomainDeviceGraphicsCaps(virQEMUCapsPtr qemuCaps,
} }
static void void
virQEMUCapsFillDomainDeviceVideoCaps(virQEMUCapsPtr qemuCaps, virQEMUCapsFillDomainDeviceVideoCaps(virQEMUCapsPtr qemuCaps,
virDomainCapsDeviceVideoPtr dev) virDomainCapsDeviceVideoPtr dev)
{ {

4
src/qemu/qemu_capabilities.h
View File

@ -739,6 +739,10 @@ int virQEMUCapsFillDomainCaps(virQEMUCapsPtr qemuCaps,
virFirmwarePtr *firmwares, virFirmwarePtr *firmwares,
size_t nfirmwares); size_t nfirmwares);
void virQEMUCapsFillDomainDeviceVideoCaps(virQEMUCapsPtr qemuCaps,
virDomainCapsDeviceVideoPtr dev);
bool virQEMUCapsGuestIsNative(virArch host, bool virQEMUCapsGuestIsNative(virArch host,
virArch guest); virArch guest);

37
src/qemu/qemu_validate.c
View File

@ -2203,46 +2203,15 @@ static int
qemuValidateDomainDeviceDefVideo(const virDomainVideoDef *video, qemuValidateDomainDeviceDefVideo(const virDomainVideoDef *video,
virQEMUCapsPtr qemuCaps) virQEMUCapsPtr qemuCaps)
{ {
virQEMUCapsFlags cap = QEMU_CAPS_LAST; virDomainCapsDeviceVideo videoCaps = { 0 };
/* there's no properties to validate for NONE video devices */ /* there's no properties to validate for NONE video devices */
if (video->type == VIR_DOMAIN_VIDEO_TYPE_NONE) if (video->type == VIR_DOMAIN_VIDEO_TYPE_NONE)
return 0; return 0;
switch ((virDomainVideoType) video->type) { virQEMUCapsFillDomainDeviceVideoCaps(qemuCaps, &videoCaps);
case VIR_DOMAIN_VIDEO_TYPE_VGA:
cap = QEMU_CAPS_DEVICE_VGA;
break;
case VIR_DOMAIN_VIDEO_TYPE_CIRRUS:
cap = QEMU_CAPS_DEVICE_CIRRUS_VGA;
break;
case VIR_DOMAIN_VIDEO_TYPE_VMVGA:
cap = QEMU_CAPS_DEVICE_VMWARE_SVGA;
break;
case VIR_DOMAIN_VIDEO_TYPE_QXL:
cap = QEMU_CAPS_DEVICE_QXL;
break;
case VIR_DOMAIN_VIDEO_TYPE_VIRTIO:
cap = QEMU_CAPS_DEVICE_VIRTIO_GPU;
break;
case VIR_DOMAIN_VIDEO_TYPE_BOCHS:
cap = QEMU_CAPS_DEVICE_BOCHS_DISPLAY;
break;
case VIR_DOMAIN_VIDEO_TYPE_RAMFB:
cap = QEMU_CAPS_DEVICE_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:
/* nada */
break;
}
if (!virQEMUCapsGet(qemuCaps, cap)) { if (!VIR_DOMAIN_CAPS_ENUM_IS_SET(videoCaps.modelType, video->type)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("domain configuration does not support video model '%s'"), _("domain configuration does not support video model '%s'"),
virDomainVideoTypeToString(video->type)); virDomainVideoTypeToString(video->type));