qemuxmlconftest: Setup real FDs for 'vhost-user-vga'

Initialize the chardev backends for vhost-user graphics to use real FDs.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/tests/qemuxmlconfdata/vhost-user-gpu-secondary.x86_64-latest.args b/tests/qemuxmlconfdata/vhost-user-gpu-secondary.x86_64-latest.args
index 96f6e67aa8c9c591484dc550b0b6670a3cd28e27..7e684d29659ffad927582be4796d5b92b7a0ae59 100644 (file)
--- a/tests/qemuxmlconfdata/vhost-user-gpu-secondary.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/vhost-user-gpu-secondary.x86_64-latest.args
@@ -31,9 +31,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","read-only":false}' \
 -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-storage","id":"ide0-0-0","bootindex":1}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
--chardev socket,id=chr-vu-video0,fd=XXXXXXX \
+-chardev socket,id=chr-vu-video0,fd=@vhost-user-video-fd@ \
 -device '{"driver":"vhost-user-vga","id":"video0","max_outputs":1,"chardev":"chr-vu-video0","bus":"pci.0","addr":"0x2"}' \
--chardev socket,id=chr-vu-video1,fd=XXXXXXX \
+-chardev socket,id=chr-vu-video1,fd=@vhost-user-video-fd@ \
 -device '{"driver":"vhost-user-gpu-pci","id":"video1","max_outputs":1,"chardev":"chr-vu-video1","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 \

diff --git a/tests/qemuxmlconfdata/vhost-user-vga.x86_64-latest.args b/tests/qemuxmlconfdata/vhost-user-vga.x86_64-latest.args
index 4ddc6ad65c01c684f112147f0ac035ec788f29fe..59ce629b405946f8eade07bc43b4e347f68293a3 100644 (file)
--- a/tests/qemuxmlconfdata/vhost-user-vga.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/vhost-user-vga.x86_64-latest.args
@@ -31,7 +31,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","read-only":false}' \
 -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-storage","id":"ide0-0-0","bootindex":1}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
--chardev socket,id=chr-vu-video0,fd=XXXXXXX \
+-chardev socket,id=chr-vu-video0,fd=@vhost-user-video-fd@ \
 -device '{"driver":"vhost-user-vga","id":"video0","max_outputs":1,"chardev":"chr-vu-video0","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 \

diff --git a/tests/qemuxmlconfdata/virtio-options-video-ats.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-video-ats.x86_64-latest.args
index 3b6e9e43afbb7770027f6981142287cd849db540..7d9f9832c0c84c83bf5c3591a2e58fc5c550b9b5 100644 (file)
--- a/tests/qemuxmlconfdata/virtio-options-video-ats.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-video-ats.x86_64-latest.args
@@ -28,9 +28,9 @@ 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"}' \
--chardev socket,id=chr-vu-video0,fd=XXXXXXX \
+-chardev socket,id=chr-vu-video0,fd=@vhost-user-video-fd@ \
 -device '{"driver":"vhost-user-vga","id":"video0","max_outputs":1,"chardev":"chr-vu-video0","bus":"pci.0","addr":"0x2"}' \
--chardev socket,id=chr-vu-video1,fd=XXXXXXX \
+-chardev socket,id=chr-vu-video1,fd=@vhost-user-video-fd@ \
 -device '{"driver":"vhost-user-gpu-pci","ats":false,"id":"video1","max_outputs":1,"chardev":"chr-vu-video1","bus":"pci.0","addr":"0x3"}' \
 -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x4"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \

