From patchwork Mon Mar 12 06:29:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v2,2/2] block: drain throttled requests for one block device From: Zhiyong Wu X-Patchwork-Id: 146041 Message-Id: <1331533767-15866-1-git-send-email-zwu.kernel@gmail.com> To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, pbonzini@redhat.com, Zhi Yong Wu , zwu.kernel@gmail.com, stefanha@linux.vnet.ibm.com Date: Mon, 12 Mar 2012 14:29:27 +0800 From: Zhi Yong Wu Signed-off-by: Zhi Yong Wu --- blockdev.c | 4 ++-- hw/ide/macio.c | 2 +- hw/ide/pci.c | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/blockdev.c b/blockdev.c index d78aa51..1bc4667 100644 --- a/blockdev.c +++ b/blockdev.c @@ -694,7 +694,7 @@ void qmp_blockdev_snapshot_sync(const char *device, const char *snapshot_file, return; } - bdrv_drain_all(); + bdrv_drain(bs); bdrv_flush(bs); bdrv_close(bs); @@ -1014,7 +1014,7 @@ int do_drive_del(Monitor *mon, const QDict *qdict, QObject **ret_data) } /* quiesce block driver; prevent further io */ - bdrv_drain_all(); + bdrv_drain(bs); bdrv_flush(bs); bdrv_close(bs); diff --git a/hw/ide/macio.c b/hw/ide/macio.c index a4df244..454a020 100644 --- a/hw/ide/macio.c +++ b/hw/ide/macio.c @@ -192,7 +192,7 @@ static void pmac_ide_flush(DBDMA_io *io) MACIOIDEState *m = io->opaque; if (m->aiocb) { - bdrv_drain_all(); + bdrv_drain(m->aiocb->bs); } } diff --git a/hw/ide/pci.c b/hw/ide/pci.c index 88c0942..205d65a 100644 --- a/hw/ide/pci.c +++ b/hw/ide/pci.c @@ -27,6 +27,7 @@ #include #include #include "block.h" +#include "block_int.h" #include "dma.h" #include @@ -309,7 +310,7 @@ void bmdma_cmd_writeb(BMDMAState *bm, uint32_t val) * aio operation with preadv/pwritev. */ if (bm->bus->dma->aiocb) { - bdrv_drain_all(); + bdrv_drain(bm->bus->dma->aiocb->bs); assert(bm->bus->dma->aiocb == NULL); assert((bm->status & BM_STATUS_DMAING) == 0); }