File 0156-block-vpc-rename-footer-size-footer.patch of Package qemu.611

Overview Repositories Revisions Requests Users Attributes Meta

File 0156-block-vpc-rename-footer-size-footer.patch of Package qemu.611

From 1b075b2100554f6be85e25b6f3302f16eed6befd Mon Sep 17 00:00:00 2001
From: Peter Lieven <pl@kamp.de>
Date: Tue, 3 Mar 2015 11:41:55 +0100
Subject: [PATCH] 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>
(cherry picked from commit 03671ded3078ebad1f0a701042622fd5e8918bc9)
[CYL: BNC#886378]
Signed-off-by: Chunyan Liu <cyliu@suse.com>

Conflicts:
	block/vpc.c
---
 block/vpc.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/block/vpc.c b/block/vpc.c
index 387e18b..1054787 100644
--- a/block/vpc.c
+++ b/block/vpc.c
@@ -73,7 +73,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;
@@ -225,9 +225,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 */
@@ -841,10 +842,10 @@ static int vpc_create(const char *filename, QEMUOptionParameter *options,
     footer->minor = be16_to_cpu(0x0003);
     if (disk_type == VHD_DYNAMIC) {
         footer->orig_size = be64_to_cpu(total_sectors * 512);
-        footer->size = be64_to_cpu(total_sectors * 512);
+        footer->current_size = be64_to_cpu(total_sectors * 512);
     } else {
         footer->orig_size = be64_to_cpu(total_size);
-        footer->size = be64_to_cpu(total_size);
+        footer->current_size = be64_to_cpu(total_size);
     }
     footer->cyls = be16_to_cpu(cyls);
     footer->heads = heads;

Places

File 0156-block-vpc-rename-footer-size-footer.patch of Package qemu.611

Places