ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Version: GnuPG v1
 
 iQIcBAABAgAGBQJXmow9AAoJEH3vgQaq/DkOwQ4P/3vcFw2evyhKqMkzJNhkEapX
 aDBNex/4iPYrgfZWLBW0pue/cbEx5YVudA/BCo5ldhoQ6nU4wS/1tss9KjBkyZng
 qAl/x+39IPdSF/iEFYTs1RPD73eVUvhJk2FByexC/srz22QzxncWmGMGrwdGeCmG
 YHAUtxzsWyxLk9KnzThxYsVX9UBRRircoX3lUl82EVKnXKbaXdRPrlh6FP2ZYiiV
 PMjPh5YZdsYcoPpYPji9gLav1gbFiFVXyYi65yh0j3rcYmH6RX09yWU1rLSDRAGq
 RJkEh522GAdE5AT4uRoHlfz2yazUNn2YaXkANeO8k0XoiC0YEqN2rRC0+dV58fiK
 i7CwnALzcpZi/sBxeFVE2/KX7Q3Hr8cxd6irI2kvzuaOyowYEApXW7G/XFMVLuLV
 0rW1T+FpGXtDr7DcMfjtUa4oGjJzfph2+P6uxrp1PaC5LL/3G64ckJy8ozTmYXod
 629XcoZr3YjbB/DiQMnUtOIuhLaaRCLo3UI+GFYajsgsBoBI0gkgpoX0U7StmmuN
 mD/7J+TpPiWoGsDA/1xfKL5PV9bfCH09umB8n7fz8jQRQl+RWH8+O56tA663OlCd
 GcuQweVeiK68mOTR2597X4f594YfGzOtyI8RDSQ7iqZS1yzdQstaV3Xa5hS5RZ+1
 Z6ADqr+vuWpg1DH87U60
 =1ix8
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging

# gpg: Signature made Thu 28 Jul 2016 23:50:37 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:
  ide: fix halted IO segfault at reset

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2016-07-29 11:01:38 +01:00
parent 21a21b853a 87ac25fd1f
commit aa2aac51f0
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/ide/core.c
View File

@ -823,6 +823,7 @@ static void ide_dma_cb(void *opaque, int ret)
}
if (ret < 0) {
if (ide_handle_rw_error(s, -ret, ide_dma_cmd_to_retry(s->dma_cmd))) {
s->bus->dma->aiocb = NULL;
return;
}
}