@@ -1619,8 +1619,7 @@ static int bdrv_snapshot_find(BlockDriverState *bs, QEMUSnapshotInfo *sn_info,
return ret;
}
-static int delete_snapshot(Monitor *mon, BlockDriverState *bs,
- const char *name)
+static int delete_snapshot(BlockDriverState *bs, const char *name)
{
int ret;
@@ -1643,7 +1642,7 @@ static int delete_snapshot(Monitor *mon, BlockDriverState *bs,
/*
* Deletes snapshots of a given name in all opened images.
*/
-static int del_existing_snapshots(Monitor *mon, const char *name)
+static int del_existing_snapshots(const char *name)
{
BlockDriverState *bs;
DriveInfo *dinfo;
@@ -1655,7 +1654,7 @@ static int del_existing_snapshots(Monitor *mon, const char *name)
if (bdrv_can_snapshot(bs) &&
bdrv_snapshot_find(bs, snapshot, name) >= 0)
{
- ret = delete_snapshot(mon, bs, name);
+ ret = delete_snapshot(bs, name);
if (ret < 0) {
return -1;
}
@@ -1717,7 +1716,7 @@ void do_savevm(Monitor *mon, const QDict *qdict)
sn->vm_clock_nsec = qemu_get_clock(vm_clock);
/* Delete old snapshots of the same name */
- if (name && del_existing_snapshots(mon, name) < 0) {
+ if (name && del_existing_snapshots(name) < 0) {
goto the_end;
}
@@ -1831,7 +1830,7 @@ void do_delvm(Monitor *mon, const QDict *qdict)
QTAILQ_FOREACH(dinfo, &drives, next) {
bs1 = dinfo->bdrv;
if (bdrv_has_snapshot(bs1)) {
- delete_snapshot(mon, bs1, name);
+ delete_snapshot(bs1, name);
}
}
}
The parameter 'mon' is unused after the conversion to QError, done by the previous commit. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> --- savevm.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-)