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