From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50284) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YPvi6-0008Eb-2S for qemu-devel@nongnu.org; Mon, 23 Feb 2015 11:18:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YPvi3-00053k-EA for qemu-devel@nongnu.org; Mon, 23 Feb 2015 11:18:17 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55024) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YPvi3-00053W-79 for qemu-devel@nongnu.org; Mon, 23 Feb 2015 11:18:15 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t1NGIDCj001246 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Mon, 23 Feb 2015 11:18:14 -0500 From: John Snow Date: Mon, 23 Feb 2015 11:17:53 -0500 Message-Id: <1424708286-16483-5-git-send-email-jsnow@redhat.com> In-Reply-To: <1424708286-16483-1-git-send-email-jsnow@redhat.com> References: <1424708286-16483-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PATCH v4 04/17] ide: do not use BMDMA in restart callback List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, mst@redhat.com, armbru@redhat.com, mreitz@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, John Snow From: Paolo Bonzini Whenever an error stops the VM, ide_handle_rw_error does "s->bus->dma->unit = s->unit". So we can just use idebus_active_if. Signed-off-by: Paolo Bonzini Signed-off-by: John Snow --- hw/ide/pci.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/ide/pci.c b/hw/ide/pci.c index 34fc4fb..62c88d7 100644 --- a/hw/ide/pci.c +++ b/hw/ide/pci.c @@ -217,17 +217,17 @@ static void bmdma_restart_bh(void *opaque) qemu_bh_delete(bm->bh); bm->bh = NULL; - if (bm->unit == (uint8_t) -1) { + error_status = bus->error_status; + if (bus->error_status == 0) { return; } - s = bmdma_active_if(bm); + s = idebus_active_if(bus); is_read = (bus->error_status & IDE_RETRY_READ) != 0; /* The error status must be cleared before resubmitting the request: The * request may fail again, and this case can only be distinguished if the * called function can set a new error status. */ - error_status = bus->error_status; bus->error_status = 0; if (error_status & IDE_RETRY_DMA) { -- 1.9.3