diff options
| author | Kevin Wolf | 2014-03-12 15:59:16 +0100 |
|---|---|---|
| committer | Kevin Wolf | 2014-03-19 09:39:41 +0100 |
| commit | 5a8a30db4771675480829d7d3bf35a138e9c35f1 (patch) | |
| tree | f9ea39c07db48ca7edd89c462e45a2451682014e /include | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/pull-vnc-2' into staging (diff) | |
| download | qemu-5a8a30db4771675480829d7d3bf35a138e9c35f1.tar.gz qemu-5a8a30db4771675480829d7d3bf35a138e9c35f1.tar.xz qemu-5a8a30db4771675480829d7d3bf35a138e9c35f1.zip | |
block: Add error handling to bdrv_invalidate_cache()
If it returns an error, the migrated VM will not be started, but qemu
exits with an error message.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Benoit Canet <benoit@irqsave.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/block/block.h | 4 | ||||
| -rw-r--r-- | include/block/block_int.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/block/block.h b/include/block/block.h index bd34d14109..1ed55d839a 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -329,8 +329,8 @@ BlockDriverAIOCB *bdrv_aio_ioctl(BlockDriverState *bs, BlockDriverCompletionFunc *cb, void *opaque); /* Invalidate any cached metadata used by image formats */ -void bdrv_invalidate_cache(BlockDriverState *bs); -void bdrv_invalidate_cache_all(void); +void bdrv_invalidate_cache(BlockDriverState *bs, Error **errp); +void bdrv_invalidate_cache_all(Error **errp); void bdrv_clear_incoming_migration_all(void); diff --git a/include/block/block_int.h b/include/block/block_int.h index 4fc5ea8a65..cd5bc7308a 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -153,7 +153,7 @@ struct BlockDriver { /* * Invalidate any cached meta-data. */ - void (*bdrv_invalidate_cache)(BlockDriverState *bs); + void (*bdrv_invalidate_cache)(BlockDriverState *bs, Error **errp); /* * Flushes all data that was already written to the OS all the way down to |