[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 18/24] ide: pass IDEBus to the restart_cb
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 18/24] ide: pass IDEBus to the restart_cb |
Date: |
Mon, 28 Oct 2013 17:43:34 +0100 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/ide/core.c | 2 +-
hw/ide/pci.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/hw/ide/core.c b/hw/ide/core.c
index 93cfd46..5820fad 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -2195,7 +2195,7 @@ static const IDEDMAOps ide_dma_nop_ops = {
void ide_register_restart_cb(IDEBus *bus)
{
- qemu_add_vm_change_state_handler(bus->dma->ops->restart_cb, bus->dma);
+ qemu_add_vm_change_state_handler(bus->dma->ops->restart_cb, bus);
}
static IDEDMA ide_dma_nop = {
diff --git a/hw/ide/pci.c b/hw/ide/pci.c
index 4df50dc..9d26a26 100644
--- a/hw/ide/pci.c
+++ b/hw/ide/pci.c
@@ -199,8 +199,8 @@ static void ide_restart_dma(IDEState *s, enum ide_dma_cmd
dma_cmd)
/* TODO This should be common IDE code */
static void bmdma_restart_bh(void *opaque)
{
- BMDMAState *bm = opaque;
- IDEBus *bus = bm->bus;
+ IDEBus *bus = opaque;
+ BMDMAState *bm = DO_UPCAST(BMDMAState, dma, bus->dma);
IDEState *s;
bool is_read;
int error_status;
@@ -240,8 +240,8 @@ static void bmdma_restart_bh(void *opaque)
static void bmdma_restart_cb(void *opaque, int running, RunState state)
{
- IDEDMA *dma = opaque;
- BMDMAState *bm = DO_UPCAST(BMDMAState, dma, dma);
+ IDEBus *bus = opaque;
+ BMDMAState *bm = DO_UPCAST(BMDMAState, dma, bus->dma);
if (!running)
return;
--
1.8.3.1
- Re: [Qemu-devel] [PATCH 09/24] ide: wrap start_dma callback, (continued)
- [Qemu-devel] [PATCH 10/24] ide: add trigger_irq callback, Paolo Bonzini, 2013/10/28
- [Qemu-devel] [PATCH 11/24] ide: fold add_status callback into set_inactive, Paolo Bonzini, 2013/10/28
- [Qemu-devel] [PATCH 12/24] ide: move BM_STATUS bits to pci.[ch], Paolo Bonzini, 2013/10/28
- [Qemu-devel] [PATCH 13/24] ide: move retry constants out of BM_STATUS_* namespace, Paolo Bonzini, 2013/10/28
- [Qemu-devel] [PATCH 14/24] ide: start extracting ide_restart_dma out of bmdma_restart_dma, Paolo Bonzini, 2013/10/28
- [Qemu-devel] [PATCH 15/24] ide: prepare to move restart to common code, Paolo Bonzini, 2013/10/28
- [Qemu-devel] [PATCH 16/24] ide: introduce ide_register_restart_cb, Paolo Bonzini, 2013/10/28
- [Qemu-devel] [PATCH 17/24] ide: do not use BMDMA in restart callback, Paolo Bonzini, 2013/10/28
- [Qemu-devel] [PATCH 18/24] ide: pass IDEBus to the restart_cb,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 19/24] ide: move restart callback to common code, Paolo Bonzini, 2013/10/28
- [Qemu-devel] [PATCH 20/24] ide: remove restart_cb callback, Paolo Bonzini, 2013/10/28
- [Qemu-devel] [PATCH 21/24] ide: replace set_unit callback with more IDEBus state, Paolo Bonzini, 2013/10/28
- [Qemu-devel] [PATCH 22/24] ide: place initial state of the current request to IDEBus, Paolo Bonzini, 2013/10/28
- [Qemu-devel] [PATCH 23/24] ide: migrate initial request state via IDEBus, Paolo Bonzini, 2013/10/28
- [Qemu-devel] [PATCH 24/24] ide: commonize io_buffer_index initialization, Paolo Bonzini, 2013/10/28
- Re: [Qemu-devel] [WIP PATCH 00/24] IDE cleanups, initial work on AHCI rerror/werror=stop, Michael S. Tsirkin, 2013/10/28