From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39661) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1axtIT-0005vT-46 for qemu-devel@nongnu.org; Wed, 04 May 2016 05:40:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1axtIH-0005vi-BD for qemu-devel@nongnu.org; Wed, 04 May 2016 05:40:39 -0400 From: Kevin Wolf Date: Wed, 4 May 2016 11:39:25 +0200 Message-Id: <1462354765-14037-15-git-send-email-kwolf@redhat.com> In-Reply-To: <1462354765-14037-1-git-send-email-kwolf@redhat.com> References: <1462354765-14037-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 14/14] blockjob: Remove BlockJob.bs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: kwolf@redhat.com, mreitz@redhat.com, jcody@redhat.com, jsnow@redhat.com, berto@igalia.com, qemu-devel@nongnu.org There is a single remaining user in qemu-img, which can be trivially converted to using BlockJob.blk instead. Signed-off-by: Kevin Wolf --- 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 01b58c7..c0d8ee9 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 46f2a6d..77148c2 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