|
 |
4a2fec |
From f2c23150bc8b51e7b6c78f98cc38880ff1e5e811 Mon Sep 17 00:00:00 2001
|
|
|
4a2fec |
From: Max Reitz <mreitz@redhat.com>
|
|
|
4a2fec |
Date: Mon, 27 Nov 2017 16:19:57 +0100
|
|
|
4a2fec |
Subject: [PATCH 02/21] qcow2: Fix unaligned preallocated truncation
|
|
|
4a2fec |
|
|
|
4a2fec |
RH-Author: Max Reitz <mreitz@redhat.com>
|
|
|
4a2fec |
Message-id: <20171127161959.13234-3-mreitz@redhat.com>
|
|
|
4a2fec |
Patchwork-id: 77911
|
|
|
4a2fec |
O-Subject: [RHV-7.5 qemu-kvm-rhev PATCH 2/4] qcow2: Fix unaligned preallocated truncation
|
|
|
4a2fec |
Bugzilla: 1414049
|
|
|
4a2fec |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
4a2fec |
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
|
|
|
4a2fec |
RH-Acked-by: Fam Zheng <famz@redhat.com>
|
|
|
4a2fec |
RH-Acked-by: John Snow <jsnow@redhat.com>
|
|
|
4a2fec |
|
|
|
4a2fec |
A qcow2 image file's length is not required to have a length that is a
|
|
|
4a2fec |
multiple of the cluster size. However, qcow2_refcount_area() expects an
|
|
|
4a2fec |
aligned value for its @start_offset parameter, so we need to round
|
|
|
4a2fec |
@old_file_size up to the next cluster boundary.
|
|
|
4a2fec |
|
|
|
4a2fec |
Reported-by: Ping Li <pingl@redhat.com>
|
|
|
4a2fec |
Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1414049
|
|
|
4a2fec |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
4a2fec |
Message-id: 20171009215533.12530-2-mreitz@redhat.com
|
|
|
4a2fec |
Cc: qemu-stable@nongnu.org
|
|
|
4a2fec |
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
|
4a2fec |
Reviewed-by: Jeff Cody <jcody@redhat.com>
|
|
|
4a2fec |
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
4a2fec |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
4a2fec |
(cherry picked from commit e400ad1e1f0127b4fdabcb1c8de1e99be91788df)
|
|
|
4a2fec |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
4a2fec |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
4a2fec |
---
|
|
|
4a2fec |
block/qcow2.c | 1 +
|
|
|
4a2fec |
1 file changed, 1 insertion(+)
|
|
|
4a2fec |
|
|
|
4a2fec |
diff --git a/block/qcow2.c b/block/qcow2.c
|
|
|
4a2fec |
index af7b1e7..2cfe706 100644
|
|
|
4a2fec |
--- a/block/qcow2.c
|
|
|
4a2fec |
+++ b/block/qcow2.c
|
|
|
4a2fec |
@@ -3161,6 +3161,7 @@ static int qcow2_truncate(BlockDriverState *bs, int64_t offset,
|
|
|
4a2fec |
"Failed to inquire current file length");
|
|
|
4a2fec |
return old_file_size;
|
|
|
4a2fec |
}
|
|
|
4a2fec |
+ old_file_size = ROUND_UP(old_file_size, s->cluster_size);
|
|
|
4a2fec |
|
|
|
4a2fec |
nb_new_data_clusters = DIV_ROUND_UP(offset - old_length,
|
|
|
4a2fec |
s->cluster_size);
|
|
|
4a2fec |
--
|
|
|
4a2fec |
1.8.3.1
|
|
|
4a2fec |
|