From 286a676a18053613fffebea894a56c68ff4d62d4 Mon Sep 17 00:00:00 2001 From: "taifu.gc" Date: Sat, 20 Jan 2024 15:06:14 +0800 Subject: [PATCH] Fix snapshot revert crash --- ...h-in-qemuSaveImageDecompressionStart.patch | 37 +++++++++++++++++++ libvirt.spec | 6 ++- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 0005-fix-crash-in-qemuSaveImageDecompressionStart.patch diff --git a/0005-fix-crash-in-qemuSaveImageDecompressionStart.patch b/0005-fix-crash-in-qemuSaveImageDecompressionStart.patch new file mode 100644 index 0000000..537d4d0 --- /dev/null +++ b/0005-fix-crash-in-qemuSaveImageDecompressionStart.patch @@ -0,0 +1,37 @@ +From 4f4a8dce944e05311565b690a84f6bb1ef67c086 Mon Sep 17 00:00:00 2001 +From: Pavel Hrdina +Date: Fri, 3 Nov 2023 14:03:55 +0100 +Subject: [PATCH] qemu_process: fix crash in qemuSaveImageDecompressionStart +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Commit changing the code to allow passing NULL as @data into +qemuSaveImageDecompressionStart() was not correct as it left the +original call into the function as well. + +Introduced-by: 2f3e582a1ac1008eba8d43c751cdba8712dd1614 +Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2247754 +Signed-off-by: Pavel Hrdina +Reviewed-by: Ján Tomko +--- + src/qemu/qemu_process.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c +index 1ef032dbd2..b9267d8699 100644 +--- a/src/qemu/qemu_process.c ++++ b/src/qemu/qemu_process.c +@@ -8208,9 +8208,6 @@ qemuProcessStartWithMemoryState(virConnectPtr conn, + } + } + +- if (qemuSaveImageDecompressionStart(data, fd, &intermediatefd, &errbuf, &cmd) < 0) +- return -1; +- + /* No cookie means libvirt which saved the domain was too old to mess up + * the CPU definitions. + */ +-- +GitLab + diff --git a/libvirt.spec b/libvirt.spec index ec2fe9a..7ba8240 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -1,4 +1,4 @@ -%define anolis_release 1 +%define anolis_release 2 %define arches_qemu_kvm x86_64 aarch64 loongarch64 @@ -166,6 +166,7 @@ Patch0001: Add-loongarch-cpu-model-and-vendor-info.patch Patch0002: Config-some-capabilities-for-loongarch-virt-machine.patch Patch0003: Implement-the-method-of-getting-host-info-for-loonga.patch Patch0004: Add-bios-path-for-loongarch.patch +Patch0005: 0005-fix-crash-in-qemuSaveImageDecompressionStart.patch Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon-config-network = %{version}-%{release} @@ -2143,6 +2144,9 @@ exit 0 %changelog +* Fri Jan 19 2024 Chang Gao - 9.9.0-2 +- Fix crash when revert snapshot + * Thu Nov 02 2023 Funda Wang - 9.9.0-1 - New version 9.9.0 -- Gitee