From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58227) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z867m-0001af-Uz for qemu-devel@nongnu.org; Thu, 25 Jun 2015 08:19:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z867h-0007jC-U7 for qemu-devel@nongnu.org; Thu, 25 Jun 2015 08:19:22 -0400 Sender: Paolo Bonzini Message-ID: <558BF1C0.4020402@redhat.com> Date: Thu, 25 Jun 2015 14:19:12 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1432896805-23867-1-git-send-email-famz@redhat.com> <1432896805-23867-2-git-send-email-famz@redhat.com> In-Reply-To: <1432896805-23867-2-git-send-email-famz@redhat.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH for-2.4 01/12] block: Use bdrv_drain to replace uncessary bdrv_drain_all List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Fam Zheng , qemu-devel@nongnu.org Cc: fam@euphon.net, Kevin Wolf , Stefan Hajnoczi , qemu-block@nongnu.org Kevin, can you queue this patch for 2.4? Paolo On 29/05/2015 12:53, Fam Zheng wrote: > There callers work on a single BlockDriverState subtree, where using > bdrv_drain() is more accurate. > > Signed-off-by: Fam Zheng > --- > block.c | 6 +++--- > block/snapshot.c | 2 +- > migration/block.c | 2 +- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/block.c b/block.c > index f42d70e..e9f31b7 100644 > --- a/block.c > +++ b/block.c > @@ -1719,9 +1719,9 @@ void bdrv_close(BlockDriverState *bs) > if (bs->job) { > block_job_cancel_sync(bs->job); > } > - bdrv_drain_all(); /* complete I/O */ > + bdrv_drain(bs); /* complete I/O */ > bdrv_flush(bs); > - bdrv_drain_all(); /* in case flush left pending I/O */ > + bdrv_drain(bs); /* in case flush left pending I/O */ > notifier_list_notify(&bs->close_notifiers, bs); > > if (bs->drv) { > @@ -3726,7 +3726,7 @@ void bdrv_attach_aio_context(BlockDriverState *bs, > > void bdrv_set_aio_context(BlockDriverState *bs, AioContext *new_context) > { > - bdrv_drain_all(); /* ensure there are no in-flight requests */ > + bdrv_drain(bs); /* ensure there are no in-flight requests */ > > bdrv_detach_aio_context(bs); > > diff --git a/block/snapshot.c b/block/snapshot.c > index 50ae610..d56ec14 100644 > --- a/block/snapshot.c > +++ b/block/snapshot.c > @@ -238,7 +238,7 @@ int bdrv_snapshot_delete(BlockDriverState *bs, > } > > /* drain all pending i/o before deleting snapshot */ > - bdrv_drain_all(); > + bdrv_drain(bs); > > if (drv->bdrv_snapshot_delete) { > return drv->bdrv_snapshot_delete(bs, snapshot_id, name, errp); > diff --git a/migration/block.c b/migration/block.c > index ddb59cc..ed865ed 100644 > --- a/migration/block.c > +++ b/migration/block.c > @@ -457,7 +457,7 @@ static int mig_save_device_dirty(QEMUFile *f, BlkMigDevState *bmds, > blk_mig_lock(); > if (bmds_aio_inflight(bmds, sector)) { > blk_mig_unlock(); > - bdrv_drain_all(); > + bdrv_drain(bmds->bs); > } else { > blk_mig_unlock(); > } >