diff options
| author | Max Reitz <mreitz@redhat.com> | 2020-04-29 16:11:24 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2020-05-18 19:05:25 +0200 |
| commit | f844ec01b36797e0e5f31f56bfbe49f8c24cc7d4 (patch) | |
| tree | 2ae0ab40e8be2c8a9222252e4dd1b2fafedd593d /block | |
| parent | 6ecbc6c52672db5c13805735ca02784879ce8285 (diff) | |
| download | qemu-f844ec01b36797e0e5f31f56bfbe49f8c24cc7d4.zip qemu-f844ec01b36797e0e5f31f56bfbe49f8c24cc7d4.tar.gz qemu-f844ec01b36797e0e5f31f56bfbe49f8c24cc7d4.tar.bz2 | |
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>
Diffstat (limited to 'block')
| -rw-r--r-- | block/replication.c | 3 | ||||
| -rw-r--r-- | block/vvfat.c | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/block/replication.c b/block/replication.c index eb480a8..9a9f36e 100644 --- a/block/replication.c +++ b/block/replication.c @@ -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; } diff --git a/block/vvfat.c b/block/vvfat.c index 6d5c090..34c121c 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -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)); |