From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59929) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S2lFM-00068j-Hi for qemu-devel@nongnu.org; Wed, 29 Feb 2012 10:15:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S2lF4-0003Wi-B9 for qemu-devel@nongnu.org; Wed, 29 Feb 2012 10:15:16 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48324) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S2lF4-0003W7-36 for qemu-devel@nongnu.org; Wed, 29 Feb 2012 10:14:58 -0500 From: Kevin Wolf Date: Wed, 29 Feb 2012 16:17:56 +0100 Message-Id: <1330528688-21996-16-git-send-email-kwolf@redhat.com> In-Reply-To: <1330528688-21996-1-git-send-email-kwolf@redhat.com> References: <1330528688-21996-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 15/27] qcow2: Fix offset in qcow2_read_extensions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org The spec says that the length of extensions is padded to 8 bytes, not the offset. Currently this is the same because the header size is a multiple of 8, so this is only about compatibility with future changes to the header size. While touching it, move the calculation to a common place instead of duplicating it for each header extension type. Signed-off-by: Kevin Wolf Reviewed-by: Stefan Hajnoczi --- block/qcow2.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index dea12c1..f68f0e1 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -126,7 +126,6 @@ static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset, #ifdef DEBUG_EXT printf("Qcow2: Got format extension %s\n", bs->backing_format); #endif - offset = ((offset + ext.len + 7) & ~7); break; default: @@ -143,11 +142,11 @@ static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset, if (ret < 0) { return ret; } - - offset = ((offset + ext.len + 7) & ~7); } break; } + + offset += ((ext.len + 7) & ~7); } return 0; -- 1.7.6.5