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

qemuBuildDeviceVideoStr: Separate out video module selection

Browse Source 
The code that decides video card model is going to be reworked
and expanded. Separate it out into a function.

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:22:34 +02:00
parent b159ff83a5
commit 614fb5546c
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/qemu/qemu_command.c
View File

@ -4195,18 +4195,11 @@ qemuBuildSoundCommandLine(virCommand *cmd,
} }
static const char *
static char * qemuDeviceVideoGetModel(virQEMUCaps *qemuCaps,
qemuBuildDeviceVideoStr(const virDomainDef *def, const virDomainVideoDef *video)
virDomainVideoDef *video,
virQEMUCaps *qemuCaps)
{ {
g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
const char *model = NULL; const char *model = NULL;
virTristateSwitch accel3d = VIR_TRISTATE_SWITCH_ABSENT;
if (video->accel)
accel3d = video->accel->accel3d;
/* We try to chose the best model for primary video device by preferring /* We try to chose the best model for primary video device by preferring
* model with VGA compatibility mode. For some video devices on some * model with VGA compatibility mode. For some video devices on some
@ -4231,6 +4224,25 @@ qemuBuildDeviceVideoStr(const virDomainDef *def,
return NULL; return NULL;
} }
return model;
}
static char *
qemuBuildDeviceVideoStr(const virDomainDef *def,
virDomainVideoDef *video,
virQEMUCaps *qemuCaps)
{
g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
const char *model = NULL;
virTristateSwitch accel3d = VIR_TRISTATE_SWITCH_ABSENT;
if (video->accel)
accel3d = video->accel->accel3d;
if (!(model = qemuDeviceVideoGetModel(qemuCaps, video)))
return NULL;
if (STREQ(model, "virtio-gpu") || STREQ(model, "vhost-user-gpu")) { if (STREQ(model, "virtio-gpu") || STREQ(model, "vhost-user-gpu")) {
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_GPU_GL_PCI) && if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_GPU_GL_PCI) &&
accel3d == VIR_TRISTATE_SWITCH_ON && accel3d == VIR_TRISTATE_SWITCH_ON &&