qemuxmlconftest: Use real FDS for testing of 'vsock'

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

diff --git a/tests/qemuxmlconfdata/vhost-vsock-auto.x86_64-latest.args b/tests/qemuxmlconfdata/vhost-vsock-auto.x86_64-latest.args
index b3f2e06c729ca3be9d9af3352b4f32826dcb5a61..ff42814fb3e0602edfbde72eced09975e4fea1b9 100644 (file)
--- a/tests/qemuxmlconfdata/vhost-vsock-auto.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/vhost-vsock-auto.x86_64-latest.args
@@ -30,5 +30,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0","addr":"0x6"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
--device '{"driver":"vhost-vsock-pci","id":"vsock0","guest-cid":42,"vhostfd":"XXXXXXX","bus":"pci.0","addr":"0x2"}' \
+-device '{"driver":"vhost-vsock-pci","id":"vsock0","guest-cid":42,"vhostfd":"@vsock-vhost-fd@","bus":"pci.0","addr":"0x2"}' \
 -msg timestamp=on

diff --git a/tests/qemuxmlconfdata/vhost-vsock-ccw-auto.s390x-latest.args b/tests/qemuxmlconfdata/vhost-vsock-ccw-auto.s390x-latest.args
index ccc7152713d95c77ffc92daa7f295f4ce40d8596..2a8affa58bd65b9d6be53523fac45a12c7bb6cf8 100644 (file)
--- a/tests/qemuxmlconfdata/vhost-vsock-ccw-auto.s390x-latest.args
+++ b/tests/qemuxmlconfdata/vhost-vsock-ccw-auto.s390x-latest.args
@@ -31,5 +31,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0001"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
--device '{"driver":"vhost-vsock-ccw","id":"vsock0","guest-cid":42,"vhostfd":"XXXXXXX","devno":"fe.0.0002"}' \
+-device '{"driver":"vhost-vsock-ccw","id":"vsock0","guest-cid":42,"vhostfd":"@vsock-vhost-fd@","devno":"fe.0.0002"}' \
 -msg timestamp=on

diff --git a/tests/qemuxmlconfdata/vhost-vsock-ccw-iommu.s390x-latest.args b/tests/qemuxmlconfdata/vhost-vsock-ccw-iommu.s390x-latest.args
index a83ab0cc4b55dd8bd66ba1b3827533fb410ae552..3b3642401c12dc7108a4e3224f544250f0554aff 100644 (file)
--- a/tests/qemuxmlconfdata/vhost-vsock-ccw-iommu.s390x-latest.args
+++ b/tests/qemuxmlconfdata/vhost-vsock-ccw-iommu.s390x-latest.args
@@ -31,5 +31,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0001"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
--device '{"driver":"vhost-vsock-ccw","iommu_platform":true,"id":"vsock0","guest-cid":4,"vhostfd":"XXXXXXX","devno":"fe.0.0002"}' \
+-device '{"driver":"vhost-vsock-ccw","iommu_platform":true,"id":"vsock0","guest-cid":4,"vhostfd":"@vsock-vhost-fd@","devno":"fe.0.0002"}' \
 -msg timestamp=on

diff --git a/tests/qemuxmlconfdata/vhost-vsock-ccw.s390x-latest.args b/tests/qemuxmlconfdata/vhost-vsock-ccw.s390x-latest.args
index 3552cf18b6e8bfa5d7c174883f0ab9f31a9aac08..1d3c5ea6aede96542f96bdde4f145074269b617f 100644 (file)
--- a/tests/qemuxmlconfdata/vhost-vsock-ccw.s390x-latest.args
+++ b/tests/qemuxmlconfdata/vhost-vsock-ccw.s390x-latest.args
@@ -31,5 +31,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0001"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
--device '{"driver":"vhost-vsock-ccw","id":"vsock0","guest-cid":4,"vhostfd":"XXXXXXX","devno":"fe.0.0003"}' \
+-device '{"driver":"vhost-vsock-ccw","id":"vsock0","guest-cid":4,"vhostfd":"@vsock-vhost-fd@","devno":"fe.0.0003"}' \
 -msg timestamp=on

