proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-07-09 08:42:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix regression introduced by r6824

Browse Source 
The changes introduced by r6824 broke a subtle, and admittedly obscure, aspect
of the block API.  While bdrv_{pread,pwrite} return the number of bytes read
or written upon success, bdrv_{read,write} returns a zero upon success.

When using bdrv_pread for bdrv_read, special care must be taken to handle this
case.

This fixes certain guest images (notably linux-0.2 provided on the qemu
website).

Reported-by: malc <av1474@comtv.ru>
Reported-by: Herve Poussineau <hpoussin@reactos.org>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>



git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6828 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
aliguori 2009-03-13 03:12:03 +00:00
parent 610626af30
commit 537a1d4bb0
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
block-raw-posix.c
View File

@ -361,7 +361,12 @@ static int raw_pread(BlockDriverState *bs, int64_t offset,
static int raw_read(BlockDriverState *bs, int64_t sector_num, static int raw_read(BlockDriverState *bs, int64_t sector_num,
uint8_t *buf, int nb_sectors) uint8_t *buf, int nb_sectors)
{ {
return raw_pread(bs, sector_num * 512, buf, (uint64_t)nb_sectors * 512); int ret;
ret = raw_pread(bs, sector_num * 512, buf, nb_sectors * 512);
if (ret == (nb_sectors * 512))
ret = 0;
return ret;
} }
/* /*
@ -445,7 +450,11 @@ static int raw_pwrite(BlockDriverState *bs, int64_t offset,
static int raw_write(BlockDriverState *bs, int64_t sector_num, static int raw_write(BlockDriverState *bs, int64_t sector_num,
const uint8_t *buf, int nb_sectors) const uint8_t *buf, int nb_sectors)
{ {
return raw_pwrite(bs, sector_num * 512, buf, (uint64_t)nb_sectors * 512); int ret;
ret = raw_pwrite(bs, sector_num * 512, buf, nb_sectors * 512);
if (ret == (nb_sectors * 512))
ret = 0;
return ret;
} }
#ifdef CONFIG_AIO #ifdef CONFIG_AIO

4
block-raw-win32.c
View File

@ -145,6 +145,8 @@ static int raw_read(BlockDriverState *bs, int64_t sector_num,
#endif #endif
return ret_count; return ret_count;
} }
if (ret_count == count)
ret_count = 0;
return ret_count; return ret_count;
} }
@ -171,6 +173,8 @@ static int raw_write(BlockDriverState *bs, int64_t sector_num,
#endif #endif
return ret_count; return ret_count;
} }
if (ret_count == count)
ret_count = 0;
return ret_count; return ret_count;
} }