* [Qemu-devel] [PULL 0/1] Ide patches
@ 2016-08-09 15:50 John Snow
2016-08-09 15:50 ` [Qemu-devel] [PULL 1/1] atapi: fix halted DMA reset John Snow
2016-08-09 16:24 ` [Qemu-devel] [PULL 0/1] Ide patches Peter Maydell
0 siblings, 2 replies; 3+ messages in thread
From: John Snow @ 2016-08-09 15:50 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, jsnow
The following changes since commit ab861f3915e8667927cf18ad97f71cae7ccf8818:
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging (2016-08-09 10:44:27 +0100)
are available in the git repository at:
https://github.com/jnsnow/qemu.git tags/ide-pull-request
for you to fetch changes up to 7f951b2d7765f68ae1e563c2fed44071ca774790:
atapi: fix halted DMA reset (2016-08-09 11:47:23 -0400)
----------------------------------------------------------------
----------------------------------------------------------------
John Snow (1):
atapi: fix halted DMA reset
hw/ide/atapi.c | 1 +
1 file changed, 1 insertion(+)
--
2.7.4
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Qemu-devel] [PULL 1/1] atapi: fix halted DMA reset
2016-08-09 15:50 [Qemu-devel] [PULL 0/1] Ide patches John Snow
@ 2016-08-09 15:50 ` John Snow
2016-08-09 16:24 ` [Qemu-devel] [PULL 0/1] Ide patches Peter Maydell
1 sibling, 0 replies; 3+ messages in thread
From: John Snow @ 2016-08-09 15:50 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, jsnow
Followup to 87ac25fd, this time for ATAPI DMA.
Reported-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: John Snow <jsnow@redhat.com>
Message-id: 1470164128-28158-1-git-send-email-jsnow@redhat.com
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: John Snow <jsnow@redhat.com>
---
hw/ide/atapi.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c
index 95056d9..6189675 100644
--- a/hw/ide/atapi.c
+++ b/hw/ide/atapi.c
@@ -386,6 +386,7 @@ static void ide_atapi_cmd_read_dma_cb(void *opaque, int ret)
if (ret < 0) {
if (ide_handle_rw_error(s, -ret, ide_dma_cmd_to_retry(s->dma_cmd))) {
if (s->bus->error_status) {
+ s->bus->dma->aiocb = NULL;
return;
}
goto eot;
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PULL 0/1] Ide patches
2016-08-09 15:50 [Qemu-devel] [PULL 0/1] Ide patches John Snow
2016-08-09 15:50 ` [Qemu-devel] [PULL 1/1] atapi: fix halted DMA reset John Snow
@ 2016-08-09 16:24 ` Peter Maydell
1 sibling, 0 replies; 3+ messages in thread
From: Peter Maydell @ 2016-08-09 16:24 UTC (permalink / raw)
To: John Snow; +Cc: QEMU Developers
On 9 August 2016 at 16:50, John Snow <jsnow@redhat.com> wrote:
> The following changes since commit ab861f3915e8667927cf18ad97f71cae7ccf8818:
>
> Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging (2016-08-09 10:44:27 +0100)
>
> are available in the git repository at:
>
> https://github.com/jnsnow/qemu.git tags/ide-pull-request
>
> for you to fetch changes up to 7f951b2d7765f68ae1e563c2fed44071ca774790:
>
> atapi: fix halted DMA reset (2016-08-09 11:47:23 -0400)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------
>
> John Snow (1):
> atapi: fix halted DMA reset
>
> hw/ide/atapi.c | 1 +
> 1 file changed, 1 insertion(+)
Applied, thanks.
-- PMM
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-08-09 16:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-09 15:50 [Qemu-devel] [PULL 0/1] Ide patches John Snow
2016-08-09 15:50 ` [Qemu-devel] [PULL 1/1] atapi: fix halted DMA reset John Snow
2016-08-09 16:24 ` [Qemu-devel] [PULL 0/1] Ide patches Peter Maydell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).