[PATCH v2 0/6] qemu: Adapt to virtio*gl* devices
Diff from v1: - Leave qemuBuildVirtioDevStr() unmodified - New patch: qemu_validate: Validate virtio*gl* devices for 3d accerlation - Use DO_TEST_CAPS_LATEST instead of DO_TEST - Save video-virtio-vga-gpu-gl.x86_64-latest.xml as the sym link of tests/qemuxml2argvdata/video-virtio-vga-gpu-gl.xml v1: https://listman.redhat.com/archives/libvir-list/2021-June/msg00181.html Han Han (6): qemu_capabilities: Add QEMU_CAPS_VIRTIO_GPU_GL_PCI qemu_capabilities: Add QEMU_CAPS_VIRTIO_VGA_GL qemu_validate: Validate virtio*gl* devices for 3d accerlation qemu: Adapt to virtio-gpu-gl-pci device qemu: Adapt to virtio-vga-gl device tests: Tests for virtio-vga-gl and virtio-gpu-gl-pci device src/qemu/qemu_capabilities.c | 4 ++ src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 8 ++++ src/qemu/qemu_validate.c | 4 +- .../caps_6.1.0.x86_64.xml | 2 + ...video-virtio-vga-gpu-gl.x86_64-latest.args | 35 ++++++++++++++ .../video-virtio-vga-gpu-gl.xml | 46 +++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + .../video-virtio-vga-gpu-gl.x86_64-latest.xml | 1 + tests/qemuxml2xmltest.c | 1 + 10 files changed, 103 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/video-virtio-vga-gpu-gl.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/video-virtio-vga-gpu-gl.xml create mode 120000 tests/qemuxml2xmloutdata/video-virtio-vga-gpu-gl.x86_64-latest.xml -- 2.31.1
This flag will be used for the device virtio-gpu-gl-pci which is introduced since QEMU 6.1. Signed-off-by: Han Han <hhan@redhat.com> --- src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 + 3 files changed, 4 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 75dd01f06e..6df1b89aa0 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -630,6 +630,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "compat-deprecated", "acpi-index", "input-linux", + "virtio-gpu-gl-pci", ); @@ -1349,6 +1350,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { { "virtio-pmem-pci", QEMU_CAPS_DEVICE_VIRTIO_PMEM_PCI }, { "vhost-user-blk", QEMU_CAPS_DEVICE_VHOST_USER_BLK }, { "input-linux", QEMU_CAPS_INPUT_LINUX }, + { "virtio-gpu-gl-pci", QEMU_CAPS_VIRTIO_GPU_GL_PCI }, }; diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 94f2fad05a..d6430babce 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -610,6 +610,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ QEMU_CAPS_COMPAT_DEPRECATED, /* -compat deprecated-(input|output) is supported */ QEMU_CAPS_ACPI_INDEX, /* PCI device 'acpi-index' property */ QEMU_CAPS_INPUT_LINUX, /* -object input-linux */ + QEMU_CAPS_VIRTIO_GPU_GL_PCI, /* -device virtio-gpu-gl-pci */ QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml index 4df3200219..56d8534f7f 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -254,6 +254,7 @@ <flag name='compat-deprecated'/> <flag name='acpi-index'/> <flag name='input-linux'/> + <flag name='virtio-gpu-gl-pci'/> <version>6000050</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100243</microcodeVersion> -- 2.31.1
It will be used for virtio-vga-gl device later. Signed-off-by: Han Han <hhan@redhat.com> --- src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 + 3 files changed, 4 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 6df1b89aa0..2b9ab9af60 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -631,6 +631,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "acpi-index", "input-linux", "virtio-gpu-gl-pci", + "virtio-vga-gl", ); @@ -1351,6 +1352,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { { "vhost-user-blk", QEMU_CAPS_DEVICE_VHOST_USER_BLK }, { "input-linux", QEMU_CAPS_INPUT_LINUX }, { "virtio-gpu-gl-pci", QEMU_CAPS_VIRTIO_GPU_GL_PCI }, + { "virtio-vga-gl", QEMU_CAPS_VIRTIO_VGA_GL }, }; diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index d6430babce..eac3e099b1 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -611,6 +611,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ QEMU_CAPS_ACPI_INDEX, /* PCI device 'acpi-index' property */ QEMU_CAPS_INPUT_LINUX, /* -object input-linux */ QEMU_CAPS_VIRTIO_GPU_GL_PCI, /* -device virtio-gpu-gl-pci */ + QEMU_CAPS_VIRTIO_VGA_GL, /* -device virtio-vga-gl */ QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml index 56d8534f7f..695492d566 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -255,6 +255,7 @@ <flag name='acpi-index'/> <flag name='input-linux'/> <flag name='virtio-gpu-gl-pci'/> + <flag name='virtio-vga-gl'/> <version>6000050</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100243</microcodeVersion> -- 2.31.1
The devices virtio-gpu-gl-pci and virtio-vga-gl, aimed to replace the virgl property, are valid for 3d accerlation as well. Signed-off-by: Han Han <hhan@redhat.com> --- src/qemu/qemu_validate.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 669c45b3c5..75e3db6ca9 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -2364,7 +2364,9 @@ qemuValidateDomainDeviceDefVideo(const virDomainVideoDef *video, } else if (video->accel) { if (video->accel->accel3d == VIR_TRISTATE_SWITCH_ON && (video->type != VIR_DOMAIN_VIDEO_TYPE_VIRTIO || - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_GPU_VIRGL))) { + !(virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_GPU_VIRGL) || + virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_GPU_GL_PCI) || + virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_VGA_GL)))) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("%s 3d acceleration is not supported"), virDomainVideoTypeToString(video->type)); -- 2.31.1
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> --- src/qemu/qemu_command.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 7834fc2130..6b9f13b219 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4228,6 +4228,11 @@ qemuBuildDeviceVideoStr(const virDomainDef *def, } if (STREQ(model, "virtio-gpu") || STREQ(model, "vhost-user-gpu")) { + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_GPU_GL_PCI) && + (video->accel->accel3d == VIR_TRISTATE_SWITCH_ON) && + STREQ(model, "virtio-gpu")) + model = "virtio-gpu-gl"; + if (qemuBuildVirtioDevStr(&buf, model, qemuCaps, VIR_DOMAIN_DEVICE_VIDEO, video) < 0) { return NULL; -- 2.31.1
On 6/9/21 10:32 AM, Han Han wrote:
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> --- src/qemu/qemu_command.c | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 7834fc2130..6b9f13b219 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4228,6 +4228,11 @@ qemuBuildDeviceVideoStr(const virDomainDef *def, }
if (STREQ(model, "virtio-gpu") || STREQ(model, "vhost-user-gpu")) { + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_GPU_GL_PCI) && + (video->accel->accel3d == VIR_TRISTATE_SWITCH_ON) &&
Please note, that video->accel might be NULL (if there's no <acceleration/>). Since there's already a similar check we can do the following: diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6b9f13b219..a7dbe4584c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4203,6 +4203,10 @@ qemuBuildDeviceVideoStr(const virDomainDef *def, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; 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 * model with VGA compatibility mode. For some video devices on some @@ -4229,7 +4233,7 @@ qemuBuildDeviceVideoStr(const virDomainDef *def, if (STREQ(model, "virtio-gpu") || STREQ(model, "vhost-user-gpu")) { if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_GPU_GL_PCI) && - (video->accel->accel3d == VIR_TRISTATE_SWITCH_ON) && + accel3d == VIR_TRISTATE_SWITCH_ON && STREQ(model, "virtio-gpu")) model = "virtio-gpu-gl"; @@ -4247,8 +4251,8 @@ qemuBuildDeviceVideoStr(const virDomainDef *def, video->type == VIR_DOMAIN_VIDEO_TYPE_VIRTIO) { if (video->accel && virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_GPU_VIRGL) && - (video->accel->accel3d == VIR_TRISTATE_SWITCH_ON || - video->accel->accel3d == VIR_TRISTATE_SWITCH_OFF)) { + (accel3d == VIR_TRISTATE_SWITCH_ON || + accel3d == VIR_TRISTATE_SWITCH_OFF)) { virBufferAsprintf(&buf, ",virgl=%s", virTristateSwitchTypeToString(video->accel->accel3d)); } Michal
On Fri, Jun 11, 2021 at 4:55 PM Michal Prívozník <mprivozn@redhat.com> wrote:
On 6/9/21 10:32 AM, Han Han wrote:
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> --- src/qemu/qemu_command.c | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 7834fc2130..6b9f13b219 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4228,6 +4228,11 @@ qemuBuildDeviceVideoStr(const virDomainDef *def, }
if (STREQ(model, "virtio-gpu") || STREQ(model, "vhost-user-gpu")) { + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_GPU_GL_PCI) && + (video->accel->accel3d == VIR_TRISTATE_SWITCH_ON) &&
Please note, that video->accel might be NULL (if there's no <acceleration/>). Since there's already a similar check we can do the following:
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6b9f13b219..a7dbe4584c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4203,6 +4203,10 @@ qemuBuildDeviceVideoStr(const virDomainDef *def, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; 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 * model with VGA compatibility mode. For some video devices on some @@ -4229,7 +4233,7 @@ qemuBuildDeviceVideoStr(const virDomainDef *def,
if (STREQ(model, "virtio-gpu") || STREQ(model, "vhost-user-gpu")) { if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_GPU_GL_PCI) && - (video->accel->accel3d == VIR_TRISTATE_SWITCH_ON) && + accel3d == VIR_TRISTATE_SWITCH_ON && STREQ(model, "virtio-gpu")) model = "virtio-gpu-gl";
@@ -4247,8 +4251,8 @@ qemuBuildDeviceVideoStr(const virDomainDef *def, video->type == VIR_DOMAIN_VIDEO_TYPE_VIRTIO) { if (video->accel && virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_GPU_VIRGL) && - (video->accel->accel3d == VIR_TRISTATE_SWITCH_ON || - video->accel->accel3d == VIR_TRISTATE_SWITCH_OFF)) { + (accel3d == VIR_TRISTATE_SWITCH_ON || + accel3d == VIR_TRISTATE_SWITCH_OFF)) { virBufferAsprintf(&buf, ",virgl=%s",
virTristateSwitchTypeToString(video->accel->accel3d));
Here it can be replaced by accel3d, too. Then no 'video->accel->accel3d' in the scope of qemuBuildDeviceVideoStr()
}
Michal
QEMU 6.1 will replace the virgl property of virtio-vga device to virtio-vga-gl device. Adapt to that update. Resolves: https://gitlab.com/libvirt/libvirt/-/issues/167 Signed-off-by: Han Han <hhan@redhat.com> --- src/qemu/qemu_command.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6b9f13b219..56bc4b87eb 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4239,6 +4239,9 @@ qemuBuildDeviceVideoStr(const virDomainDef *def, } } else { virBufferAsprintf(&buf, "%s", model); + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_VGA_GL) && + STREQ(model, "virtio-vga")) + virBufferAddLit(&buf, "-gl"); } virBufferAsprintf(&buf, ",id=%s", video->info.alias); -- 2.31.1
On 6/9/21 10:32 AM, Han Han wrote:
QEMU 6.1 will replace the virgl property of virtio-vga device to virtio-vga-gl device. Adapt to that update.
Resolves: https://gitlab.com/libvirt/libvirt/-/issues/167
Signed-off-by: Han Han <hhan@redhat.com> --- src/qemu/qemu_command.c | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6b9f13b219..56bc4b87eb 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4239,6 +4239,9 @@ qemuBuildDeviceVideoStr(const virDomainDef *def, } } else { virBufferAsprintf(&buf, "%s", model); + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_VGA_GL) && + STREQ(model, "virtio-vga")) + virBufferAddLit(&buf, "-gl");
This enables -gl unconditionally, which is not desired. What we should do instead is: diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c5275fe0ee..9f44c76d28 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4244,6 +4244,7 @@ qemuBuildDeviceVideoStr(const virDomainDef *def, } else { virBufferAsprintf(&buf, "%s", model); if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_VGA_GL) && + accel3d == VIR_TRISTATE_SWITCH_ON && STREQ(model, "virtio-vga")) virBufferAddLit(&buf, "-gl"); } Michal
On Fri, Jun 11, 2021 at 4:55 PM Michal Prívozník <mprivozn@redhat.com> wrote:
On 6/9/21 10:32 AM, Han Han wrote:
QEMU 6.1 will replace the virgl property of virtio-vga device to virtio-vga-gl device. Adapt to that update.
Resolves: https://gitlab.com/libvirt/libvirt/-/issues/167
Signed-off-by: Han Han <hhan@redhat.com> --- src/qemu/qemu_command.c | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6b9f13b219..56bc4b87eb 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4239,6 +4239,9 @@ qemuBuildDeviceVideoStr(const virDomainDef *def, } } else { virBufferAsprintf(&buf, "%s", model); + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_VGA_GL) && + STREQ(model, "virtio-vga")) + virBufferAddLit(&buf, "-gl");
This enables -gl unconditionally, which is not desired. What we should do instead is:
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c5275fe0ee..9f44c76d28 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4244,6 +4244,7 @@ qemuBuildDeviceVideoStr(const virDomainDef *def, } else { virBufferAsprintf(&buf, "%s", model); if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_VGA_GL) && + accel3d == VIR_TRISTATE_SWITCH_ON &&
Good catch. The condition for accel3d was missing in my code.
STREQ(model, "virtio-vga")) virBufferAddLit(&buf, "-gl"); }
Michal
Signed-off-by: Han Han <hhan@redhat.com> --- ...video-virtio-vga-gpu-gl.x86_64-latest.args | 35 ++++++++++++++ .../video-virtio-vga-gpu-gl.xml | 46 +++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + .../video-virtio-vga-gpu-gl.x86_64-latest.xml | 1 + tests/qemuxml2xmltest.c | 1 + 5 files changed, 84 insertions(+) create mode 100644 tests/qemuxml2argvdata/video-virtio-vga-gpu-gl.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/video-virtio-vga-gpu-gl.xml create mode 120000 tests/qemuxml2xmloutdata/video-virtio-vga-gpu-gl.x86_64-latest.xml diff --git a/tests/qemuxml2argvdata/video-virtio-vga-gpu-gl.x86_64-latest.args b/tests/qemuxml2argvdata/video-virtio-vga-gpu-gl.x86_64-latest.args new file mode 100644 index 0000000000..d38082410f --- /dev/null +++ b/tests/qemuxml2argvdata/video-virtio-vga-gpu-gl.x86_64-latest.args @@ -0,0 +1,35 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/tmp/lib/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-cpu qemu64 \ +-m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \ +-overcommit mem-lock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-audiodev id=audio1,driver=none \ +-device virtio-vga-gl,id=video0,max_outputs=1,bus=pci.0,addr=0x2 \ +-device virtio-gpu-gl-pci,id=video1,max_outputs=1,bus=pci.0,addr=0x4 \ +-device 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/qemuxml2argvdata/video-virtio-vga-gpu-gl.xml b/tests/qemuxml2argvdata/video-virtio-vga-gpu-gl.xml new file mode 100644 index 0000000000..991141c643 --- /dev/null +++ b/tests/qemuxml2argvdata/video-virtio-vga-gpu-gl.xml @@ -0,0 +1,46 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu64</model> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='usb' index='0' model='piix3-uhci'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='none'/> + <video> + <model type='virtio' heads='1' primary='yes'> + <acceleration accel3d='yes'/> + </model> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </video> + <video> + <model type='virtio' heads='1'> + <acceleration accel3d='yes'/> + </model> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </video> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </memballoon> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index f9ec81eb8e..a886ba4b0a 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2501,6 +2501,7 @@ mymain(void) QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_DEVICE_VIRTIO_VGA, QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS); + DO_TEST_CAPS_LATEST("video-virtio-vga-gpu-gl"); DO_TEST_CAPS_LATEST("video-bochs-display-device"); DO_TEST_CAPS_LATEST("video-ramfb-display-device"); DO_TEST_CAPS_LATEST_PARSE_ERROR("video-ramfb-display-device-pci-address"); diff --git a/tests/qemuxml2xmloutdata/video-virtio-vga-gpu-gl.x86_64-latest.xml b/tests/qemuxml2xmloutdata/video-virtio-vga-gpu-gl.x86_64-latest.xml new file mode 120000 index 0000000000..769796d9eb --- /dev/null +++ b/tests/qemuxml2xmloutdata/video-virtio-vga-gpu-gl.x86_64-latest.xml @@ -0,0 +1 @@ +../qemuxml2argvdata/video-virtio-vga-gpu-gl.xml \ No newline at end of file diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index dd039bd846..8ba732d566 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1340,6 +1340,7 @@ mymain(void) QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW); DO_TEST("video-none-device", QEMU_CAPS_VNC); + DO_TEST_CAPS_LATEST("video-virtio-vga-gpu-gl"); DO_TEST_CAPS_LATEST("intel-iommu"); DO_TEST_CAPS_LATEST("intel-iommu-caching-mode"); -- 2.31.1
On 6/9/21 10:32 AM, Han Han wrote:
Diff from v1: - Leave qemuBuildVirtioDevStr() unmodified - New patch: qemu_validate: Validate virtio*gl* devices for 3d accerlation - Use DO_TEST_CAPS_LATEST instead of DO_TEST - Save video-virtio-vga-gpu-gl.x86_64-latest.xml as the sym link of tests/qemuxml2argvdata/video-virtio-vga-gpu-gl.xml
v1: https://listman.redhat.com/archives/libvir-list/2021-June/msg00181.html
Han Han (6): qemu_capabilities: Add QEMU_CAPS_VIRTIO_GPU_GL_PCI qemu_capabilities: Add QEMU_CAPS_VIRTIO_VGA_GL qemu_validate: Validate virtio*gl* devices for 3d accerlation qemu: Adapt to virtio-gpu-gl-pci device qemu: Adapt to virtio-vga-gl device tests: Tests for virtio-vga-gl and virtio-gpu-gl-pci device
src/qemu/qemu_capabilities.c | 4 ++ src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 8 ++++ src/qemu/qemu_validate.c | 4 +- .../caps_6.1.0.x86_64.xml | 2 + ...video-virtio-vga-gpu-gl.x86_64-latest.args | 35 ++++++++++++++ .../video-virtio-vga-gpu-gl.xml | 46 +++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + .../video-virtio-vga-gpu-gl.x86_64-latest.xml | 1 + tests/qemuxml2xmltest.c | 1 + 10 files changed, 103 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/video-virtio-vga-gpu-gl.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/video-virtio-vga-gpu-gl.xml create mode 120000 tests/qemuxml2xmloutdata/video-virtio-vga-gpu-gl.x86_64-latest.xml
Patches look good. Please let me know if you agree with me squashing in suggested diffs. Michal
On Fri, Jun 11, 2021 at 4:55 PM Michal Prívozník <mprivozn@redhat.com> wrote:
On 6/9/21 10:32 AM, Han Han wrote:
Diff from v1: - Leave qemuBuildVirtioDevStr() unmodified - New patch: qemu_validate: Validate virtio*gl* devices for 3d accerlation - Use DO_TEST_CAPS_LATEST instead of DO_TEST - Save video-virtio-vga-gpu-gl.x86_64-latest.xml as the sym link of tests/qemuxml2argvdata/video-virtio-vga-gpu-gl.xml
v1: https://listman.redhat.com/archives/libvir-list/2021-June/msg00181.html
Han Han (6): qemu_capabilities: Add QEMU_CAPS_VIRTIO_GPU_GL_PCI qemu_capabilities: Add QEMU_CAPS_VIRTIO_VGA_GL qemu_validate: Validate virtio*gl* devices for 3d accerlation qemu: Adapt to virtio-gpu-gl-pci device qemu: Adapt to virtio-vga-gl device tests: Tests for virtio-vga-gl and virtio-gpu-gl-pci device
src/qemu/qemu_capabilities.c | 4 ++ src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 8 ++++ src/qemu/qemu_validate.c | 4 +- .../caps_6.1.0.x86_64.xml | 2 + ...video-virtio-vga-gpu-gl.x86_64-latest.args | 35 ++++++++++++++ .../video-virtio-vga-gpu-gl.xml | 46 +++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + .../video-virtio-vga-gpu-gl.x86_64-latest.xml | 1 + tests/qemuxml2xmltest.c | 1 + 10 files changed, 103 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/video-virtio-vga-gpu-gl.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/video-virtio-vga-gpu-gl.xml create mode 120000 tests/qemuxml2xmloutdata/video-virtio-vga-gpu-gl.x86_64-latest.xml
Patches look good. Please let me know if you agree with me squashing in suggested diffs.
Only a trivial suggestion to your diffs. Others look good to me.
Michal
On 6/11/21 12:49 PM, Han Han wrote:
On Fri, Jun 11, 2021 at 4:55 PM Michal Prívozník <mprivozn@redhat.com> wrote:
On 6/9/21 10:32 AM, Han Han wrote:
Diff from v1: - Leave qemuBuildVirtioDevStr() unmodified - New patch: qemu_validate: Validate virtio*gl* devices for 3d accerlation - Use DO_TEST_CAPS_LATEST instead of DO_TEST - Save video-virtio-vga-gpu-gl.x86_64-latest.xml as the sym link of tests/qemuxml2argvdata/video-virtio-vga-gpu-gl.xml
v1: https://listman.redhat.com/archives/libvir-list/2021-June/msg00181.html
Han Han (6): qemu_capabilities: Add QEMU_CAPS_VIRTIO_GPU_GL_PCI qemu_capabilities: Add QEMU_CAPS_VIRTIO_VGA_GL qemu_validate: Validate virtio*gl* devices for 3d accerlation qemu: Adapt to virtio-gpu-gl-pci device qemu: Adapt to virtio-vga-gl device tests: Tests for virtio-vga-gl and virtio-gpu-gl-pci device
src/qemu/qemu_capabilities.c | 4 ++ src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 8 ++++ src/qemu/qemu_validate.c | 4 +- .../caps_6.1.0.x86_64.xml | 2 + ...video-virtio-vga-gpu-gl.x86_64-latest.args | 35 ++++++++++++++ .../video-virtio-vga-gpu-gl.xml | 46 +++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + .../video-virtio-vga-gpu-gl.x86_64-latest.xml | 1 + tests/qemuxml2xmltest.c | 1 + 10 files changed, 103 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/video-virtio-vga-gpu-gl.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/video-virtio-vga-gpu-gl.xml create mode 120000 tests/qemuxml2xmloutdata/video-virtio-vga-gpu-gl.x86_64-latest.xml
Patches look good. Please let me know if you agree with me squashing in suggested diffs.
Only a trivial suggestion to your diffs. Others look good to me.
Cool, in that case: Reviewed-by: Michal Privoznik <mprivozn@redhat.com> and pushed. Michal
participants (2)
-
Han Han -
Michal Prívozník