From 2745df813d82724f2633a9b2ba7f7c5717d7509b Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Mon, 23 Feb 2015 11:17:53 -0500 Subject: ide: do not use BMDMA in restart callback 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 Message-id: 1424708286-16483-5-git-send-email-jsnow@redhat.com Signed-off-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf --- hw/ide/pci.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'hw/ide') 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) { -- cgit v1.1