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
37 lines
1.3 KiB
Diff
37 lines
1.3 KiB
Diff
From b6efc51ef60d5aa4ee94a85ad7211ab51034407e Mon Sep 17 00:00:00 2001
|
|
Message-ID: <b6efc51ef60d5aa4ee94a85ad7211ab51034407e.1738940191.git.jdenemar@redhat.com>
|
|
From: Peter Krempa <pkrempa@redhat.com>
|
|
Date: Mon, 3 Feb 2025 18:23:29 +0100
|
|
Subject: [PATCH] qemuSnapshotForEachQcow2: Don't initialize 'nrollback'
|
|
|
|
The variable holds the amount of disks to roll back the snapshot for.
|
|
The value must be set before the code jumps to the 'rollback:' label so
|
|
the best situation is to not initialize it and let the compiler catch
|
|
errors rather than initialize the unsigned variable to -1 and let it
|
|
crash.
|
|
|
|
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
|
|
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
|
|
(cherry picked from commit d15eff63041ace067fa0ea9687c482a0f1dd140f)
|
|
|
|
https://issues.redhat.com/browse/RHEL-73315
|
|
---
|
|
src/qemu/qemu_snapshot.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c
|
|
index 80cd54bf33..7c998afe6f 100644
|
|
--- a/src/qemu/qemu_snapshot.c
|
|
+++ b/src/qemu/qemu_snapshot.c
|
|
@@ -290,7 +290,7 @@ qemuSnapshotForEachQcow2(virDomainDef *def,
|
|
size_t i;
|
|
bool skipped = false;
|
|
bool create = STREQ(op, "-c");
|
|
- size_t nrollback = -1;
|
|
+ size_t nrollback;
|
|
virErrorPtr orig_err;
|
|
|
|
/* pre-checks */
|
|
--
|
|
2.48.1
|