testQemuInfoSetArgs: Use real FDs with 'ARG_FD_GROUP'

Switch over to 'virTestMakeDummyFD' which allows to use real FDs in the
test and also allows to track them in the output files in a stable way.

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

diff --git a/tests/qemuxmlconfdata/disk-source-fd.x86_64-latest.args b/tests/qemuxmlconfdata/disk-source-fd.x86_64-latest.args
index 54f7839868a6e2bc3155aecb85f17b2fc92961e0..4a3dfdc0bf0d7213b98e7974dbfb89ab4b1e88f9 100644 (file)
--- a/tests/qemuxmlconfdata/disk-source-fd.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-source-fd.x86_64-latest.args
@@ -27,26 +27,26 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-shutdown \
 -boot strict=on \
 -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
--add-fd set=5,fd=XXXXXXX,opaque=libvirt-6-storage0 \
--add-fd set=5,fd=XXXXXXX,opaque=libvirt-6-storage1 \
+-add-fd set=5,fd=@testgroup2-0@-dup,opaque=libvirt-6-storage0 \
+-add-fd set=5,fd=@testgroup2-1@-dup,opaque=libvirt-6-storage1 \
 -blockdev '{"driver":"file","filename":"/dev/fdset/5","node-name":"libvirt-6-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-6-format","read-only":false,"driver":"qcow2","file":"libvirt-6-storage"}' \
 -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"libvirt-6-format","id":"virtio-disk4","bootindex":1}' \
--add-fd set=4,fd=XXXXXXX,opaque=libvirt-5-storage0 \
+-add-fd set=4,fd=@raw-rw-base-0@-dup,opaque=libvirt-5-storage0 \
 -blockdev '{"driver":"file","filename":"/dev/fdset/4","node-name":"libvirt-5-storage","read-only":false,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-5-format","read-only":true,"driver":"raw","file":"libvirt-5-storage"}' \
--add-fd set=3,fd=XXXXXXX,opaque=libvirt-4-storage0 \
--add-fd set=3,fd=XXXXXXX,opaque=libvirt-4-storage1 \
+-add-fd set=3,fd=@testgroup6-0@-dup,opaque=libvirt-4-storage0 \
+-add-fd set=3,fd=@testgroup6-1@-dup,opaque=libvirt-4-storage1 \
 -blockdev '{"driver":"file","filename":"/dev/fdset/3","node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-4-format","read-only":true,"driver":"qcow2","file":"libvirt-4-storage","backing":"libvirt-5-format"}' \
--add-fd set=2,fd=XXXXXXX,opaque=libvirt-3-storage0 \
+-add-fd set=2,fd=@testgroup5-0@-dup,opaque=libvirt-3-storage0 \
 -blockdev '{"driver":"file","filename":"/dev/fdset/2","node-name":"libvirt-3-storage","read-only":false,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"qcow2","file":"libvirt-3-storage","backing":"libvirt-4-format"}' \
 -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"libvirt-3-format","id":"virtio-disk5"}' \
--add-fd set=1,fd=XXXXXXX,opaque=libvirt-2-storage0 \
+-add-fd set=1,fd=@cdimage-ro-0@-dup,opaque=libvirt-2-storage0 \
 -blockdev '{"driver":"file","filename":"/dev/fdset/1","node-name":"libvirt-2-storage","read-only":true}' \
 -device '{"driver":"ide-cd","bus":"ide.0","unit":0,"drive":"libvirt-2-storage","id":"ide0-0-0"}' \
--add-fd set=0,fd=XXXXXXX,opaque=libvirt-1-storage0 \
+-add-fd set=0,fd=@cdimage-rw-0@-dup,opaque=libvirt-1-storage0 \
 -blockdev '{"driver":"file","filename":"/dev/fdset/0","node-name":"libvirt-1-storage","read-only":false,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}' \
 -device '{"driver":"ide-cd","bus":"ide.0","unit":1,"drive":"libvirt-1-format","id":"ide0-0-1"}' \

diff --git a/tests/qemuxmlconfdata/iommufd-q35-fd.x86_64-latest.args b/tests/qemuxmlconfdata/iommufd-q35-fd.x86_64-latest.args
index 730855afe140514d17bc6fd6ed06d8038c5e1676..bf4ee71d7ae295b09e6fb55f70d9662530f72b9c 100644 (file)
--- a/tests/qemuxmlconfdata/iommufd-q35-fd.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/iommufd-q35-fd.x86_64-latest.args
@@ -35,7 +35,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
 -device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pcie.0","addr":"0x1"}' \
 -global ICH9-LPC.noreboot=off \
 -watchdog-action reset \
--object '{"qom-type":"iommufd","id":"iommufd0","fd":"XXXXXXX"}' \
+-object '{"qom-type":"iommufd","id":"iommufd0","fd":"@iommu-0@-dup"}' \
 -device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"XXXXXXX","bus":"pcie.0","addr":"0x3"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
 -msg timestamp=on

diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
index 6ccafcde0e029e35784ee86cf4ab16fafa606d3b..80b1577475eee0bbf5f136be29d4d366b5068934 100644 (file)
--- a/tests/qemuxmlconftest.c
+++ b/tests/qemuxmlconftest.c
@@ -1749,12 +1749,12 @@ mymain(void)
     DO_TEST_CAPS_LATEST("disk-backing-chains-noindex");
     DO_TEST_CAPS_LATEST("disk-qcow2-datafile-store");
     DO_TEST_CAPS_ARCH_LATEST_FULL("disk-source-fd", "x86_64",
-                                  ARG_FD_GROUP, "testgroup2", false, 2, 200, 205,
-                                  ARG_FD_GROUP, "testgroup5", false, 1, 204,
-                                  ARG_FD_GROUP, "cdimage-ro", false, 1, 207,
-                                  ARG_FD_GROUP, "cdimage-rw", true, 1, 208,
-                                  ARG_FD_GROUP, "raw-rw-base", true, 1, 209,
-                                  ARG_FD_GROUP, "testgroup6", false, 2, 247, 248);
+                                  ARG_FD_GROUP, "testgroup2", false, 2,
+                                  ARG_FD_GROUP, "testgroup5", false, 1,
+                                  ARG_FD_GROUP, "cdimage-ro", false, 1,
+                                  ARG_FD_GROUP, "cdimage-rw", true, 1,
+                                  ARG_FD_GROUP, "raw-rw-base", true, 1,
+                                  ARG_FD_GROUP, "testgroup6", false, 2);
 
     DO_TEST_CAPS_LATEST("disk-slices");
     DO_TEST_CAPS_LATEST("disk-rotation");
