diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2016-04-14 15:56:02 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2016-05-25 19:04:21 +0200 |
| commit | 8543c274141ade048c6a6070a095761a65acbb82 (patch) | |
| tree | b3921a8499c459646ad269940e28e7d030eca164 /block | |
| parent | 12b3e52e4875ca018e033c66f1825437a005c239 (diff) | |
| download | qemu-8543c274141ade048c6a6070a095761a65acbb82.zip qemu-8543c274141ade048c6a6070a095761a65acbb82.tar.gz qemu-8543c274141ade048c6a6070a095761a65acbb82.tar.bz2 | |
backup: Remove bs parameter from backup_do_cow()
Now that we pass the job to the function, bs is implied by that.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/backup.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/block/backup.c b/block/backup.c index a57288f..670ba50 100644 --- a/block/backup.c +++ b/block/backup.c @@ -94,12 +94,12 @@ static void cow_request_end(CowRequest *req) qemu_co_queue_restart_all(&req->wait_queue); } -static int coroutine_fn backup_do_cow(BlockDriverState *bs, - BackupBlockJob *job, +static int coroutine_fn backup_do_cow(BackupBlockJob *job, int64_t sector_num, int nb_sectors, bool *error_is_read, bool is_write_notifier) { + BlockDriverState *bs = job->common.bs; CowRequest cow_request; struct iovec iov; QEMUIOVector bounce_qiov; @@ -203,11 +203,11 @@ static int coroutine_fn backup_before_write_notify( int64_t sector_num = req->offset >> BDRV_SECTOR_BITS; int nb_sectors = req->bytes >> BDRV_SECTOR_BITS; + assert(req->bs == job->common.bs); assert((req->offset & (BDRV_SECTOR_SIZE - 1)) == 0); assert((req->bytes & (BDRV_SECTOR_SIZE - 1)) == 0); - return backup_do_cow(req->bs, job, sector_num, - nb_sectors, NULL, true); + return backup_do_cow(job, sector_num, nb_sectors, NULL, true); } static void backup_set_speed(BlockJob *job, int64_t speed, Error **errp) @@ -324,7 +324,6 @@ static int coroutine_fn backup_run_incremental(BackupBlockJob *job) int64_t end; int64_t last_cluster = -1; int64_t sectors_per_cluster = cluster_size_sectors(job); - BlockDriverState *bs = job->common.bs; HBitmapIter hbi; granularity = bdrv_dirty_bitmap_granularity(job->sync_bitmap); @@ -346,7 +345,7 @@ static int coroutine_fn backup_run_incremental(BackupBlockJob *job) if (yield_and_check(job)) { return ret; } - ret = backup_do_cow(bs, job, cluster * sectors_per_cluster, + ret = backup_do_cow(job, cluster * sectors_per_cluster, sectors_per_cluster, &error_is_read, false); if ((ret < 0) && @@ -446,7 +445,7 @@ static void coroutine_fn backup_run(void *opaque) } } /* FULL sync mode we copy the whole drive. */ - ret = backup_do_cow(bs, job, start * sectors_per_cluster, + ret = backup_do_cow(job, start * sectors_per_cluster, sectors_per_cluster, &error_is_read, false); if (ret < 0) { /* Depending on error action, fail now or retry cluster */ |