diff options
| author | Peter Maydell | 2016-06-28 10:04:05 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-06-28 10:04:05 +0200 |
| commit | dc154b1db4b9e5046d00851a591a039b8453a935 (patch) | |
| tree | 9af8137b7bbb63c3fab385c3e4413349127bf893 | |
| parent | target-alpha: Avoid gcc 6.1 werror for linux-user (diff) | |
| parent | macio: Use blk_drain instead of blk_drain_all (diff) | |
| download | qemu-dc154b1db4b9e5046d00851a591a039b8453a935.tar.gz qemu-dc154b1db4b9e5046d00851a591a039b8453a935.tar.xz qemu-dc154b1db4b9e5046d00851a591a039b8453a935.zip | |
Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging
# gpg: Signature made Mon 27 Jun 2016 20:23:19 BST
# gpg: using RSA key 0x7DEF8106AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>"
# Primary key fingerprint: FAEB 9711 A12C F475 812F 18F2 88A9 064D 1835 61EB
# Subkey fingerprint: F9B7 ABDB BCAC DF95 BE76 CBD0 7DEF 8106 AAFC 390E
* remotes/jnsnow/tags/ide-pull-request:
macio: Use blk_drain instead of blk_drain_all
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/ide/macio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/ide/macio.c b/hw/ide/macio.c index fa57352fc8..56cc50661f 100644 --- a/hw/ide/macio.c +++ b/hw/ide/macio.c @@ -406,7 +406,7 @@ static void pmac_ide_flush(DBDMA_io *io) IDEState *s = idebus_active_if(&m->bus); if (s->bus->dma->aiocb) { - blk_drain_all(); + blk_drain(s->blk); } } |