@@ -2978,7 +2978,7 @@ mymain(void)
     DO_TEST_CAPS_LATEST("iommufd");
     DO_TEST_CAPS_LATEST("iommufd-q35");
     DO_TEST_CAPS_ARCH_LATEST_FULL("iommufd-q35-fd", "x86_64",
-                                  ARG_FD_GROUP, "iommu", false, 1, 20);
+                                  ARG_FD_GROUP, "iommu", false, 1);
     DO_TEST_CAPS_ARCH_LATEST("iommufd-virt", "aarch64");
     DO_TEST_CAPS_ARCH_LATEST("iommufd-virt-pci-bus-single", "aarch64");
 

diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index e8cd1b16b1e4c76165731c0f9993ea9ade83f814..81dff17cc9c84a2ee52dad6214f1a7ae72f0d932 100644 (file)
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -714,28 +714,15 @@ testQemuInfoSetArgs(testQemuInfo *info,
         case ARG_FD_GROUP: {
             virDomainFDTuple *new = virDomainFDTupleNew();
             const char *fdname = va_arg(argptr, char *);
-            VIR_AUTOCLOSE fakefd = open("/dev/zero", O_RDWR);
             bool writable = va_arg(argptr, int);
             size_t i;
 
             new->nfds = va_arg(argptr, unsigned int);
             new->fds = g_new0(int, new->nfds);
-            new->testfds = g_new0(int, new->nfds);
             new->writable = writable;
 
             for (i = 0; i < new->nfds; i++) {
-                new->testfds[i] = va_arg(argptr, unsigned int);
-
-                if (fcntl(new->testfds[i], F_GETFD) != -1) {
-                    fprintf(stderr, "fd '%d' is already in use\n", new->testfds[i]);
-                    abort();
-                }
-
-                if ((new->fds[i] = dup(fakefd)) < 0) {
-                    fprintf(stderr, "failed to duplicate fake fd: %s",
-                            g_strerror(errno));
-                    abort();
-                }
+                new->fds[i] = virTestMakeDummyFD(g_strdup_printf("@%s-%zu@", fdname, i));
             }
 
             if (!info->args.fds)