External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-11-05 04:41:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Adapt to virtio-gpu-gl-pci device

Browse Source 
QEMU 6.1 will add virtio-gpu-gl-pci device to replace the virgl property
of virtio-gpu-pci device. Adapt to that change.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1967356

Signed-off-by: Han Han <hhan@redhat.com>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Han Han 2021-06-09 16:32:25 +08:00 committed by Michal Privoznik
parent 38aed410ac
commit b99762b61e
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/qemu/qemu_command.c
View File

@ -4203,6 +4203,10 @@ qemuBuildDeviceVideoStr(const virDomainDef *def,
{ {
g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; 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
@ -4228,6 +4232,11 @@ qemuBuildDeviceVideoStr(const virDomainDef *def,
} }
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) &&
accel3d == VIR_TRISTATE_SWITCH_ON &&
STREQ(model, "virtio-gpu"))
model = "virtio-gpu-gl";
if (qemuBuildVirtioDevStr(&buf, model, qemuCaps, if (qemuBuildVirtioDevStr(&buf, model, qemuCaps,
VIR_DOMAIN_DEVICE_VIDEO, video) < 0) { VIR_DOMAIN_DEVICE_VIDEO, video) < 0) {
return NULL; return NULL;
@ -4242,10 +4251,10 @@ qemuBuildDeviceVideoStr(const virDomainDef *def,
video->type == VIR_DOMAIN_VIDEO_TYPE_VIRTIO) { video->type == VIR_DOMAIN_VIDEO_TYPE_VIRTIO) {
if (video->accel && if (video->accel &&
virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_GPU_VIRGL) && virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_GPU_VIRGL) &&
(video->accel->accel3d == VIR_TRISTATE_SWITCH_ON || (accel3d == VIR_TRISTATE_SWITCH_ON ||
video->accel->accel3d == VIR_TRISTATE_SWITCH_OFF)) { accel3d == VIR_TRISTATE_SWITCH_OFF)) {
virBufferAsprintf(&buf, ",virgl=%s", virBufferAsprintf(&buf, ",virgl=%s",
virTristateSwitchTypeToString(video->accel->accel3d)); virTristateSwitchTypeToString(accel3d));
} }
} }