|
 |
218e99 |
From 0d32273cd7f5daa7431b5e2068537154dea101fb Mon Sep 17 00:00:00 2001
|
|
|
218e99 |
From: Max Reitz <mreitz@redhat.com>
|
|
|
218e99 |
Date: Mon, 4 Nov 2013 22:32:30 +0100
|
|
|
218e99 |
Subject: [PATCH 37/87] qcow2: Make overlap check mask variable
|
|
|
218e99 |
|
|
|
218e99 |
RH-Author: Max Reitz <mreitz@redhat.com>
|
|
|
218e99 |
Message-id: <1383604354-12743-40-git-send-email-mreitz@redhat.com>
|
|
|
218e99 |
Patchwork-id: 55339
|
|
|
218e99 |
O-Subject: [RHEL-7.0 qemu-kvm PATCH 39/43] qcow2: Make overlap check mask variable
|
|
|
218e99 |
Bugzilla: 1004347
|
|
|
218e99 |
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Fam Zheng <famz@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
218e99 |
|
|
|
218e99 |
BZ: 1004347
|
|
|
218e99 |
|
|
|
218e99 |
Replace the QCOW2_OL_DEFAULT macro by a variable overlap_check in
|
|
|
218e99 |
BDRVQcowState.
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
218e99 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
218e99 |
(cherry picked from commit 3e3553905cfc814d59de6d1a634c3a991b2a9257)
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
218e99 |
---
|
|
|
218e99 |
block/qcow2-refcount.c | 2 +-
|
|
|
218e99 |
block/qcow2.c | 2 ++
|
|
|
218e99 |
block/qcow2.h | 5 ++---
|
|
|
218e99 |
3 files changed, 5 insertions(+), 4 deletions(-)
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
218e99 |
---
|
|
|
218e99 |
block/qcow2-refcount.c | 2 +-
|
|
|
218e99 |
block/qcow2.c | 2 ++
|
|
|
218e99 |
block/qcow2.h | 5 ++---
|
|
|
218e99 |
3 files changed, 5 insertions(+), 4 deletions(-)
|
|
|
218e99 |
|
|
|
218e99 |
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
|
|
|
218e99 |
index 91c446b..3787314 100644
|
|
|
218e99 |
--- a/block/qcow2-refcount.c
|
|
|
218e99 |
+++ b/block/qcow2-refcount.c
|
|
|
218e99 |
@@ -1629,7 +1629,7 @@ int qcow2_check_metadata_overlap(BlockDriverState *bs, int ign, int64_t offset,
|
|
|
218e99 |
int64_t size)
|
|
|
218e99 |
{
|
|
|
218e99 |
BDRVQcowState *s = bs->opaque;
|
|
|
218e99 |
- int chk = QCOW2_OL_DEFAULT & ~ign;
|
|
|
218e99 |
+ int chk = s->overlap_check & ~ign;
|
|
|
218e99 |
int i, j;
|
|
|
218e99 |
|
|
|
218e99 |
if (!size) {
|
|
|
218e99 |
diff --git a/block/qcow2.c b/block/qcow2.c
|
|
|
218e99 |
index ac5ed47..157361f 100644
|
|
|
218e99 |
--- a/block/qcow2.c
|
|
|
218e99 |
+++ b/block/qcow2.c
|
|
|
218e99 |
@@ -630,6 +630,8 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags,
|
|
|
218e99 |
s->discard_passthrough[QCOW2_DISCARD_OTHER] =
|
|
|
218e99 |
qemu_opt_get_bool(opts, QCOW2_OPT_DISCARD_OTHER, false);
|
|
|
218e99 |
|
|
|
218e99 |
+ s->overlap_check = QCOW2_OL_CACHED;
|
|
|
218e99 |
+
|
|
|
218e99 |
qemu_opts_del(opts);
|
|
|
218e99 |
|
|
|
218e99 |
if (s->use_lazy_refcounts && s->qcow_version < 3) {
|
|
|
218e99 |
diff --git a/block/qcow2.h b/block/qcow2.h
|
|
|
218e99 |
index 64ad43c..d1fd91b 100644
|
|
|
218e99 |
--- a/block/qcow2.h
|
|
|
218e99 |
+++ b/block/qcow2.h
|
|
|
218e99 |
@@ -202,6 +202,8 @@ typedef struct BDRVQcowState {
|
|
|
218e99 |
|
|
|
218e99 |
bool discard_passthrough[QCOW2_DISCARD_MAX];
|
|
|
218e99 |
|
|
|
218e99 |
+ int overlap_check; /* bitmask of Qcow2MetadataOverlap values */
|
|
|
218e99 |
+
|
|
|
218e99 |
uint64_t incompatible_features;
|
|
|
218e99 |
uint64_t compatible_features;
|
|
|
218e99 |
uint64_t autoclear_features;
|
|
|
218e99 |
@@ -320,9 +322,6 @@ typedef enum QCow2MetadataOverlap {
|
|
|
218e99 |
QCOW2_OL_REFCOUNT_TABLE | QCOW2_OL_REFCOUNT_BLOCK | \
|
|
|
218e99 |
QCOW2_OL_SNAPSHOT_TABLE | QCOW2_OL_INACTIVE_L1)
|
|
|
218e99 |
|
|
|
218e99 |
-/* The default checks to perform */
|
|
|
218e99 |
-#define QCOW2_OL_DEFAULT QCOW2_OL_CACHED
|
|
|
218e99 |
-
|
|
|
218e99 |
#define L1E_OFFSET_MASK 0x00ffffffffffff00ULL
|
|
|
218e99 |
#define L2E_OFFSET_MASK 0x00ffffffffffff00ULL
|
|
|
218e99 |
#define L2E_COMPRESSED_OFFSET_SIZE_MASK 0x3fffffffffffffffULL
|
|
|
218e99 |
--
|
|
|
218e99 |
1.7.1
|
|
|
218e99 |
|