[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 16/17] block/vpc: rename footer->size -> footer->curr
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 16/17] block/vpc: rename footer->size -> footer->current_size |
Date: |
Mon, 16 Mar 2015 17:57:20 +0100 |
From: Peter Lieven <address@hidden>
the field is named current size in the spec. Name it accordingly.
Signed-off-by: Peter Lieven <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Message-id: address@hidden
Signed-off-by: Max Reitz <address@hidden>
---
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
- [Qemu-devel] [PULL 00/17] Block patches for 2.3.0-rc0, Kevin Wolf, 2015/03/16
- [Qemu-devel] [PULL 02/17] qemu-img: Fix convert, amend error messages for unknown options, Kevin Wolf, 2015/03/16
- [Qemu-devel] [PULL 01/17] iotests: Update 051's reference output, Kevin Wolf, 2015/03/16
- [Qemu-devel] [PULL 03/17] block: Deprecate QCOW/QCOW2 encryption, Kevin Wolf, 2015/03/16
- [Qemu-devel] [PULL 04/17] block: Fix block-set-write-threshold not to use funky error class, Kevin Wolf, 2015/03/16
- [Qemu-devel] [PULL 05/17] qemu-img: Avoid qerror_report_err() outside QMP handlers, again, Kevin Wolf, 2015/03/16
- [Qemu-devel] [PULL 10/17] migration: Convert bdrv_find to blk_by_name, Kevin Wolf, 2015/03/16
- [Qemu-devel] [PULL 06/17] qcow2: Respect new_block in alloc_refcount_block(), Kevin Wolf, 2015/03/16
- [Qemu-devel] [PULL 09/17] monitor: Convert bdrv_find to blk_by_name, Kevin Wolf, 2015/03/16
- [Qemu-devel] [PULL 14/17] vpc: Ignore geometry for large images, Kevin Wolf, 2015/03/16
- [Qemu-devel] [PULL 16/17] block/vpc: rename footer->size -> footer->current_size,
Kevin Wolf <=
- [Qemu-devel] [PULL 07/17] iotests: Add tests for refcount table growth, Kevin Wolf, 2015/03/16
- [Qemu-devel] [PULL 13/17] block/vpc: optimize vpc_co_get_block_status, Kevin Wolf, 2015/03/16
- [Qemu-devel] [PULL 12/17] block: Drop bdrv_find, Kevin Wolf, 2015/03/16
- [Qemu-devel] [PULL 08/17] iotests: Test non-self-referential qcow2 refblocks, Kevin Wolf, 2015/03/16
- [Qemu-devel] [PULL 17/17] block/vpc: remove disabled code from get_sector_offset, Kevin Wolf, 2015/03/16
- [Qemu-devel] [PULL 11/17] blockdev: Convert bdrv_find to blk_by_name, Kevin Wolf, 2015/03/16
- [Qemu-devel] [PULL 15/17] block/vpc: make calculate_geometry spec conform, Kevin Wolf, 2015/03/16
- Re: [Qemu-devel] [PULL 00/17] Block patches for 2.3.0-rc0, Peter Maydell, 2015/03/17