e79075f69c
Fix two more qcow2 storage related bugs identified recently by upstream. OBS-URL: https://build.opensuse.org/request/show/746404 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=507
34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
From: Max Reitz <mreitz@redhat.com>
|
|
Date: Mon, 28 Oct 2019 17:18:40 +0100
|
|
Subject: qcow2: Fix QCOW2_COMPRESSED_SECTOR_MASK
|
|
|
|
Git-commit: 24552feb6ae2f615b76c2b95394af43901f75046
|
|
|
|
Masks for L2 table entries should have 64 bit.
|
|
|
|
Fixes: b6c246942b14d3e0dec46a6c5868ed84e7dbea19
|
|
Buglink: https://bugs.launchpad.net/qemu/+bug/1850000
|
|
Cc: qemu-stable@nongnu.org
|
|
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
Message-id: 20191028161841.1198-2-mreitz@redhat.com
|
|
Reviewed-by: Alberto Garcia <berto@igalia.com>
|
|
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
block/qcow2.h | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/block/qcow2.h b/block/qcow2.h
|
|
index fc1b0d3c1e1e3110e86f36f0dcd9..359197f89fb9547d861d852cbf68 100644
|
|
--- a/block/qcow2.h
|
|
+++ b/block/qcow2.h
|
|
@@ -77,7 +77,7 @@
|
|
|
|
/* Defined in the qcow2 spec (compressed cluster descriptor) */
|
|
#define QCOW2_COMPRESSED_SECTOR_SIZE 512U
|
|
-#define QCOW2_COMPRESSED_SECTOR_MASK (~(QCOW2_COMPRESSED_SECTOR_SIZE - 1))
|
|
+#define QCOW2_COMPRESSED_SECTOR_MASK (~(QCOW2_COMPRESSED_SECTOR_SIZE - 1ULL))
|
|
|
|
/* Must be at least 2 to cover COW */
|
|
#define MIN_L2_CACHE_SIZE 2 /* cache entries */
|