[Qemu-devel] [PATCH 11/14] qcow2: qcow_read_extensions: make "advance offset over extension" common

[Uri Lublin <uril@redhat.com>]

Take it out of the switch statement (and each "case").

Signed-off-by: Uri Lublin <uril@redhat.com>
---
 block-qcow2.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/block-qcow2.c b/block-qcow2.c
index ed84a56..c98024e 100644
--- a/block-qcow2.c
+++ b/block-qcow2.c
@@ -257,7 +257,6 @@ static int qcow_read_extensions(BlockDriverState *bs, uint64_t start_offset,
 #ifdef DEBUG_EXT
             printf("Qcow2: Got format extension %s\n", bs->backing_format);
 #endif
-            offset += ((ext.len + 7) & ~7);
             break;
 
         case QCOW_EXT_MAGIC_HIGH_ALLOC:
@@ -275,14 +274,14 @@ static int qcow_read_extensions(BlockDriverState *bs, uint64_t start_offset,
 #ifdef DEBUG_EXT
             printf("Qcow2: Got highest_alloc 0x%lu\n", s->highest_alloc);
 #endif
-            offset += ((ext.len + 7) & ~7);
             break;
 
         default:
             /* unknown magic -- just skip it */
-            offset += ((ext.len + 7) & ~7);
             break;
         }
+        offset += ((ext.len + 7) & ~7);
+
     }
 
     return 0;
-- 
1.6.0.6