[Qemu-devel] [PATCH 4/9] qcow: define QCOW_CRYPT_MAX

[Eduardo Habkost <ehabkost@redhat.com>]

Just to make the code a bit more readable, and get ready to make AES
optional.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 block-qcow.c  |    3 ++-
 block-qcow2.c |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/block-qcow.c b/block-qcow.c
index 91c53b1..4fdd0d8 100644
--- a/block-qcow.c
+++ b/block-qcow.c
@@ -34,6 +34,7 @@
 
 #define QCOW_CRYPT_NONE 0
 #define QCOW_CRYPT_AES  1
+#define QCOW_CRYPT_MAX  QCOW_CRYPT_AES
 
 #define QCOW_OFLAG_COMPRESSED (1LL << 63)
 
@@ -113,7 +114,7 @@ static int qcow_open(BlockDriverState *bs, const char *filename, int flags)
         goto fail;
     if (header.size <= 1 || header.cluster_bits < 9)
         goto fail;
-    if (header.crypt_method > QCOW_CRYPT_AES)
+    if (header.crypt_method > QCOW_CRYPT_MAX)
         goto fail;
     s->crypt_method_header = header.crypt_method;
     if (s->crypt_method_header)
diff --git a/block-qcow2.c b/block-qcow2.c
index 465dcd6..d1503e9 100644
--- a/block-qcow2.c
+++ b/block-qcow2.c
@@ -51,6 +51,7 @@
 
 #define QCOW_CRYPT_NONE 0
 #define QCOW_CRYPT_AES  1
+#define QCOW_CRYPT_MAX  QCOW_CRYPT_AES
 
 #define QCOW_MAX_CRYPT_CLUSTERS 32
 
@@ -228,7 +229,7 @@ static int qcow_open(BlockDriverState *bs, const char *filename, int flags)
         header.cluster_bits < 9 ||
         header.cluster_bits > 16)
         goto fail;
-    if (header.crypt_method > QCOW_CRYPT_AES)
+    if (header.crypt_method > QCOW_CRYPT_MAX)
         goto fail;
     s->crypt_method_header = header.crypt_method;
     if (s->crypt_method_header)
-- 
1.6.0.2.GIT