[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v2 14/14] blockjob: Remove BlockJob.bs
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PATCH v2 14/14] blockjob: Remove BlockJob.bs |
Date: |
Tue, 24 May 2016 15:47:34 +0200 |
There is a single remaining user in qemu-img, which can be trivially
converted to using BlockJob.blk instead.
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
---
blockjob.c | 1 -
include/block/blockjob.h | 1 -
qemu-img.c | 2 +-
3 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/blockjob.c b/blockjob.c
index 2097e1d..c095cc5 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -83,7 +83,6 @@ void *block_job_create(const BlockJobDriver *driver,
BlockDriverState *bs,
job->driver = driver;
job->id = g_strdup(bdrv_get_device_name(bs));
- job->bs = bs;
job->blk = blk;
job->cb = cb;
job->opaque = opaque;
diff --git a/include/block/blockjob.h b/include/block/blockjob.h
index 32012af..86d2807 100644
--- a/include/block/blockjob.h
+++ b/include/block/blockjob.h
@@ -82,7 +82,6 @@ struct BlockJob {
const BlockJobDriver *driver;
/** The block device on which the job is operating. */
- BlockDriverState *bs; /* TODO Remove */
BlockBackend *blk;
/**
diff --git a/qemu-img.c b/qemu-img.c
index 7ed8ef2..dd2ba0a 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -775,7 +775,7 @@ static void common_block_job_cb(void *opaque, int ret)
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 {
aio_poll(aio_context, true);
--
1.8.3.1
- Re: [Qemu-block] [Qemu-devel] [PATCH v2 08/14] mirror: Use BlockBackend for I/O, (continued)
[Qemu-block] [PATCH v2 06/14] stream: Use BlockBackend for I/O, Kevin Wolf, 2016/05/24
[Qemu-block] [PATCH v2 10/14] backup: Pack Notifier within BackupBlockJob, Kevin Wolf, 2016/05/24
[Qemu-block] [PATCH v2 11/14] backup: Remove bs parameter from backup_do_cow(), Kevin Wolf, 2016/05/24
[Qemu-block] [PATCH v2 14/14] blockjob: Remove BlockJob.bs,
Kevin Wolf <=
[Qemu-block] [PATCH v2 12/14] backup: Use BlockBackend for I/O, Kevin Wolf, 2016/05/24
[Qemu-block] [PATCH v2 13/14] commit: Use BlockBackend for I/O, Kevin Wolf, 2016/05/24