Commit bd21935b authored by Kevin Wolf's avatar Kevin Wolf
Browse files

blockjob: Add block_job_driver() 



The backup block job directly accesses the driver field in BlockJob. Add
a wrapper for getting it.

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarJohn Snow <jsnow@redhat.com>
parent dee81d51

block/backup.c

+5 −3
Original line number Diff line number Diff line
@@ -47,6 +47,8 @@ typedef struct BackupBlockJob { 
    HBitmap *copy_bitmap;

} BackupBlockJob;



static const BlockJobDriver backup_job_driver;



/* See if in-flight requests overlap and wait for them to complete */

static void coroutine_fn wait_for_overlapping_requests(BackupBlockJob *job,

                                                       int64_t start,
@@ -241,7 +243,7 @@ void backup_do_checkpoint(BlockJob *job, Error **errp) 
    BackupBlockJob *backup_job = container_of(job, BackupBlockJob, common);

    int64_t len;



    assert(job->driver->job_type == BLOCK_JOB_TYPE_BACKUP);

    assert(block_job_driver(job) == &backup_job_driver);



    if (backup_job->sync_mode != MIRROR_SYNC_MODE_NONE) {

        error_setg(errp, "The backup job only supports block checkpoint in"
@@ -259,7 +261,7 @@ void backup_wait_for_overlapping_requests(BlockJob *job, int64_t offset, 
    BackupBlockJob *backup_job = container_of(job, BackupBlockJob, common);

    int64_t start, end;



    assert(job->driver->job_type == BLOCK_JOB_TYPE_BACKUP);

    assert(block_job_driver(job) == &backup_job_driver);



    start = QEMU_ALIGN_DOWN(offset, backup_job->cluster_size);

    end = QEMU_ALIGN_UP(offset + bytes, backup_job->cluster_size);
@@ -272,7 +274,7 @@ void backup_cow_request_begin(CowRequest *req, BlockJob *job, 
    BackupBlockJob *backup_job = container_of(job, BackupBlockJob, common);

    int64_t start, end;



    assert(job->driver->job_type == BLOCK_JOB_TYPE_BACKUP);

    assert(block_job_driver(job) == &backup_job_driver);



    start = QEMU_ALIGN_DOWN(offset, backup_job->cluster_size);

    end = QEMU_ALIGN_UP(offset + bytes, backup_job->cluster_size);

blockjob.c

+5 −0
Original line number Diff line number Diff line
@@ -359,6 +359,11 @@ static bool block_job_started(BlockJob *job) 
    return job->co;

}



const BlockJobDriver *block_job_driver(BlockJob *job)

{

    return job->driver;

}



/**

 * All jobs must allow a pause point before entering their job proper. This

 * ensures that jobs can be paused prior to being started, then resumed later.

include/block/blockjob.h

+7 −0
Original line number Diff line number Diff line
@@ -452,4 +452,11 @@ void block_job_txn_add_job(BlockJobTxn *txn, BlockJob *job); 
 */

bool block_job_is_internal(BlockJob *job);



/**

 * block_job_driver:

 *

 * Returns the driver associated with a block job.

 */

const BlockJobDriver *block_job_driver(BlockJob *job);



#endif