vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

block: Add errp to bdrv_all_goto_snapshot() 

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Denis V. Lunev <den@openvz.org>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: John Snow <jsnow@redhat.com>
master
Kevin Wolf 2017-11-20 15:36:48 +01:00
parent 0b62bcbc61
commit 2b624fe079
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
block/snapshot.c
View File

@ -467,9 +467,10 @@ fail:
} }
int bdrv_all_goto_snapshot(const char *name, BlockDriverState **first_bad_bs) int bdrv_all_goto_snapshot(const char *name, BlockDriverState **first_bad_bs,
Error **errp)
{ {
int err = 0; int ret = 0;
BlockDriverState *bs; BlockDriverState *bs;
BdrvNextIterator it; BdrvNextIterator it;
@ -478,10 +479,10 @@ int bdrv_all_goto_snapshot(const char *name, BlockDriverState **first_bad_bs)
aio_context_acquire(ctx); aio_context_acquire(ctx);
if (bdrv_can_snapshot(bs)) { if (bdrv_can_snapshot(bs)) {
err = bdrv_snapshot_goto(bs, name, NULL); ret = bdrv_snapshot_goto(bs, name, errp);
} }
aio_context_release(ctx); aio_context_release(ctx);
if (err < 0) { if (ret < 0) {
bdrv_next_cleanup(&it); bdrv_next_cleanup(&it);
goto fail; goto fail;
} }
@ -489,7 +490,7 @@ int bdrv_all_goto_snapshot(const char *name, BlockDriverState **first_bad_bs)
fail: fail:
*first_bad_bs = bs; *first_bad_bs = bs;
return err; return ret;
} }
int bdrv_all_find_snapshot(const char *name, BlockDriverState **first_bad_bs) int bdrv_all_find_snapshot(const char *name, BlockDriverState **first_bad_bs)

3
include/block/snapshot.h
View File

@ -84,7 +84,8 @@ int bdrv_snapshot_load_tmp_by_id_or_name(BlockDriverState *bs,
bool bdrv_all_can_snapshot(BlockDriverState **first_bad_bs); bool bdrv_all_can_snapshot(BlockDriverState **first_bad_bs);
int bdrv_all_delete_snapshot(const char *name, BlockDriverState **first_bsd_bs, int bdrv_all_delete_snapshot(const char *name, BlockDriverState **first_bsd_bs,
Error **err); Error **err);
int bdrv_all_goto_snapshot(const char *name, BlockDriverState **first_bsd_bs); int bdrv_all_goto_snapshot(const char *name, BlockDriverState **first_bad_bs,
Error **errp);
int bdrv_all_find_snapshot(const char *name, BlockDriverState **first_bad_bs); int bdrv_all_find_snapshot(const char *name, BlockDriverState **first_bad_bs);
int bdrv_all_create_snapshot(QEMUSnapshotInfo *sn, int bdrv_all_create_snapshot(QEMUSnapshotInfo *sn,
BlockDriverState *vm_state_bs, BlockDriverState *vm_state_bs,

6
migration/savevm.c
View File

@ -2346,10 +2346,10 @@ int load_snapshot(const char *name, Error **errp)
/* Flush all IO requests so they don't interfere with the new state. */ /* Flush all IO requests so they don't interfere with the new state. */
bdrv_drain_all_begin(); bdrv_drain_all_begin();
ret = bdrv_all_goto_snapshot(name, &bs); ret = bdrv_all_goto_snapshot(name, &bs, errp);
if (ret < 0) { if (ret < 0) {
error_setg(errp, "Error %d while activating snapshot '%s' on '%s'", error_prepend(errp, "Could not load snapshot '%s' on '%s': ",
ret, name, bdrv_get_device_name(bs)); name, bdrv_get_device_name(bs));
goto err_drain; goto err_drain;
} }