qemuxmlconftest: Allow testing of the 'writable' flag for passed FDs for disks

Pass also the 'writable' state to the fake passed FDs so that we can
test it.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>

diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
index 3ddb19a7ed3f3fbdf2f7791cdb0de4656013c422..99c4efc9d6d48712aaee22a07c266de8d47fe3d2 100644 (file)
--- a/tests/qemuxmlconftest.c
+++ b/tests/qemuxmlconftest.c
@@ -1655,9 +1655,9 @@ 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", 2, 200, 205,
-                                  ARG_FD_GROUP, "testgroup5", 1, 204,
-                                  ARG_FD_GROUP, "testgroup6", 2, 247, 248);
+                                  ARG_FD_GROUP, "testgroup2", false, 2, 200, 205,
+                                  ARG_FD_GROUP, "testgroup5", false, 1, 204,
+                                  ARG_FD_GROUP, "testgroup6", false, 2, 247, 248);
 
     DO_TEST_CAPS_LATEST("disk-slices");
     DO_TEST_CAPS_LATEST("disk-rotation");

diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index abc425b9b74c68202ed530ce2ce01b06e84d012e..44011c2b363055f4630307d4e1dcad326167d9a1 100644 (file)
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -704,11 +704,13 @@ testQemuInfoSetArgs(testQemuInfo *info,
             virStorageSourceFDTuple *new = virStorageSourceFDTupleNew();
             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);

diff --git a/tests/testutilsqemu.h b/tests/testutilsqemu.h
index 74e307d65346d4bea023997860f78e357be98cec..20135b8390aef9afab26a447f0007b528622899f 100644 (file)
--- a/tests/testutilsqemu.h
+++ b/tests/testutilsqemu.h
@@ -49,7 +49,7 @@ typedef enum {
     ARG_CAPS_VER,
     ARG_CAPS_VARIANT,
     ARG_CAPS_HOST_CPU_MODEL,
-    ARG_FD_GROUP, /* name, nfds, fd[0], ... fd[n-1] */
+    ARG_FD_GROUP, /* name, writable, nfds, fd[0], ... fd[n-1] */
     ARG_VDPA_FD, /* vdpadev, fd */
     ARG_NBDKIT_CAPS,
     ARG_END,