Fix improper usage of cpu_to_be32 in vpc
PATCH 1/1 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 <[email protected]>
--- block/vpc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
block/vpc.c +4 -4
@@ -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 ;
Signature · 1 line
1.8.3.1
Am 05.09.2014 um 20:40 hat 21G geschrieben:
Quoted 4 lines
cpu_to_be32()is wrong sincevhd_typeis an enum constant (just a regular CPU-endian integer).Signed-off-by Xiaodong Gong <[email protected]>
Please use 'git send-email' to send patches. Neither 'git am' nor 'patch' can seem to apply this patch (firstly because this is not a plain text, but a multipart email, but even when doing the extra effort of saving just the text part it doesn't work).
The same is true for your other patch.
Kevin