From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54248) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YXYKu-0003a4-Ji for qemu-devel@nongnu.org; Mon, 16 Mar 2015 12:57:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YXYKt-0002DF-Ru for qemu-devel@nongnu.org; Mon, 16 Mar 2015 12:57:52 -0400 From: Kevin Wolf Date: Mon, 16 Mar 2015 17:57:20 +0100 Message-Id: <1426525041-21926-17-git-send-email-kwolf@redhat.com> In-Reply-To: <1426525041-21926-1-git-send-email-kwolf@redhat.com> References: <1426525041-21926-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 16/17] block/vpc: rename footer->size -> footer->current_size List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Peter Lieven the field is named current size in the spec. Name it accordingly. Signed-off-by: Peter Lieven Reviewed-by: Max Reitz Message-id: 1425379316-19639-5-git-send-email-pl@kamp.de Signed-off-by: Max Reitz --- block/vpc.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/block/vpc.c b/block/vpc.c index 7e99a69..226be02 100644 --- a/block/vpc.c +++ b/block/vpc.c @@ -66,7 +66,7 @@ typedef struct vhd_footer { char creator_os[4]; // "Wi2k" uint64_t orig_size; - uint64_t size; + uint64_t current_size; uint16_t cyls; uint8_t heads; @@ -218,9 +218,10 @@ static int vpc_open(BlockDriverState *bs, QDict *options, int flags, /* Images that have exactly the maximum geometry are probably bigger and * would be truncated if we adhered to the geometry for them. Rely on - * footer->size for them. */ + * footer->current_size for them. */ if (bs->total_sectors == VHD_MAX_GEOMETRY) { - bs->total_sectors = be64_to_cpu(footer->size) / BDRV_SECTOR_SIZE; + bs->total_sectors = be64_to_cpu(footer->current_size) / + BDRV_SECTOR_SIZE; } /* Allow a maximum disk size of approximately 2 TB */ @@ -868,7 +869,7 @@ static int vpc_create(const char *filename, QemuOpts *opts, Error **errp) footer->major = cpu_to_be16(0x0005); footer->minor = cpu_to_be16(0x0003); footer->orig_size = cpu_to_be64(total_size); - footer->size = cpu_to_be64(total_size); + footer->current_size = cpu_to_be64(total_size); footer->cyls = cpu_to_be16(cyls); footer->heads = heads; footer->secs_per_cyl = secs_per_cyl; -- 1.8.3.1