Blame SOURCES/kvm-qcow2-Add-more-overlap-check-bitmask-macros.patch

218e99
From cd63525d205eda67c64d0838592b819d7f73529f Mon Sep 17 00:00:00 2001
218e99
From: Max Reitz <mreitz@redhat.com>
218e99
Date: Mon, 4 Nov 2013 22:32:33 +0100
218e99
Subject: [PATCH 40/87] qcow2: Add more overlap check bitmask macros
218e99
218e99
RH-Author: Max Reitz <mreitz@redhat.com>
218e99
Message-id: <1383604354-12743-43-git-send-email-mreitz@redhat.com>
218e99
Patchwork-id: 55342
218e99
O-Subject: [RHEL-7.0 qemu-kvm PATCH 42/43] qcow2: Add more overlap check bitmask macros
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
Introduces the macros QCOW2_OL_CONSTANT and QCOW2_OL_ALL in addition to
218e99
the already existing QCOW2_OL_CACHED, signifying all metadata overlap
218e99
checks that can be performed in constant time (regardless of image size
218e99
etc.) and truly all available overlap checks, respectively.
218e99
218e99
Signed-off-by: Max Reitz <mreitz@redhat.com>
218e99
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
218e99
(cherry picked from commit 4a273c398b0c96985d56fed8156e19876b2e3c9e)
218e99
218e99
Signed-off-by: Max Reitz <mreitz@redhat.com>
218e99
---
218e99
 block/qcow2.h | 14 +++++++++++---
218e99
 1 file changed, 11 insertions(+), 3 deletions(-)
218e99
218e99
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
218e99
---
218e99
 block/qcow2.h |   14 +++++++++++---
218e99
 1 files changed, 11 insertions(+), 3 deletions(-)
218e99
218e99
diff --git a/block/qcow2.h b/block/qcow2.h
218e99
index 1bba3ed..e4c140c 100644
218e99
--- a/block/qcow2.h
218e99
+++ b/block/qcow2.h
218e99
@@ -325,11 +325,19 @@ typedef enum QCow2MetadataOverlap {
218e99
     QCOW2_OL_INACTIVE_L2    = (1 << QCOW2_OL_INACTIVE_L2_BITNR),
218e99
 } QCow2MetadataOverlap;
218e99
 
218e99
+/* Perform all overlap checks which can be done in constant time */
218e99
+#define QCOW2_OL_CONSTANT \
218e99
+    (QCOW2_OL_MAIN_HEADER | QCOW2_OL_ACTIVE_L1 | QCOW2_OL_REFCOUNT_TABLE | \
218e99
+     QCOW2_OL_SNAPSHOT_TABLE)
218e99
+
218e99
 /* Perform all overlap checks which don't require disk access */
218e99
 #define QCOW2_OL_CACHED \
218e99
-    (QCOW2_OL_MAIN_HEADER | QCOW2_OL_ACTIVE_L1 | QCOW2_OL_ACTIVE_L2 | \
218e99
-     QCOW2_OL_REFCOUNT_TABLE | QCOW2_OL_REFCOUNT_BLOCK | \
218e99
-     QCOW2_OL_SNAPSHOT_TABLE | QCOW2_OL_INACTIVE_L1)
218e99
+    (QCOW2_OL_CONSTANT | QCOW2_OL_ACTIVE_L2 | QCOW2_OL_REFCOUNT_BLOCK | \
218e99
+     QCOW2_OL_INACTIVE_L1)
218e99
+
218e99
+/* Perform all overlap checks */
218e99
+#define QCOW2_OL_ALL \
218e99
+    (QCOW2_OL_CACHED | QCOW2_OL_INACTIVE_L2)
218e99
 
218e99
 #define L1E_OFFSET_MASK 0x00ffffffffffff00ULL
218e99
 #define L2E_OFFSET_MASK 0x00ffffffffffff00ULL
218e99
-- 
218e99
1.7.1
218e99