diff options
| author | Michael S. Tsirkin | 2010-12-01 06:11:51 +0100 |
|---|---|---|
| committer | Michael S. Tsirkin | 2010-12-01 06:11:51 +0100 |
| commit | c924f36a300cbc54d3cb511116e8e2bae17f5ae6 (patch) | |
| tree | 04e57676b1db1db7d8b33934b349f8f37780fa2a /block/blkdebug.c | |
| parent | virtio: fix up VQ checks (diff) | |
| parent | Merge remote branch 'kwolf/for-anthony' into staging (diff) | |
| download | qemu-c924f36a300cbc54d3cb511116e8e2bae17f5ae6.tar.gz qemu-c924f36a300cbc54d3cb511116e8e2bae17f5ae6.tar.xz qemu-c924f36a300cbc54d3cb511116e8e2bae17f5ae6.zip | |
Merge remote branch 'origin/master' into pci
Conflicts:
Makefile.objs
hw/virtio.c
Diffstat (limited to 'block/blkdebug.c')
| -rw-r--r-- | block/blkdebug.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/blkdebug.c b/block/blkdebug.c index 4d6ff0a368..cd9eb8006a 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -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, |