diff --git a/tests/qemuxmlconfdata/virtio-options-video-iommu.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-video-iommu.x86_64-latest.args
index c37c260a7c47c35817960fe5476c957f5064b2fa..eb335a43beac914617842658d9f7dd5fbf478941 100644 (file)
--- a/tests/qemuxmlconfdata/virtio-options-video-iommu.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-video-iommu.x86_64-latest.args
@@ -28,9 +28,9 @@ 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"}' \
--chardev socket,id=chr-vu-video0,fd=XXXXXXX \
+-chardev socket,id=chr-vu-video0,fd=@vhost-user-video-fd@ \
 -device '{"driver":"vhost-user-vga","id":"video0","max_outputs":1,"chardev":"chr-vu-video0","bus":"pci.0","addr":"0x2"}' \
--chardev socket,id=chr-vu-video1,fd=XXXXXXX \
+-chardev socket,id=chr-vu-video1,fd=@vhost-user-video-fd@ \
 -device '{"driver":"vhost-user-gpu-pci","iommu_platform":false,"id":"video1","max_outputs":1,"chardev":"chr-vu-video1","bus":"pci.0","addr":"0x3"}' \
 -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x4"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \

diff --git a/tests/qemuxmlconfdata/virtio-options-video-packed.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-video-packed.x86_64-latest.args
index 9ef03eaa0f7907b19f27f53796ce659e81b6e885..aa4f382525e283ee02ca0b42f8a05e6deed4d904 100644 (file)
--- a/tests/qemuxmlconfdata/virtio-options-video-packed.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-video-packed.x86_64-latest.args
@@ -28,9 +28,9 @@ 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"}' \
--chardev socket,id=chr-vu-video0,fd=XXXXXXX \
+-chardev socket,id=chr-vu-video0,fd=@vhost-user-video-fd@ \
 -device '{"driver":"vhost-user-vga","id":"video0","max_outputs":1,"chardev":"chr-vu-video0","bus":"pci.0","addr":"0x2"}' \
--chardev socket,id=chr-vu-video1,fd=XXXXXXX \
+-chardev socket,id=chr-vu-video1,fd=@vhost-user-video-fd@ \
 -device '{"driver":"vhost-user-gpu-pci","packed":false,"id":"video1","max_outputs":1,"chardev":"chr-vu-video1","bus":"pci.0","addr":"0x3"}' \
 -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x4"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \

diff --git a/tests/qemuxmlconfdata/virtio-options.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options.x86_64-latest.args
index 4cb38ae04fd8ca85c50b92f4f3f66e8b467b72ae..28a8fd0f0325688c5114923ced88b7bf79c7ecee 100644 (file)
--- a/tests/qemuxmlconfdata/virtio-options.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options.x86_64-latest.args
@@ -45,7 +45,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -device '{"driver":"virtio-tablet-pci","iommu_platform":true,"ats":true,"packed":true,"page-per-vq":true,"id":"input2","bus":"pci.0","addr":"0x11"}' \
 -device '{"driver":"virtio-input-host-pci","iommu_platform":true,"ats":true,"packed":true,"page-per-vq":true,"id":"input3","evdev":"/dev/input/event1234","bus":"pci.0","addr":"0x12"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
--chardev socket,id=chr-vu-video0,fd=XXXXXXX \
+-chardev socket,id=chr-vu-video0,fd=@vhost-user-video-fd@ \
 -device '{"driver":"vhost-user-vga","id":"video0","max_outputs":1,"chardev":"chr-vu-video0","bus":"pci.0","addr":"0x2"}' \
 -device '{"driver":"virtio-balloon-pci","iommu_platform":true,"ats":true,"packed":true,"page-per-vq":true,"id":"balloon0","bus":"pci.0","addr":"0xc"}' \
 -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/random"}' \

diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
index 80b1577475eee0bbf5f136be29d4d366b5068934..ef071f564858379a8c15b9598daf8c20d65e123d 100644 (file)
--- a/tests/qemuxmlconftest.c
+++ b/tests/qemuxmlconftest.c
@@ -249,7 +249,7 @@ testCompareXMLToArgvCreateArgs(virQEMUDriver *drv,
         if (video->backend == VIR_DOMAIN_VIDEO_BACKEND_TYPE_VHOSTUSER) {
             qemuDomainVideoPrivate *vpriv = QEMU_DOMAIN_VIDEO_PRIVATE(video);
 
-            vpriv->vhost_user_fd = 1729;
+            vpriv->vhost_user_fd = virTestMakeDummyFD(g_strdup("@vhost-user-video-fd@"));
         }
     }