mirrors
/
qemu
mirror of https://gitlab.com/qemu-project/qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

-----BEGIN PGP SIGNATURE----- 

Version: GnuPG v1
 
 iQIcBAABAgAGBQJXcX0nAAoJEH3vgQaq/DkO9c0QAJ6xs+bKsQaE2tGf/EtK04g6
 jKETGQjJTkE5uQzrrGUpI/0o0SjfGvOUIWtf8fxOaUsLcktBgizX4eQ2ak4YZL71
 fMOrq4X+GEn+Kj55TuZGahbqU6msn10tu4aEddNVaPLRHsS47WKakHYKp5LBlPVh
 di0NwUON6AiDxy7BwcpEg7SJ8bfrg5jGkDzZ64binrf0m/BxD+51MR4ePpdDg2dd
 /TWKagfR9m1FBvnnKMddfeeyu3c5zdHAa0cQmIBeHUjz1OKaSpae0UZ7sTEM7UJT
 3OPWsv82d7KbqFDX3Z0r7TDzQyiEb2TQekdalyqWMX49JzpMUb99WvRlN8Algnww
 E+bzkCTxb7yjlTIaIlwoLYTUOOSVmv8cDZtH3jmk4i0Cddi+FrEpGCXviVL9A3Js
 s6BOa7LHkTKWnqjqralI2Det9LeED9Drons/vJLgc2AR7o65/kc+5UrzgYBySkmA
 KQG0Ispndhm4k8SIPKvf0NmLIQaJRRQW8r/DTSONdYs75/YS0sQyepU/W+wawkJa
 R36IMcJB8M8Pv59z9h8Hcnhl2uSjzjkr9LCa/Sa6lee6pEMMuDRi7Er6Ghnn7PhT
 Q1kMhV+SCFnqBm3d43WzrlVuqTlIKCG7T6WVP03qjWbo3dV/ItgTUtTnwnbzHR2e
 NXkjBc1lGOnUIrZ4XJmY
 =DXoy
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2016-06-28 09:04:05 +01:00
parent fdc997ef54 0d0437aac6
commit dc154b1db4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/ide/macio.c
View File

@ -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);
}
}