diff --git a/tests/qemuxmlconfdata/vhost-vsock.x86_64-latest.args b/tests/qemuxmlconfdata/vhost-vsock.x86_64-latest.args
index e26677052b42401da8bfe77cde9741ff7204a40b..49dc0f85b178cd5b6e935496f8d23f9780a534d9 100644 (file)
--- a/tests/qemuxmlconfdata/vhost-vsock.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/vhost-vsock.x86_64-latest.args
@@ -30,5 +30,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0","addr":"0x6"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
--device '{"driver":"vhost-vsock-pci","id":"vsock0","guest-cid":4,"vhostfd":"XXXXXXX","bus":"pci.0","addr":"0x7"}' \
+-device '{"driver":"vhost-vsock-pci","id":"vsock0","guest-cid":4,"vhostfd":"@vsock-vhost-fd@","bus":"pci.0","addr":"0x7"}' \
 -msg timestamp=on

diff --git a/tests/qemuxmlconfdata/virtio-non-transitional.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-non-transitional.x86_64-latest.args
index 0701791d4724ae7ae601037cb6e0cdc7bdabc6b6..aab61183336436672777591f9e6777b2245d0116 100644 (file)
--- a/tests/qemuxmlconfdata/virtio-non-transitional.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-non-transitional.x86_64-latest.args
@@ -52,5 +52,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"}' \
 -device '{"driver":"virtio-rng-pci-non-transitional","rng":"objrng0","id":"rng0","bus":"pci.8","addr":"0x0"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
--device '{"driver":"vhost-vsock-pci-non-transitional","id":"vsock0","guest-cid":4,"vhostfd":"XXXXXXX","bus":"pci.9","addr":"0x0"}' \
+-device '{"driver":"vhost-vsock-pci-non-transitional","id":"vsock0","guest-cid":4,"vhostfd":"@vsock-vhost-fd@","bus":"pci.9","addr":"0x0"}' \
 -msg timestamp=on

diff --git a/tests/qemuxmlconfdata/virtio-transitional.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-transitional.x86_64-latest.args
index 8963b6c9861a6a96a2d10d8eb735f76e870c3690..68ba7377e248eb20e0b20eddfd41f97805e31b05 100644 (file)
--- a/tests/qemuxmlconfdata/virtio-transitional.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-transitional.x86_64-latest.args
@@ -45,5 +45,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"}' \
 -device '{"driver":"virtio-rng-pci-transitional","rng":"objrng0","id":"rng0","bus":"pci.2","addr":"0x8"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
--device '{"driver":"vhost-vsock-pci-transitional","id":"vsock0","guest-cid":4,"vhostfd":"XXXXXXX","bus":"pci.2","addr":"0x9"}' \
+-device '{"driver":"vhost-vsock-pci-transitional","id":"vsock0","guest-cid":4,"vhostfd":"@vsock-vhost-fd@","bus":"pci.2","addr":"0x9"}' \
 -msg timestamp=on

diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
index 646077648fffd1f50fd7c639aaceb935fbd56641..c45701978c6b1ce22c8542e4bf36c377273b3baf 100644 (file)
--- a/tests/qemuxmlconftest.c
+++ b/tests/qemuxmlconftest.c
@@ -193,7 +193,7 @@ testCompareXMLToArgvCreateArgs(virQEMUDriver *drv,
         if (vsock->auto_cid == VIR_TRISTATE_BOOL_YES)
             vsock->guest_cid = 42;
 
-        vsockPriv->vhostfd = 6789;
+        vsockPriv->vhostfd = virTestMakeDummyFD(g_strdup("@vsock-vhost-fd@"));
     }
 
     for (i = 0; i < vm->def->nfss; i++) {