50 lines
1.9 KiB
Diff
50 lines
1.9 KiB
Diff
|
From aad76e8af00e2d507de9a2e562bdbc43a3bc2bc8 Mon Sep 17 00:00:00 2001
|
||
|
|
From: zhujun2 <zhujun2_yewu@cmss.chinamobile.com>
|
||
|
|
Date: Mon, 8 Apr 2024 00:42:25 -0700
|
||
|
|
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 <kwolf@redhat.com>
|
||
|
|
Message-ID: <20231201142520.32255-2-kwolf@redhat.com>
|
||
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
||
|
|
(cherry picked from commit d3007d348adaaf04ee8b099a475282034a662414)
|
||
|
|
Signed-off-by: zhujun2 <zhujun2_yewu@cmss.chinamobile.com>
|
||
|
|
---
|
||
|
|
block/snapshot.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/block/snapshot.c b/block/snapshot.c
|
||
|
|
index ccacda8bd5..f5703aa28b 100644
|
||
|
|
--- a/block/snapshot.c
|
||
|
|
+++ b/block/snapshot.c
|
||
|
|
@@ -200,7 +200,7 @@ 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
|
||
|
|
|