[Qemu-devel] [PATCH] Fix improper usage of cpu_to_be32 in vpc

[Gordon Gong]

From fd3f0fd9c53d7782d4d835597c8a07b897bec3d0 Mon Sep 17 00:00:00 2001

From: Xiaodong Gong <address@hidden>

Date: Sat, 30 Aug 2014 03:17:03 +0800

Subject: Fix improper usage of cpu_to_be32 in vpc

 

cpu_to_be32() is wrong since vhd_type is an enum constant

(just a regular CPU-endian integer).

 

Signed-off-by: Xiaodong Gong <address@hidden>

---

block/vpc.c | 8 ++++----

1 file changed, 4 insertions(+), 4 deletions(-)

 

diff --git a/block/vpc.c b/block/vpc.c

index 055efc4..c024b4c 100644

--- a/block/vpc.c

+++ b/block/vpc.c

@@ -489,7 +489,7 @@ static int vpc_get_info(BlockDriverState *bs, BlockDriverInfo *bdi)

     BDRVVPCState *s = (BDRVVPCState *)bs->opaque;

     VHDFooter *footer = (VHDFooter *) s->footer_buf;

-    if (cpu_to_be32(footer->type) != VHD_FIXED) {

+    if (be32_to_cpu(footer->type) != VHD_FIXED) {

         bdi->cluster_size = s->block_size;

     }

@@ -506,7 +506,7 @@ static int vpc_read(BlockDriverState *bs, int64_t sector_num,

     int64_t sectors, sectors_per_block;

     VHDFooter *footer = (VHDFooter *) s->footer_buf;

-    if (cpu_to_be32(footer->type) == VHD_FIXED) {

+    if (be32_to_cpu(footer->type) == VHD_FIXED) {

         return bdrv_read(bs->file, sector_num, buf, nb_sectors);

     }

     while (nb_sectors > 0) {

@@ -555,7 +555,7 @@ static int vpc_write(BlockDriverState *bs, int64_t sector_num,

     int ret;

     VHDFooter *footer =  (VHDFooter *) s->footer_buf;

-    if (cpu_to_be32(footer->type) == VHD_FIXED) {

+    if (be32_to_cpu(footer->type) == VHD_FIXED) {

         return bdrv_write(bs->file, sector_num, buf, nb_sectors);

     }

     while (nb_sectors > 0) {

@@ -857,7 +857,7 @@ static int vpc_has_zero_init(BlockDriverState *bs)

     BDRVVPCState *s = bs->opaque;

     VHDFooter *footer =  (VHDFooter *) s->footer_buf;

-    if (cpu_to_be32(footer->type) == VHD_FIXED) {

+    if (be32_to_cpu(footer->type) == VHD_FIXED) {

         return bdrv_has_zero_init(bs->file);

     } else {

         return 1;

--

1.8.3.1

 

0001-Fix-improper-usage-of-cpu_to_be32-in-vpc.patch
Description: Binary data