From: Peter Krempa <[email protected]>
Signed-off-by: Peter Krempa <[email protected]>
---
tests/qemuxmlconfdata/vhost-vsock-auto.x86_64-latest.args | 2 +-
tests/qemuxmlconfdata/vhost-vsock-ccw-auto.s390x-latest.args | 2 +-
tests/qemuxmlconfdata/vhost-vsock-ccw-iommu.s390x-latest.args | 2 +-
tests/qemuxmlconfdata/vhost-vsock-ccw.s390x-latest.args | 2 +-
tests/qemuxmlconfdata/vhost-vsock.x86_64-latest.args | 2 +-
.../qemuxmlconfdata/virtio-non-transitional.x86_64-latest.args | 2 +-
tests/qemuxmlconfdata/virtio-transitional.x86_64-latest.args | 2 +-
tests/qemuxmlconftest.c | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/tests/qemuxmlconfdata/vhost-vsock-auto.x86_64-latest.args
b/tests/qemuxmlconfdata/vhost-vsock-auto.x86_64-latest.args
index b3f2e06c72..ff42814fb3 100644
--- 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 ccc7152713..2a8affa58b 100644
--- 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 a83ab0cc4b..3b3642401c 100644
--- 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 3552cf18b6..1d3c5ea6ae 100644
--- 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 e26677052b..49dc0f85b1 100644
--- 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 0701791d47..aab6118333 100644
--- 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 8963b6c986..68ba7377e2 100644
--- 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 646077648f..c45701978c 100644
--- 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++) {
--
2.54.0
