block: Use bdrv_make_empty() where possible

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20200429141126.85159-3-mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Max Reitz 2020-04-29 16:11:24 +02:00 committed by Kevin Wolf
parent 6ecbc6c526
commit f844ec01b3
2 changed files with 2 additions and 5 deletions

View File

@ -331,9 +331,8 @@ static void secondary_do_checkpoint(BDRVReplicationState *s, Error **errp)
return;
}
ret = s->active_disk->bs->drv->bdrv_make_empty(s->active_disk->bs);
ret = bdrv_make_empty(s->active_disk, errp);
if (ret < 0) {
error_setg(errp, "Cannot make active disk empty");
return;
}

View File

@ -2960,9 +2960,7 @@ static int do_commit(BDRVVVFATState* s)
return ret;
}
if (s->qcow->bs->drv && s->qcow->bs->drv->bdrv_make_empty) {
s->qcow->bs->drv->bdrv_make_empty(s->qcow->bs);
}
bdrv_make_empty(s->qcow, NULL);
memset(s->used_clusters, 0, sector2cluster(s, s->sector_count));