26e17db3c8
- build: Bump minimum glib2 version to 2.66.0 (RHEL-77884) - qemuProcessHandleIOError: Refactor to extract 'priv' instead of 'driver' (RHEL-77884) - qemu: Handle quirks of 'device' field of BLOCK_IO_ERROR event in monitor code (RHEL-77884) - qemu: Rename 'diskAlias' to 'device' in qemu IO error event handling (RHEL-77884) - qemuProcessHandleIOError: Rename local variables (RHEL-77884) - qemuMonitorJSONHandleIOError: Do not munge 'reason' field of IO error event (RHEL-77884) - qemuProcessHandleIOError: Prefer lookup by node name (RHEL-77884) - qemuMonitorJSONHandleIOError: Propagate new 'qom-path' field (RHEL-77884) - virStorageSource: Add fields for storing last I/O error message (RHEL-77884) - qemuProcessHandleIOError: Populate I/O error reason to virStorageSource (RHEL-77884) - qemuProcessHandleIOError: Log IO errors in the VM log file (RHEL-77884) - libxlDomainGetMessages: Add existing flags to 'virCheckFlags' (RHEL-77884) - virDomainObjGetMessages: Refactor using GPtrArray (RHEL-77884) - virDomainGetMessages: Introduce VIR_DOMAIN_MESSAGE_IOERRORS (RHEL-77884) - include: libvirt-domain: Reword documentation for @reason of VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON (RHEL-77884) - include: libvirt-domain: Add 'message' @reason of VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON (RHEL-77884) - qemuSnapshotForEachQcow2: Don't initialize 'nrollback' (RHEL-73315) - qemu: process: Export qemuPrepareNVRAM for use in snapshot code (RHEL-73315) - qemu: snapshot: Ensure that NVRAM image exists when taking inactive internal snapshot (RHEL-73315) - qemuxmlconftest: Allow testing of the 'writable' flag for passed FDs for disks (RHEL-37519) - qemuxmlconftest: Add testing of FDs with 'writable' flag in 'disk-source-fd' (RHEL-37519) - qemu: domain: Initialize FD passthrough for a virStorageSource before using it (RHEL-37519) Resolves: RHEL-37519, RHEL-73315, RHEL-77884
72 lines
2.9 KiB
Diff
72 lines
2.9 KiB
Diff
From 81ccb43343bfd63358b610ef5a44082e2c5081f4 Mon Sep 17 00:00:00 2001
|
|
Message-ID: <81ccb43343bfd63358b610ef5a44082e2c5081f4.1738940191.git.jdenemar@redhat.com>
|
|
From: Peter Krempa <pkrempa@redhat.com>
|
|
Date: Thu, 6 Feb 2025 15:50:35 +0100
|
|
Subject: [PATCH] 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>
|
|
(cherry picked from commit 500d985a130ff7910ca6cdeac42046d7301da43f)
|
|
|
|
https://issues.redhat.com/browse/RHEL-37519
|
|
---
|
|
tests/qemuxmlconftest.c | 6 +++---
|
|
tests/testutilsqemu.c | 2 ++
|
|
tests/testutilsqemu.h | 2 +-
|
|
3 files changed, 6 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
|
|
index 53a0237a42..7da622e9be 100644
|
|
--- a/tests/qemuxmlconftest.c
|
|
+++ b/tests/qemuxmlconftest.c
|
|
@@ -1653,9 +1653,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 5caccbc6b4..d395a1e61b 100644
|
|
--- a/tests/testutilsqemu.c
|
|
+++ b/tests/testutilsqemu.c
|
|
@@ -705,11 +705,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 74e307d653..20135b8390 100644
|
|
--- 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,
|
|
--
|
|
2.48.1
|