[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/14] qcow2: qcow_read_extensions: make "advance of
From: |
Uri Lublin |
Subject: |
[Qemu-devel] [PATCH 11/14] qcow2: qcow_read_extensions: make "advance offset over extension" common |
Date: |
Tue, 17 Mar 2009 22:40:49 +0200 |
Take it out of the switch statement (and each "case").
Signed-off-by: Uri Lublin <address@hidden>
---
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
- [Qemu-devel] [PATCH 01/14] Introducing qcow2 extensions, (continued)
- [Qemu-devel] [PATCH 01/14] Introducing qcow2 extensions, Uri Lublin, 2009/03/17
- [Qemu-devel] [PATCH 02/14] block: support known backing format for image create and open, Uri Lublin, 2009/03/17
- [Qemu-devel] [PATCH 03/14] block-qcow2: keep backing file format in a qcow2 extension, Uri Lublin, 2009/03/17
- [Qemu-devel] [PATCH 04/14] qemu-img: adding a "-F base_fmt" option to "qemu-img create -b", Uri Lublin, 2009/03/17
- [Qemu-devel] [PATCH 05/14] block-qcow2: keep highest allocated offset, Uri Lublin, 2009/03/17
- [Qemu-devel] [PATCH 06/14] block-qcow2: export highest-alloc through BlockDriverInfo and get_info(), Uri Lublin, 2009/03/17
- [Qemu-devel] [PATCH 07/14] block: info blockstats: show highest_allocated if exists, Uri Lublin, 2009/03/17
- [Qemu-devel] [PATCH 08/14] Add a bdrv_close_all() and call it at the end of main(), Uri Lublin, 2009/03/17
- [Qemu-devel] [PATCH 09/14] block-qcow2: keep highest alloc offset in a qcow2 extension, Uri Lublin, 2009/03/17
- [Qemu-devel] [PATCH 10/14] qemu-img: info: show highest_alloc if exists, Uri Lublin, 2009/03/17
- [Qemu-devel] [PATCH 11/14] qcow2: qcow_read_extensions: make "advance offset over extension" common,
Uri Lublin <=
- [Qemu-devel] [PATCH 12/14] block: pass BDRV_BACKING flag to open of a backing file, Uri Lublin, 2009/03/17
- [Qemu-devel] [PATCH 13/14] block: keep flags an image was opened with, Uri Lublin, 2009/03/17
- [Qemu-devel] [PATCH 14/14] block-qcow2: do not keep track of highest-alloc for backing files, Uri Lublin, 2009/03/17
Re: [Qemu-devel] [PATCH 00/14] block (mostly qcow2) changes (v6), Gleb Natapov, 2009/03/24