diff options
| author | Max Reitz | 2018-06-06 21:37:01 +0200 |
|---|---|---|
| committer | Max Reitz | 2018-06-11 16:18:45 +0200 |
| commit | ddf3b47ef4b5ed0bf6558d4c2c8ae130b8d8a580 (patch) | |
| tree | d02ceeeb2d00c42c984cbe57b366ae3e040e4384 /block | |
| parent | block: Make bdrv_is_writable() public (diff) | |
| download | qemu-ddf3b47ef4b5ed0bf6558d4c2c8ae130b8d8a580.tar.gz qemu-ddf3b47ef4b5ed0bf6558d4c2c8ae130b8d8a580.tar.xz qemu-ddf3b47ef4b5ed0bf6558d4c2c8ae130b8d8a580.zip | |
qcow2: Do not mark inactive images corrupt
When signaling a corruption on a read-only image, qcow2 already makes
fatal events non-fatal (i.e., they will not result in the image being
closed, and the image header's corrupt flag will not be set). This is
necessary because we cannot set the corrupt flag on read-only images,
and it is possible because further corruption of read-only images is
impossible.
Inactive images are effectively read-only, too, so we should do the same
for them. bdrv_is_writable() can tell us whether an image can actually
be written to, so use its result instead of !bs->read_only.
(Otherwise, the assert(!(bs->open_flags & BDRV_O_INACTIVE)) in
bdrv_co_pwritev() will fail, crashing qemu.)
Cc: qemu-stable@nongnu.org
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-id: 20180606193702.7113-3-mreitz@redhat.com
Reviewed-by: John Snow <jsnow@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/qcow2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/qcow2.c b/block/qcow2.c index 6b2d88759d..6fa5e1d71a 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -4569,7 +4569,7 @@ void qcow2_signal_corruption(BlockDriverState *bs, bool fatal, int64_t offset, char *message; va_list ap; - fatal = fatal && !bs->read_only; + fatal = fatal && bdrv_is_writable(bs); if (s->signaled_corruption && (!fatal || (s->incompatible_features & QCOW2_INCOMPAT_CORRUPT))) |