|
 |
383d26 |
From 320903cac23bb449df8c2e9cf737e16b3f94d684 Mon Sep 17 00:00:00 2001
|
|
|
383d26 |
From: Kevin Wolf <kwolf@redhat.com>
|
|
|
383d26 |
Date: Tue, 19 Feb 2019 17:00:16 +0100
|
|
|
383d26 |
Subject: [PATCH 15/23] qcow2: Make sizes more humanly readable
|
|
|
383d26 |
|
|
|
383d26 |
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
|
|
383d26 |
Message-id: <20190219170023.27826-7-kwolf@redhat.com>
|
|
|
383d26 |
Patchwork-id: 84546
|
|
|
383d26 |
O-Subject: [RHEL-7.7 qemu-kvm-rhev PATCH 06/13] qcow2: Make sizes more humanly readable
|
|
|
383d26 |
Bugzilla: 1656913
|
|
|
383d26 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
383d26 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
383d26 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
383d26 |
|
|
|
383d26 |
From: Leonid Bloch <lbloch@janustech.com>
|
|
|
383d26 |
|
|
|
383d26 |
Signed-off-by: Leonid Bloch <lbloch@janustech.com>
|
|
|
383d26 |
Reviewed-by: Alberto Garcia <berto@igalia.com>
|
|
|
383d26 |
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
383d26 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
383d26 |
(cherry picked from commit b6a95c6d10075bb540ce50198bbe22fc0a4392c7)
|
|
|
383d26 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
383d26 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
383d26 |
---
|
|
|
383d26 |
block/qcow2.c | 2 +-
|
|
|
383d26 |
block/qcow2.h | 9 +++++----
|
|
|
383d26 |
2 files changed, 6 insertions(+), 5 deletions(-)
|
|
|
383d26 |
|
|
|
383d26 |
diff --git a/block/qcow2.c b/block/qcow2.c
|
|
|
383d26 |
index a0f7234..3859112 100644
|
|
|
383d26 |
--- a/block/qcow2.c
|
|
|
383d26 |
+++ b/block/qcow2.c
|
|
|
383d26 |
@@ -826,7 +826,7 @@ static void read_cache_sizes(BlockDriverState *bs, QemuOpts *opts,
|
|
|
383d26 |
}
|
|
|
383d26 |
} else {
|
|
|
383d26 |
if (!l2_cache_size_set) {
|
|
|
383d26 |
- *l2_cache_size = MAX(DEFAULT_L2_CACHE_BYTE_SIZE,
|
|
|
383d26 |
+ *l2_cache_size = MAX(DEFAULT_L2_CACHE_SIZE,
|
|
|
383d26 |
(uint64_t)DEFAULT_L2_CACHE_CLUSTERS
|
|
|
383d26 |
* s->cluster_size);
|
|
|
383d26 |
}
|
|
|
383d26 |
diff --git a/block/qcow2.h b/block/qcow2.h
|
|
|
383d26 |
index 3d92cdb..f73a48a 100644
|
|
|
383d26 |
--- a/block/qcow2.h
|
|
|
383d26 |
+++ b/block/qcow2.h
|
|
|
383d26 |
@@ -27,6 +27,7 @@
|
|
|
383d26 |
|
|
|
383d26 |
#include "crypto/block.h"
|
|
|
383d26 |
#include "qemu/coroutine.h"
|
|
|
383d26 |
+#include "qemu/units.h"
|
|
|
383d26 |
|
|
|
383d26 |
//#define DEBUG_ALLOC
|
|
|
383d26 |
//#define DEBUG_ALLOC2
|
|
|
383d26 |
@@ -43,11 +44,11 @@
|
|
|
383d26 |
|
|
|
383d26 |
/* 8 MB refcount table is enough for 2 PB images at 64k cluster size
|
|
|
383d26 |
* (128 GB for 512 byte clusters, 2 EB for 2 MB clusters) */
|
|
|
383d26 |
-#define QCOW_MAX_REFTABLE_SIZE 0x800000
|
|
|
383d26 |
+#define QCOW_MAX_REFTABLE_SIZE S_8MiB
|
|
|
383d26 |
|
|
|
383d26 |
/* 32 MB L1 table is enough for 2 PB images at 64k cluster size
|
|
|
383d26 |
* (128 GB for 512 byte clusters, 2 EB for 2 MB clusters) */
|
|
|
383d26 |
-#define QCOW_MAX_L1_SIZE 0x2000000
|
|
|
383d26 |
+#define QCOW_MAX_L1_SIZE S_32MiB
|
|
|
383d26 |
|
|
|
383d26 |
/* Allow for an average of 1k per snapshot table entry, should be plenty of
|
|
|
383d26 |
* space for snapshot names and IDs */
|
|
|
383d26 |
@@ -75,9 +76,9 @@
|
|
|
383d26 |
|
|
|
383d26 |
/* Whichever is more */
|
|
|
383d26 |
#define DEFAULT_L2_CACHE_CLUSTERS 8 /* clusters */
|
|
|
383d26 |
-#define DEFAULT_L2_CACHE_BYTE_SIZE 1048576 /* bytes */
|
|
|
383d26 |
+#define DEFAULT_L2_CACHE_SIZE S_1MiB
|
|
|
383d26 |
|
|
|
383d26 |
-#define DEFAULT_CLUSTER_SIZE 65536
|
|
|
383d26 |
+#define DEFAULT_CLUSTER_SIZE S_64KiB
|
|
|
383d26 |
|
|
|
383d26 |
|
|
|
383d26 |
#define QCOW2_OPT_LAZY_REFCOUNTS "lazy-refcounts"
|
|
|
383d26 |
--
|
|
|
383d26 |
1.8.3.1
|
|
|
383d26 |
|