blockjob: Remove BlockJob.bs
There is a single remaining user in qemu-img, and another one in a test case, both of which can be trivially converted to using BlockJob.blk instead. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Max Reitz <mreitz@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
parent
4653456a5f
commit
b75536c9fa
|
@ -83,7 +83,6 @@ void *block_job_create(const BlockJobDriver *driver, BlockDriverState *bs,
|
||||||
|
|
||||||
job->driver = driver;
|
job->driver = driver;
|
||||||
job->id = g_strdup(bdrv_get_device_name(bs));
|
job->id = g_strdup(bdrv_get_device_name(bs));
|
||||||
job->bs = bs;
|
|
||||||
job->blk = blk;
|
job->blk = blk;
|
||||||
job->cb = cb;
|
job->cb = cb;
|
||||||
job->opaque = opaque;
|
job->opaque = opaque;
|
||||||
|
|
|
@ -82,7 +82,6 @@ struct BlockJob {
|
||||||
const BlockJobDriver *driver;
|
const BlockJobDriver *driver;
|
||||||
|
|
||||||
/** The block device on which the job is operating. */
|
/** The block device on which the job is operating. */
|
||||||
BlockDriverState *bs; /* TODO Remove */
|
|
||||||
BlockBackend *blk;
|
BlockBackend *blk;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -775,7 +775,7 @@ static void common_block_job_cb(void *opaque, int ret)
|
||||||
|
|
||||||
static void run_block_job(BlockJob *job, Error **errp)
|
static void run_block_job(BlockJob *job, Error **errp)
|
||||||
{
|
{
|
||||||
AioContext *aio_context = bdrv_get_aio_context(job->bs);
|
AioContext *aio_context = blk_get_aio_context(job->blk);
|
||||||
|
|
||||||
do {
|
do {
|
||||||
aio_poll(aio_context, true);
|
aio_poll(aio_context, true);
|
||||||
|
|
|
@ -15,6 +15,7 @@
|
||||||
#include "qapi/error.h"
|
#include "qapi/error.h"
|
||||||
#include "qemu/main-loop.h"
|
#include "qemu/main-loop.h"
|
||||||
#include "block/blockjob.h"
|
#include "block/blockjob.h"
|
||||||
|
#include "sysemu/block-backend.h"
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
BlockJob common;
|
BlockJob common;
|
||||||
|
@ -30,7 +31,7 @@ static const BlockJobDriver test_block_job_driver = {
|
||||||
|
|
||||||
static void test_block_job_complete(BlockJob *job, void *opaque)
|
static void test_block_job_complete(BlockJob *job, void *opaque)
|
||||||
{
|
{
|
||||||
BlockDriverState *bs = job->bs;
|
BlockDriverState *bs = blk_bs(job->blk);
|
||||||
int rc = (intptr_t)opaque;
|
int rc = (intptr_t)opaque;
|
||||||
|
|
||||||
if (block_job_is_cancelled(job)) {
|
if (block_job_is_cancelled(job)) {
|
||||||
|
|
Loading…
Reference in New Issue