Re: [PATCH 5/5] tests: Tests for virtio-vga-gl and virtio-gpu-gl-pci device

On 6/9/21 5:08 AM, Han Han wrote: > On Tue, Jun 8, 2021 at 10:14 PM Michal Prívozník <mprivozn(a)redhat.com&gt; > wrote: > >> On 6/8/21 3:15 AM, Han Han wrote: >>> Signed-off-by: Han Han <hhan(a)redhat.com&gt; >>> --- >>> .../video-virtio-vga-gpu-gl.args | 29 +++++++++++++ >>> .../video-virtio-vga-gpu-gl.xml | 34 +++++++++++++++ >>> tests/qemuxml2argvtest.c | 6 +++ >>> .../video-virtio-vga-gpu-gl.xml | 43 +++++++++++++++++++ >>> tests/qemuxml2xmltest.c | 6 +++ >>> 5 files changed, 118 insertions(+) >>> create mode 100644 tests/qemuxml2argvdata/video-virtio-vga-gpu-gl.args >>> create mode 100644 tests/qemuxml2argvdata/video-virtio-vga-gpu-gl.xml >>> create mode 100644 tests/qemuxml2xmloutdata/video-virtio-vga-gpu-gl.xml >>> >>> diff --git a/tests/qemuxml2argvdata/video-virtio-vga-gpu-gl.args >> b/tests/qemuxml2argvdata/video-virtio-vga-gpu-gl.args >>> new file mode 100644 >>> index 0000000000..72e04f3c3e >>> --- /dev/null >>> +++ b/tests/qemuxml2argvdata/video-virtio-vga-gpu-gl.args >>> @@ -0,0 +1,29 @@ >>> +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 \ >>> +QEMU_AUDIO_DRV=none \ >>> +/usr/bin/qemu-system-x86_64 \ >>> +-name QEMUGuest1 \ >>> +-S \ >>> +-machine pc,accel=tcg,usb=off,dump-guest-core=off \ >>> +-m 1024 \ >>> +-realtime mlock=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,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off >> \ >>> +-mon chardev=charmonitor,id=monitor,mode=control \ >>> +-rtc base=utc \ >>> +-no-shutdown \ >>> +-no-acpi \ >>> +-usb \ >>> +-device virtio-vga-gl,id=video0,bus=pci.0,addr=0x2 \ >>> +-device virtio-gpu-gl-pci,id=video1,bus=pci.0,addr=0x4 \ >>> +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 >>> 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..40e68fc458 >>> --- /dev/null >>> +++ b/tests/qemuxml2argvdata/video-virtio-vga-gpu-gl.xml >>> @@ -0,0 +1,34 @@ >>> +<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> >>> + <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'/> >>> + <controller type='usb' index='0'/> >>> + <controller type='pci' index='0' model='pci-root'/> >>> + <input type='mouse' bus='ps2'/> >>> + <input type='keyboard' bus='ps2'/> >>> + <video> >>> + <model type='virtio' heads='1' primary='yes'> >>> + <acceleration accel3d='yes'/> >>> + </model> >>> + </video> >>> + <video> >>> + <model type='virtio' heads='1'> >>> + <acceleration accel3d='yes'/> >>> + </model> >>> + </video> >>> + <memballoon model='virtio'/> >>> + </devices> >>> +</domain> >>> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c >>> index f9ec81eb8e..99fe7ac115 100644 >>> --- a/tests/qemuxml2argvtest.c >>> +++ b/tests/qemuxml2argvtest.c >>> @@ -2501,6 +2501,12 @@ mymain(void) >>> QEMU_CAPS_DEVICE_VIRTIO_GPU, >>> QEMU_CAPS_DEVICE_VIRTIO_VGA, >>> QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS); >>> + DO_TEST("video-virtio-vga-gpu-gl", >>> + QEMU_CAPS_DEVICE_VIRTIO_GPU, >>> + QEMU_CAPS_DEVICE_VIRTIO_VGA, >>> + QEMU_CAPS_VIRTIO_GPU_VIRGL, >>> + QEMU_CAPS_VIRTIO_GPU_GL_PCI, >>> + QEMU_CAPS_VIRTIO_VGA_GL); >> >> Any reason for not using DO_TEST_CAPS_LATEST()? >> > I tried DO_TEST_CAPS_LATEST(), but as I remembered, it reported an error > "3d acceleration is not supported" when running tests. That looks > like QEMU_CAPS_VIRTIO_GPU_VIRGL is missing in DO_TEST_CAPS_LATEST() Of course it is! That is the whole point of the gilab issue. Previously QEMU had -device virtio-*,virgl=on but now they promoted virgl into a device and thus they have -device virtio-*-gl-* (which then no longer has/needs virgl attribute) The QEMU_CAPS_VIRTIO_GPU_VIRGL capability checks, whether virgl attribute is present. It won't be with these new devices.

> > I will try DO_TEST_CAPS_LATEST() again to see if it will happen > >> >>> 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.xml >> b/tests/qemuxml2xmloutdata/video-virtio-vga-gpu-gl.xml >>> new file mode 100644 >>> index 0000000000..618d70c635 >>> --- /dev/null >>> +++ b/tests/qemuxml2xmloutdata/video-virtio-vga-gpu-gl.xml >> >> This output XML differs from the input XML only in unimportant details >> (e.g. PCI addresses computed for <controller/>-s). Can those changes be >> made to the input XML and this be just a symlink to the input XML? >> > Yes. Because of no updates on xml formatting codes, I think it is OK to > create a symlink of input xml > for the output xml. Exactly. We don't need to check if parser/post parse callback fills in some missing info. Michal