motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-07 01:33:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

block: Allow bdrv_flush to return errors

Browse source 
This changes bdrv_flush to return 0 on success and -errno in case of failure.
It's a requirement for implementing proper error handle in users of bdrv_flush.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
This commit is contained in:
Kevin Wolf 2010-10-21 16:43:43 +02:00
parent 5dba48a882
commit 205ef7961f
13 changed files with 45 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
block/blkdebug.c
View file

@ -397,9 +397,9 @@ static void blkdebug_close(BlockDriverState *bs)
}
}
static void blkdebug_flush(BlockDriverState *bs)
static int blkdebug_flush(BlockDriverState *bs)
{
bdrv_flush(bs->file);
return bdrv_flush(bs->file);
}
static BlockDriverAIOCB *blkdebug_aio_flush(BlockDriverState *bs,

4
block/blkverify.c
View file

@ -116,12 +116,12 @@ static void blkverify_close(BlockDriverState *bs)
s->test_file = NULL;
}
static void blkverify_flush(BlockDriverState *bs)
static int blkverify_flush(BlockDriverState *bs)
{
BDRVBlkverifyState *s = bs->opaque;
/* Only flush test file, the raw file is not important */
bdrv_flush(s->test_file);
return bdrv_flush(s->test_file);
}
static int64_t blkverify_getlength(BlockDriverState *bs)

4
block/cow.c
View file

@ -282,9 +282,9 @@ exit:
return ret;
}
static void cow_flush(BlockDriverState *bs)
static int cow_flush(BlockDriverState *bs)
{
bdrv_flush(bs->file);
return bdrv_flush(bs->file);
}
static QEMUOptionParameter cow_create_options[] = {

4
block/qcow.c
View file

@ -910,9 +910,9 @@ static int qcow_write_compressed(BlockDriverState *bs, int64_t sector_num,
return 0;
}
static void qcow_flush(BlockDriverState *bs)
static int qcow_flush(BlockDriverState *bs)
{
bdrv_flush(bs->file);
return bdrv_flush(bs->file);
}
static BlockDriverAIOCB *qcow_aio_flush(BlockDriverState *bs,

4
block/qcow2.c
View file

@ -1148,9 +1148,9 @@ static int qcow_write_compressed(BlockDriverState *bs, int64_t sector_num,
return 0;
}
static void qcow_flush(BlockDriverState *bs)
static int qcow_flush(BlockDriverState *bs)
{
bdrv_flush(bs->file);
return bdrv_flush(bs->file);
}
static BlockDriverAIOCB *qcow_aio_flush(BlockDriverState *bs,

4
block/raw-posix.c
View file

@ -734,10 +734,10 @@ static int raw_create(const char *filename, QEMUOptionParameter *options)
return result;
}
static void raw_flush(BlockDriverState *bs)
static int raw_flush(BlockDriverState *bs)
{
BDRVRawState *s = bs->opaque;
qemu_fdatasync(s->fd);
return qemu_fdatasync(s->fd);
}

9
block/raw-win32.c
View file

@ -150,7 +150,14 @@ static int raw_write(BlockDriverState *bs, int64_t sector_num,
static void raw_flush(BlockDriverState *bs)
{
BDRVRawState *s = bs->opaque;
FlushFileBuffers(s->hfile);
int ret;
ret = FlushFileBuffers(s->hfile);
if (ret != 0) {
return -EIO;
}
return 0;
}
static void raw_close(BlockDriverState *bs)

4
block/raw.c
View file

@ -39,9 +39,9 @@ static void raw_close(BlockDriverState *bs)
{
}
static void raw_flush(BlockDriverState *bs)
static int raw_flush(BlockDriverState *bs)
{
bdrv_flush(bs->file);
return bdrv_flush(bs->file);
}
static BlockDriverAIOCB *raw_aio_flush(BlockDriverState *bs,

4
block/vdi.c
View file

@ -900,10 +900,10 @@ static void vdi_close(BlockDriverState *bs)
{
}
static void vdi_flush(BlockDriverState *bs)
static int vdi_flush(BlockDriverState *bs)
{
logout("\n");
bdrv_flush(bs->file);
return bdrv_flush(bs->file);
}

4
block/vmdk.c
View file

@ -823,9 +823,9 @@ static void vmdk_close(BlockDriverState *bs)
qemu_free(s->l2_cache);
}
static void vmdk_flush(BlockDriverState *bs)
static int vmdk_flush(BlockDriverState *bs)
{
bdrv_flush(bs->file);
return bdrv_flush(bs->file);
}