71 lines
2.4 KiB
Diff
71 lines
2.4 KiB
Diff
From 8dcea1141c60ebc7c7a292b8112ca74a0ad56c46 Mon Sep 17 00:00:00 2001
|
|
From: tangbin <tangbin_yewu@cmss.chinamobile.com>
|
|
Date: Wed, 23 Nov 2022 15:03:37 +0200
|
|
Subject: [PATCH 03/23] qemu: fix domain start with corrupted save file
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Commit 21ad56e932 introduced a regression where a VM with a corrupted
|
|
save image file would fail to start on the first attempt. This was
|
|
caused by returning a wrong return code as 'fd' was abused to also hold
|
|
the return code.
|
|
|
|
Since it's easy to miss this nuance, introduce a 'ret' variable for the
|
|
return code and return it' value in the error section.
|
|
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1791522
|
|
|
|
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
|
|
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
Reviewed-by: Pavel Mores <pmores@redhat.com>
|
|
|
|
Signed-off-by: tangbin <tangbin_yewu@cmss.chinamobile.com>
|
|
(cherry-pick from f76a57182046da59af5547a1c02094dc9d61ad88)
|
|
---
|
|
src/qemu/qemu_driver.c | 7 ++++---
|
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
|
|
index a3617b4d73..10ddbba325 100644
|
|
--- a/src/qemu/qemu_driver.c
|
|
+++ b/src/qemu/qemu_driver.c
|
|
@@ -6587,6 +6587,7 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver,
|
|
bool unlink_corrupt)
|
|
{
|
|
int fd = -1;
|
|
+ int ret = -1;
|
|
virQEMUSaveDataPtr data = NULL;
|
|
virQEMUSaveHeaderPtr header;
|
|
virDomainDefPtr def = NULL;
|
|
@@ -6622,7 +6623,7 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver,
|
|
_("cannot remove corrupt file: %s"),
|
|
path);
|
|
} else {
|
|
- fd = -3;
|
|
+ ret = -3;
|
|
}
|
|
} else {
|
|
virReportError(VIR_ERR_OPERATION_FAILED,
|
|
@@ -6643,7 +6644,7 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver,
|
|
_("cannot remove corrupt file: %s"),
|
|
path);
|
|
} else {
|
|
- fd = -3;
|
|
+ ret = -3;
|
|
}
|
|
goto error;
|
|
}
|
|
@@ -6712,7 +6713,7 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver,
|
|
virDomainDefFree(def);
|
|
virQEMUSaveDataFree(data);
|
|
VIR_FORCE_CLOSE(fd);
|
|
- return -1;
|
|
+ return ret;
|
|
}
|
|
|
|
static int ATTRIBUTE_NONNULL(4) ATTRIBUTE_NONNULL(5) ATTRIBUTE_NONNULL(6)
|
|
--
|
|
2.27.0
|
|
|