diff options
| author | Peter Lieven <pl@kamp.de> | 2015-03-03 11:41:55 +0100 |
|---|---|---|
| committer | Max Reitz <mreitz@redhat.com> | 2015-03-16 12:10:30 -0400 |
| commit | 03671ded3078ebad1f0a701042622fd5e8918bc9 (patch) | |
| tree | 107502c81980a167180b0639741e7ce77d77005e /block | |
| parent | 690cbb095a17c429513890d991bc57c98dd83912 (diff) | |
| download | qemu-03671ded3078ebad1f0a701042622fd5e8918bc9.tar.gz | |
block/vpc: rename footer->size -> footer->current_size
the field is named current size in the spec. Name it accordingly.
Signed-off-by: Peter Lieven <pl@kamp.de>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-id: 1425379316-19639-5-git-send-email-pl@kamp.de
Signed-off-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/vpc.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/block/vpc.c b/block/vpc.c index 7e99a69137..226be02e26 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; |