From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=56027 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PM12Q-0008KO-GP for qemu-devel@nongnu.org; Fri, 26 Nov 2010 11:20:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PM12P-0002yY-IA for qemu-devel@nongnu.org; Fri, 26 Nov 2010 11:20:42 -0500 Received: from mx1.redhat.com ([209.132.183.28]:15083) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PM12P-0002yR-6a for qemu-devel@nongnu.org; Fri, 26 Nov 2010 11:20:41 -0500 From: Kevin Wolf Date: Fri, 26 Nov 2010 17:21:30 +0100 Message-Id: <1290788492-17703-3-git-send-email-kwolf@redhat.com> In-Reply-To: <1290788492-17703-1-git-send-email-kwolf@redhat.com> References: <1290788492-17703-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 2/4] ide: Set bus master inactive on error List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, stefanha@gmail.com, mjt@tls.msk.ru BMIDEA in the status register must be cleared on error. This makes FreeBSD respond (more) correctly to I/O errors. Signed-off-by: Kevin Wolf --- hw/ide/core.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index 7136ade..430350f 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -486,6 +486,8 @@ void ide_dma_error(IDEState *s) ide_transfer_stop(s); s->error = ABRT_ERR; s->status = READY_STAT | ERR_STAT; + ide_dma_set_inactive(s->bus->bmdma); + s->bus->bmdma->status |= BM_STATUS_INT; ide_set_irq(s->bus); } -- 1.7.2.3