From 27b01f2fce7fec01ec41c9caaaf6d25ec41c098a Mon Sep 17 00:00:00 2001 From: "taifu.gc" Date: Sat, 20 Jan 2024 15:14:34 +0800 Subject: [PATCH] Fix revert snapshot failed --- ...en-loading-snapshot-on-inactive-node.patch | 51 +++++++++++++++++++ qemu.spec | 6 ++- 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 0044-Fix-crash-when-loading-snapshot-on-inactive-node.patch diff --git a/0044-Fix-crash-when-loading-snapshot-on-inactive-node.patch b/0044-Fix-crash-when-loading-snapshot-on-inactive-node.patch new file mode 100644 index 0000000..5152cd3 --- /dev/null +++ b/0044-Fix-crash-when-loading-snapshot-on-inactive-node.patch @@ -0,0 +1,51 @@ +From d39c55ba2ad8beff81df4f1c1c2eb6f6e9a20b86 Mon Sep 17 00:00:00 2001 +From: Kevin Wolf +Date: Fri, 1 Dec 2023 15:25:18 +0100 +Subject: [PATCH] block: Fix crash when loading snapshot on inactive node + +bdrv_is_read_only() only checks if the node is configured to be +read-only eventually, but even if it returns false, writing to the node +may not be permitted at the moment (because it's inactive). + +bdrv_is_writable() checks that the node can be written to right now, and +this is what the snapshot operations really need. + +Change bdrv_can_snapshot() to use bdrv_is_writable() to fix crashes like +the following: + +$ ./qemu-system-x86_64 -hda /tmp/test.qcow2 -loadvm foo -incoming defer +qemu-system-x86_64: ../block/io.c:1990: int bdrv_co_write_req_prepare(BdrvChild *, int64_t, int64_t, BdrvTrackedRequest *, int): Assertion `!(bs->open_flags & BDRV_O_INACTIVE)' failed. + +The resulting error message after this patch isn't perfect yet, but at +least it doesn't crash any more: + +$ ./qemu-system-x86_64 -hda /tmp/test.qcow2 -loadvm foo -incoming defer +qemu-system-x86_64: Device 'ide0-hd0' is writable but does not support snapshots + +Signed-off-by: Kevin Wolf +Message-ID: <20231201142520.32255-2-kwolf@redhat.com> +Signed-off-by: Kevin Wolf +(cherry picked from commit d3007d348adaaf04ee8b099a475282034a662414) +Signed-off-by: Michael Tokarev +Signed-off-by: xianglai li +--- + block/snapshot.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/block/snapshot.c b/block/snapshot.c +index ccacda8bd..cdbefbb3c 100644 +--- a/block/snapshot.c ++++ b/block/snapshot.c +@@ -200,7 +200,8 @@ static BlockDriverState *bdrv_snapshot_fallback(BlockDriverState *bs) + int bdrv_can_snapshot(BlockDriverState *bs) + { + BlockDriver *drv = bs->drv; +- if (!drv || !bdrv_is_inserted(bs) || bdrv_is_read_only(bs)) { ++ ++ if (!drv || !bdrv_is_inserted(bs) || !bdrv_is_writable(bs)) { + return 0; + } + +-- +2.27.0 + diff --git a/qemu.spec b/qemu.spec index fbdc5aa..37d8020 100644 --- a/qemu.spec +++ b/qemu.spec @@ -205,7 +205,7 @@ Obsoletes: %{name}-system-moxie-core <= %{epoch}:%{version}-%{release} \ Obsoletes: %{name}-system-unicore32 <= %{epoch}:%{version}-%{release} \ Obsoletes: %{name}-system-unicore32-core <= %{epoch}:%{version}-%{release} -%define anolis_release 5 +%define anolis_release 6 Summary: QEMU is a FAST! processor emulator Name: qemu @@ -268,6 +268,7 @@ Patch1024: Fixed-the-issue-where-qemu-specifies-the-boot-order.patch Patch1025: Fixed-a-compilation-error-caused-by-an-excessively-h.patch Patch1026: Delete-the-default-vga-graphics-card.patch Patch1027: Change-the-bios-name-for-loongarch.patch +Patch1028: 0044-Fix-crash-when-loading-snapshot-on-inactive-node.patch BuildRequires: meson >= %{meson_version} BuildRequires: zlib-devel @@ -2220,6 +2221,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %changelog +* Fri Jan 19 2024 Chang Gao - 6.2.0-6 +- Fix crash when revert snapshot + * Mon Jan 15 2024 xianglai li - 6.2.0-5 - Change the bios name for loongarch. -- Gitee