From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45028) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b5SGI-0003Si-Q9 for qemu-devel@nongnu.org; Wed, 25 May 2016 02:25:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b5SGH-0005f8-LU for qemu-devel@nongnu.org; Wed, 25 May 2016 02:25:46 -0400 Message-ID: <57454648.6020207@cn.fujitsu.com> Date: Wed, 25 May 2016 14:29:28 +0800 From: Changlong Xie MIME-Version: 1.0 References: <1464097654-12977-1-git-send-email-kwolf@redhat.com> <1464097654-12977-15-git-send-email-kwolf@redhat.com> In-Reply-To: <1464097654-12977-15-git-send-email-kwolf@redhat.com> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH v2 14/14] blockjob: Remove BlockJob.bs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kevin Wolf , qemu-block@nongnu.org Cc: berto@igalia.com, jcody@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com, jsnow@redhat.com On 05/24/2016 09:47 PM, Kevin Wolf wrote: > There is a single remaining user in qemu-img, which can be trivially > converted to using BlockJob.blk instead. > > Signed-off-by: Kevin Wolf > Reviewed-by: Max Reitz > --- > 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); > Compiled with your block-jobs-bb branch: changlox ~/w/qemu/qemu% make check-unit -j8 [ 1 ] :-( CC tests/test-blockjob-txn.o GTESTER tests/test-x86-cpuid GTESTER tests/test-cutils GTESTER tests/test-int128 GTESTER tests/check-qdict GTESTER tests/check-qfloat GTESTER tests/check-qint GTESTER tests/check-qstring GTESTER tests/check-qlist GTESTER tests/check-qjson GTESTER tests/check-qnull GTESTER tests/test-qmp-output-visitor GTESTER tests/test-qmp-input-strict GTESTER tests/test-qmp-input-visitor GTESTER tests/test-qmp-commands GTESTER tests/test-string-input-visitor GTESTER tests/test-string-output-visitor GTESTER tests/test-qmp-event GTESTER tests/test-opts-visitor GTESTER tests/test-coroutine GTESTER tests/test-visitor-serialization GTESTER tests/test-iov GTESTER tests/test-aio GTESTER tests/test-rfifolock tests/test-blockjob-txn.c: In function ‘test_block_job_complete’: tests/test-blockjob-txn.c:33:31: error: ‘BlockJob’ has no member named ‘bs’ BlockDriverState *bs = job->bs; ^ GTESTER tests/test-throttle GTESTER tests/test-thread-pool make: *** [tests/test-blockjob-txn.o] Error 1 make: *** Waiting for unfinished jobs....