snapshot: create bdrv_all_delete_snapshot helper
to delete snapshots from all loaded block drivers. The patch also ensures proper locking. Signed-off-by: Denis V. Lunev <den@openvz.org> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: Fam Zheng <famz@redhat.com> Reviewed-by: Juan Quintela <quintela@redhat.com> CC: Kevin Wolf <kwolf@redhat.com> Tested-by: Greg Kurz <gkurz@linux.vnet.ibm.com> Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
parent
25af925fff
commit
9b00ea376d
|
@ -381,3 +381,25 @@ bool bdrv_all_can_snapshot(BlockDriverState **first_bad_bs)
|
||||||
*first_bad_bs = bs;
|
*first_bad_bs = bs;
|
||||||
return ok;
|
return ok;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int bdrv_all_delete_snapshot(const char *name, BlockDriverState **first_bad_bs,
|
||||||
|
Error **err)
|
||||||
|
{
|
||||||
|
int ret = 0;
|
||||||
|
BlockDriverState *bs = NULL;
|
||||||
|
QEMUSnapshotInfo sn1, *snapshot = &sn1;
|
||||||
|
|
||||||
|
while (ret == 0 && (bs = bdrv_next(bs))) {
|
||||||
|
AioContext *ctx = bdrv_get_aio_context(bs);
|
||||||
|
|
||||||
|
aio_context_acquire(ctx);
|
||||||
|
if (bdrv_can_snapshot(bs) &&
|
||||||
|
bdrv_snapshot_find(bs, snapshot, name) >= 0) {
|
||||||
|
ret = bdrv_snapshot_delete_by_id_or_name(bs, name, err);
|
||||||
|
}
|
||||||
|
aio_context_release(ctx);
|
||||||
|
}
|
||||||
|
|
||||||
|
*first_bad_bs = bs;
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
|
@ -82,5 +82,7 @@ int bdrv_snapshot_load_tmp_by_id_or_name(BlockDriverState *bs,
|
||||||
* when appropriate for appropriate block drivers */
|
* when appropriate for appropriate block drivers */
|
||||||
|
|
||||||
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,
|
||||||
|
Error **err);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1916,35 +1916,6 @@ static BlockDriverState *find_vmstate_bs(void)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* Deletes snapshots of a given name in all opened images.
|
|
||||||
*/
|
|
||||||
static int del_existing_snapshots(Monitor *mon, const char *name)
|
|
||||||
{
|
|
||||||
BlockDriverState *bs;
|
|
||||||
QEMUSnapshotInfo sn1, *snapshot = &sn1;
|
|
||||||
Error *err = NULL;
|
|
||||||
|
|
||||||
bs = NULL;
|
|
||||||
while ((bs = bdrv_next(bs))) {
|
|
||||||
if (bdrv_can_snapshot(bs) &&
|
|
||||||
bdrv_snapshot_find(bs, snapshot, name) >= 0) {
|
|
||||||
bdrv_snapshot_delete_by_id_or_name(bs, name, &err);
|
|
||||||
if (err) {
|
|
||||||
monitor_printf(mon,
|
|
||||||
"Error while deleting snapshot on device '%s':"
|
|
||||||
" %s\n",
|
|
||||||
bdrv_get_device_name(bs),
|
|
||||||
error_get_pretty(err));
|
|
||||||
error_free(err);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void hmp_savevm(Monitor *mon, const QDict *qdict)
|
void hmp_savevm(Monitor *mon, const QDict *qdict)
|
||||||
{
|
{
|
||||||
BlockDriverState *bs, *bs1;
|
BlockDriverState *bs, *bs1;
|
||||||
|
@ -2002,7 +1973,11 @@ void hmp_savevm(Monitor *mon, const QDict *qdict)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Delete old snapshots of the same name */
|
/* Delete old snapshots of the same name */
|
||||||
if (name && del_existing_snapshots(mon, name) < 0) {
|
if (name && bdrv_all_delete_snapshot(name, &bs1, &local_err) < 0) {
|
||||||
|
monitor_printf(mon,
|
||||||
|
"Error while deleting snapshot on device '%s': %s\n",
|
||||||
|
bdrv_get_device_name(bs1), error_get_pretty(local_err));
|
||||||
|
error_free(local_err);
|
||||||
goto the_end;
|
goto the_end;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2162,20 +2137,11 @@ void hmp_delvm(Monitor *mon, const QDict *qdict)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
bs = NULL;
|
if (bdrv_all_delete_snapshot(name, &bs, &err) < 0) {
|
||||||
while ((bs = bdrv_next(bs))) {
|
monitor_printf(mon,
|
||||||
if (bdrv_can_snapshot(bs)) {
|
"Error while deleting snapshot on device '%s': %s\n",
|
||||||
err = NULL;
|
bdrv_get_device_name(bs), error_get_pretty(err));
|
||||||
bdrv_snapshot_delete_by_id_or_name(bs, name, &err);
|
error_free(err);
|
||||||
if (err) {
|
|
||||||
monitor_printf(mon,
|
|
||||||
"Error while deleting snapshot on device '%s':"
|
|
||||||
" %s\n",
|
|
||||||
bdrv_get_device_name(bs),
|
|
||||||
error_get_pretty(err));
|
|
||||||
error_free(err);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue