External/libvirt
1
0
Fork 0
Code

qemuDeviceVideoGetModel: Deduplicate a check

Browse Source 
There is the same check written twice (whether given video card
is primary one and whether it supports VGA mode). Write it just
once and store it in a boolean variable.

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 13:31:56 +02:00
parent 614fb5546c
commit 44d7a77c81
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/qemu/qemu_command.c
View File

@ -4200,18 +4200,22 @@ qemuDeviceVideoGetModel(virQEMUCaps *qemuCaps,
const virDomainVideoDef *video)
{
const char *model = NULL;
bool primaryVga = false;
if (video->primary && qemuDomainSupportsVideoVga(video, qemuCaps))
primaryVga = true;
/* We try to chose the best model for primary video device by preferring
* model with VGA compatibility mode. For some video devices on some
* architectures there might not be such model so fallback to one
* without VGA compatibility mode. */
if (video->backend == VIR_DOMAIN_VIDEO_BACKEND_TYPE_VHOSTUSER) {
if (video->primary && qemuDomainSupportsVideoVga(video, qemuCaps))
if (primaryVga)
model = "vhost-user-vga";
else
model = "vhost-user-gpu";
} else {
if (video->primary && qemuDomainSupportsVideoVga(video, qemuCaps))
if (primaryVga)
model = qemuDeviceVideoTypeToString(video->type);
else
model = qemuDeviceVideoSecondaryTypeToString(video->type);