ea91cce6f3
- qemu: capabilities: Apply 'capability_filters' configration option on all capabilities (RHEL-177646) - qemu: capabilities: Export 'virQEMUCapsNewCopy' outside of 'qemu_capspriv' (RHEL-177646) - qemu: Allow reuse of 'qemuProcessStartUpdateCustomCaps' (RHEL-177646) - qemu: validate: Validate VM config with qemuCaps influenced by <qemu:capabilities> (RHEL-177646) - qemu: postparse: Process VM config with qemuCaps influenced by <qemu:capabilities> (RHEL-177646) - virQEMUCapsCacheLookupDefault: Fix error message when no emulators are installed (RHEL-177646) - qemuxmlconfdata: un-symlink 'video-virtio-vga-gpu-gl' output (RHEL-177646) - qemuxmlconftest: Add 'video-virtio-vga' invocation with QEMU_CAPS_DEVICE_VIRTIO_VGA disabled (RHEL-177646) - qemuxmlconftest: Add test cases for configs asking for 'virtio-gpu-gl' or 'virtio-vga-gl' without the capability (RHEL-177646) - qemuxmlconftest: Add invocation of 'video-virtio-vga-gpu-gl' with missing caps and VIR_DOMAIN_DEF_PARSE_ABI_UPDATE (RHEL-177646) - qemustatusxml2xml: Add test case capturing virtio video device (RHEL-177646) - virDomainVideoDefFormat: Use 'virXMLFormatElement' instead of custom formatter (RHEL-177646) - conf: Add fields for recording actually-selected virtio video device (RHEL-177646) - qemuxmlconftest: Add test case for specifying 'virtio-gpu' where 'virtio-vga' would be picked (RHEL-177646) - qemuDeviceVideoGetModel: Directly return picked model (RHEL-177646) - qemu: postparse: Fill in selected virtio video frondend device in the XML (RHEL-177646) - qemuValidateDomainDeviceDefVideo: Fix checks of virtio video devices (RHEL-177646) - qemuDeviceVideoGetModel: Remove logic for selecting 'virtio' devices (RHEL-177646) - qemuDeviceVideoGetModel: Simplify by relying on checks from 'qemuValidateDomainDeviceDefVideo' (RHEL-177646) - qemu: Remove 'qemuDomainSupportsVideoVga' (RHEL-177646) Resolves: RHEL-177646
211 lines
9.7 KiB
Diff
211 lines
9.7 KiB
Diff
From b59a04973707e5499a56729ecf1887d4a048031f Mon Sep 17 00:00:00 2001
|
|
Message-ID: <b59a04973707e5499a56729ecf1887d4a048031f.1784297532.git.jdenemar@redhat.com>
|
|
From: Peter Krempa <pkrempa@redhat.com>
|
|
Date: Tue, 9 Jun 2026 22:02:21 +0200
|
|
Subject: [PATCH] qemuDeviceVideoGetModel: Remove logic for selecting 'virtio'
|
|
devices
|
|
|
|
The virtio video device frontend type is either selected by the
|
|
post-parse code based on capabilities or provided by the user/existing
|
|
XML explicitly. No need to try to come up with a model when generating
|
|
commandline based on broken logic.
|
|
|
|
The difference in test output shows:
|
|
- honours user's config in case of the new 'device' attribute
|
|
- shows how incorrect fallback would be used for 'virtio-vga-gl'
|
|
(picked virtio-vga (non-gl) instead of 'virtio-gpu-gl')
|
|
|
|
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
|
|
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
|
|
(cherry picked from commit 659e104affa113b9a546ca1f6948bc9e95ada8d2)
|
|
|
|
https://redhat.atlassian.net/browse/RHEL-186019
|
|
|
|
https://redhat.atlassian.net/browse/RHEL-177646 (rhel-9.9)
|
|
---
|
|
src/qemu/qemu_command.c | 75 +++++++------------
|
|
...io-vga-device-downgrade.x86_64-latest.args | 2 +-
|
|
...APS_VIRTIO_VGA_GL-disabled-ABI_UPDATE.args | 2 +-
|
|
3 files changed, 30 insertions(+), 49 deletions(-)
|
|
|
|
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
|
|
index 619ad7a835..2f19a6c1ff 100644
|
|
--- a/src/qemu/qemu_command.c
|
|
+++ b/src/qemu/qemu_command.c
|
|
@@ -703,9 +703,25 @@ qemuBuildDeviceAddressProps(virJSONValue *props,
|
|
}
|
|
|
|
|
|
+struct qemuDeviceVideoModelVirtioOpts {
|
|
+ bool virtio;
|
|
+ bool virtioBusSuffix;
|
|
+};
|
|
+
|
|
+struct qemuDeviceVideoModelVirtioOpts qemuDeviceVideoGetModelVirtioOptsTable[] = {
|
|
+ [VIR_DOMAIN_VIDEO_VIRTIO_DEVICE_DEFAULT] = { .virtio = false, .virtioBusSuffix = false },
|
|
+ [VIR_DOMAIN_VIDEO_VIRTIO_DEVICE_VGA] = { .virtio = true, .virtioBusSuffix = false },
|
|
+ [VIR_DOMAIN_VIDEO_VIRTIO_DEVICE_GPU] = { .virtio = true, .virtioBusSuffix = true },
|
|
+ [VIR_DOMAIN_VIDEO_VIRTIO_DEVICE_VGA_GL] = { .virtio = true, .virtioBusSuffix = false },
|
|
+ [VIR_DOMAIN_VIDEO_VIRTIO_DEVICE_GPU_GL] = { .virtio = true, .virtioBusSuffix = true },
|
|
+ [VIR_DOMAIN_VIDEO_VIRTIO_DEVICE_VHOST_USER_VGA] = { .virtio = false, .virtioBusSuffix = false },
|
|
+ [VIR_DOMAIN_VIDEO_VIRTIO_DEVICE_VHOST_USER_GPU] = { .virtio = true, .virtioBusSuffix = true },
|
|
+};
|
|
+G_STATIC_ASSERT(G_N_ELEMENTS(qemuDeviceVideoGetModelVirtioOptsTable) == VIR_DOMAIN_VIDEO_VIRTIO_DEVICE_LAST);
|
|
+
|
|
+
|
|
/**
|
|
* qemuDeviceVideoGetModel:
|
|
- * @qemuCaps: qemu capabilities
|
|
* @video: video device definition
|
|
* @virtio: the returned video device is a 'virtio' device
|
|
* @virtioBusSuffix: the returned device needs to get the bus-suffix
|
|
@@ -714,37 +730,23 @@ qemuBuildDeviceAddressProps(virJSONValue *props,
|
|
* @virtioBusSuffix are filled with the corresponding flags.
|
|
*/
|
|
static const char *
|
|
-qemuDeviceVideoGetModel(virQEMUCaps *qemuCaps,
|
|
- const virDomainVideoDef *video,
|
|
+qemuDeviceVideoGetModel(const virDomainVideoDef *video,
|
|
bool *virtio,
|
|
bool *virtioBusSuffix)
|
|
{
|
|
- bool primaryVga = false;
|
|
- virTristateBool accel3d = VIR_TRISTATE_BOOL_ABSENT;
|
|
-
|
|
*virtio = false;
|
|
*virtioBusSuffix = false;
|
|
|
|
- if (video->accel)
|
|
- accel3d = video->accel->accel3d;
|
|
+ if (video->type == VIR_DOMAIN_VIDEO_TYPE_VIRTIO) {
|
|
+ struct qemuDeviceVideoModelVirtioOpts *opts = &qemuDeviceVideoGetModelVirtioOptsTable[video->virtiodevice];
|
|
|
|
- if (video->primary && qemuDomainSupportsVideoVga(video, qemuCaps))
|
|
- primaryVga = true;
|
|
+ *virtio = opts->virtio;
|
|
+ *virtioBusSuffix = opts->virtioBusSuffix;
|
|
|
|
- if (video->backend == VIR_DOMAIN_VIDEO_BACKEND_TYPE_VHOSTUSER) {
|
|
- if (primaryVga)
|
|
- return "vhost-user-vga";
|
|
-
|
|
- *virtio = true;
|
|
- *virtioBusSuffix = true;
|
|
- return "vhost-user-gpu";
|
|
+ return virDomainVideoVirtioDeviceTypeToString(video->virtiodevice);
|
|
}
|
|
|
|
- /* 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 (primaryVga) {
|
|
+ if (video->primary) {
|
|
switch ((virDomainVideoType) video->type) {
|
|
case VIR_DOMAIN_VIDEO_TYPE_VGA:
|
|
return "VGA";
|
|
@@ -758,22 +760,12 @@ qemuDeviceVideoGetModel(virQEMUCaps *qemuCaps,
|
|
case VIR_DOMAIN_VIDEO_TYPE_QXL:
|
|
return "qxl-vga";
|
|
|
|
- case VIR_DOMAIN_VIDEO_TYPE_VIRTIO:
|
|
- *virtio = true;
|
|
- *virtioBusSuffix = false;
|
|
-
|
|
- if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_VGA_GL) &&
|
|
- accel3d == VIR_TRISTATE_BOOL_YES)
|
|
- return "virtio-vga-gl";
|
|
-
|
|
- return "virtio-vga";
|
|
-
|
|
case VIR_DOMAIN_VIDEO_TYPE_BOCHS:
|
|
return "bochs-display";
|
|
|
|
case VIR_DOMAIN_VIDEO_TYPE_RAMFB:
|
|
return "ramfb";
|
|
-
|
|
+ case VIR_DOMAIN_VIDEO_TYPE_VIRTIO:
|
|
case VIR_DOMAIN_VIDEO_TYPE_DEFAULT:
|
|
case VIR_DOMAIN_VIDEO_TYPE_XEN:
|
|
case VIR_DOMAIN_VIDEO_TYPE_VBOX:
|
|
@@ -789,15 +781,6 @@ qemuDeviceVideoGetModel(virQEMUCaps *qemuCaps,
|
|
return "qxl";
|
|
|
|
case VIR_DOMAIN_VIDEO_TYPE_VIRTIO:
|
|
- *virtio = true;
|
|
- *virtioBusSuffix = true;
|
|
-
|
|
- if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_GPU_GL_PCI) &&
|
|
- accel3d == VIR_TRISTATE_BOOL_YES)
|
|
- return "virtio-gpu-gl";
|
|
-
|
|
- return "virtio-gpu";
|
|
-
|
|
case VIR_DOMAIN_VIDEO_TYPE_DEFAULT:
|
|
case VIR_DOMAIN_VIDEO_TYPE_VGA:
|
|
case VIR_DOMAIN_VIDEO_TYPE_CIRRUS:
|
|
@@ -823,7 +806,6 @@ qemuDeviceVideoGetModel(virQEMUCaps *qemuCaps,
|
|
|
|
static void
|
|
qemuBuildVirtioDevGetConfigDev(const virDomainDeviceDef *device,
|
|
- virQEMUCaps *qemuCaps,
|
|
const char **baseName,
|
|
virDomainVirtioOptions **virtioOptions,
|
|
bool *has_tmodel,
|
|
@@ -948,8 +930,7 @@ qemuBuildVirtioDevGetConfigDev(const virDomainDeviceDef *device,
|
|
bool virtio;
|
|
bool virtioBusSuffix;
|
|
|
|
- if (!(*baseName = qemuDeviceVideoGetModel(qemuCaps,
|
|
- device->data.video,
|
|
+ if (!(*baseName = qemuDeviceVideoGetModel(device->data.video,
|
|
&virtio,
|
|
&virtioBusSuffix)))
|
|
return;
|
|
@@ -1028,7 +1009,7 @@ qemuBuildVirtioDevGetConfig(const virDomainDeviceDef *device,
|
|
bool has_ntmodel = false;
|
|
bool useBusSuffix = true;
|
|
|
|
- qemuBuildVirtioDevGetConfigDev(device, qemuCaps, &baseName,
|
|
+ qemuBuildVirtioDevGetConfigDev(device, &baseName,
|
|
virtioOptions, &has_tmodel,
|
|
&has_ntmodel, &useBusSuffix);
|
|
|
|
@@ -4606,7 +4587,7 @@ qemuBuildDeviceVideoCmd(virCommand *cmd,
|
|
g_autoptr(virJSONValue) props = NULL;
|
|
unsigned int max_outputs = 0;
|
|
|
|
- if (!(model = qemuDeviceVideoGetModel(qemuCaps, video, &virtio, &virtioBusSuffix)))
|
|
+ if (!(model = qemuDeviceVideoGetModel(video, &virtio, &virtioBusSuffix)))
|
|
return -1;
|
|
|
|
if (virtio) {
|
|
diff --git a/tests/qemuxmlconfdata/video-virtio-vga-device-downgrade.x86_64-latest.args b/tests/qemuxmlconfdata/video-virtio-vga-device-downgrade.x86_64-latest.args
|
|
index fec2b04ca9..5782505b61 100644
|
|
--- a/tests/qemuxmlconfdata/video-virtio-vga-device-downgrade.x86_64-latest.args
|
|
+++ b/tests/qemuxmlconfdata/video-virtio-vga-device-downgrade.x86_64-latest.args
|
|
@@ -31,7 +31,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
|
|
-blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \
|
|
-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1,"write-cache":"on"}' \
|
|
-audiodev '{"id":"audio1","driver":"none"}' \
|
|
--device '{"driver":"virtio-vga","id":"video0","max_outputs":1,"bus":"pci.0","addr":"0x2"}' \
|
|
+-device '{"driver":"virtio-gpu-pci","id":"video0","max_outputs":1,"bus":"pci.0","addr":"0x2"}' \
|
|
-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \
|
|
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
|
|
-msg timestamp=on
|
|
diff --git a/tests/qemuxmlconfdata/video-virtio-vga-gpu-gl.x86_64-latest.QEMU_CAPS_VIRTIO_VGA_GL-disabled-ABI_UPDATE.args b/tests/qemuxmlconfdata/video-virtio-vga-gpu-gl.x86_64-latest.QEMU_CAPS_VIRTIO_VGA_GL-disabled-ABI_UPDATE.args
|
|
index d649dc06f8..315c49f953 100644
|
|
--- a/tests/qemuxmlconfdata/video-virtio-vga-gpu-gl.x86_64-latest.QEMU_CAPS_VIRTIO_VGA_GL-disabled-ABI_UPDATE.args
|
|
+++ b/tests/qemuxmlconfdata/video-virtio-vga-gpu-gl.x86_64-latest.QEMU_CAPS_VIRTIO_VGA_GL-disabled-ABI_UPDATE.args
|
|
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
|
|
-boot strict=on \
|
|
-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
|
|
-audiodev '{"id":"audio1","driver":"none"}' \
|
|
--device '{"driver":"virtio-vga","id":"video0","max_outputs":1,"bus":"pci.0","addr":"0x2"}' \
|
|
+-device '{"driver":"virtio-gpu-gl-pci","id":"video0","max_outputs":1,"bus":"pci.0","addr":"0x2"}' \
|
|
-device '{"driver":"virtio-gpu-gl-pci","id":"video1","max_outputs":1,"bus":"pci.0","addr":"0x4"}' \
|
|
-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \
|
|
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
|
|
--
|
|
2.55.0
|