[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 07/17] ide: remove restart_cb callback
From: |
John Snow |
Subject: |
[Qemu-devel] [PATCH v2 07/17] ide: remove restart_cb callback |
Date: |
Tue, 16 Dec 2014 20:35:57 -0500 |
From: Paolo Bonzini <address@hidden>
With restarts now handled by ide_restart_cb and
the IDEDMAOps.restart_dma() member, remove the old
restart_cb callback.
Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: John Snow <address@hidden>
---
hw/ide/ahci.c | 5 -----
hw/ide/core.c | 5 -----
hw/ide/internal.h | 1 -
hw/ide/macio.c | 5 -----
4 files changed, 16 deletions(-)
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index 5651372..3892025 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -1252,10 +1252,6 @@ static void ahci_irq_set(void *opaque, int n, int level)
{
}
-static void ahci_dma_restart_cb(void *opaque, int running, RunState state)
-{
-}
-
static const IDEDMAOps ahci_dma_ops = {
.start_dma = ahci_start_dma,
.start_transfer = ahci_start_transfer,
@@ -1264,7 +1260,6 @@ static const IDEDMAOps ahci_dma_ops = {
.rw_buf = ahci_dma_rw_buf,
.set_unit = ahci_dma_set_unit,
.cmd_done = ahci_cmd_done,
- .restart_cb = ahci_dma_restart_cb,
};
void ahci_init(AHCIState *s, DeviceState *qdev, AddressSpace *as, int ports)
diff --git a/hw/ide/core.c b/hw/ide/core.c
index 15b6a3f..f3d98d7 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -2323,16 +2323,11 @@ static int32_t ide_nop_int32(IDEDMA *dma, int x)
return 0;
}
-static void ide_nop_restart(void *opaque, int x, RunState y)
-{
-}
-
static const IDEDMAOps ide_dma_nop_ops = {
.prepare_buf = ide_nop_int32,
.restart_dma = ide_nop,
.rw_buf = ide_nop_int,
.set_unit = ide_nop_int,
- .restart_cb = ide_nop_restart,
};
static void ide_restart_dma(IDEState *s, enum ide_dma_cmd dma_cmd)
diff --git a/hw/ide/internal.h b/hw/ide/internal.h
index 7ea64d1..53ce932 100644
--- a/hw/ide/internal.h
+++ b/hw/ide/internal.h
@@ -438,7 +438,6 @@ struct IDEDMAOps {
DMAVoidFunc *restart_dma;
DMAStopFunc *set_inactive;
DMAVoidFunc *cmd_done;
- DMARestartFunc *restart_cb;
DMAVoidFunc *reset;
};
diff --git a/hw/ide/macio.c b/hw/ide/macio.c
index f6074f2..e7a5c99 100644
--- a/hw/ide/macio.c
+++ b/hw/ide/macio.c
@@ -558,10 +558,6 @@ static int32_t ide_nop_int32(IDEDMA *dma, int x)
return 0;
}
-static void ide_nop_restart(void *opaque, int x, RunState y)
-{
-}
-
static void ide_dbdma_start(IDEDMA *dma, IDEState *s,
BlockCompletionFunc *cb)
{
@@ -577,7 +573,6 @@ static const IDEDMAOps dbdma_ops = {
.prepare_buf = ide_nop_int32,
.rw_buf = ide_nop_int,
.set_unit = ide_nop_int,
- .restart_cb = ide_nop_restart,
};
static void macio_ide_realizefn(DeviceState *dev, Error **errp)
--
1.9.3
- [Qemu-devel] [PATCH v2 00/17] ide: rerror and werror support for IDE and AHCI, John Snow, 2014/12/16
- [Qemu-devel] [PATCH v2 01/17] ide: start extracting ide_restart_dma out of bmdma_restart_dma, John Snow, 2014/12/16
- [Qemu-devel] [PATCH v2 02/17] ide: prepare to move restart to common code, John Snow, 2014/12/16
- [Qemu-devel] [PATCH v2 04/17] ide: do not use BMDMA in restart callback, John Snow, 2014/12/16
- [Qemu-devel] [PATCH v2 03/17] ide: introduce ide_register_restart_cb, John Snow, 2014/12/16
- [Qemu-devel] [PATCH v2 05/17] ide: pass IDEBus to the restart_cb, John Snow, 2014/12/16
- [Qemu-devel] [PATCH v2 07/17] ide: remove restart_cb callback,
John Snow <=
- [Qemu-devel] [PATCH v2 06/17] ide: move restart callback to common code, John Snow, 2014/12/16
- [Qemu-devel] [PATCH v2 08/17] ide: replace set_unit callback with more IDEBus state, John Snow, 2014/12/16
- [Qemu-devel] [PATCH v2 09/17] ide: place initial state of the current request to IDEBus, John Snow, 2014/12/16
- [Qemu-devel] [PATCH v2 11/17] ide: commonize io_buffer_index initialization, John Snow, 2014/12/16
- [Qemu-devel] [PATCH v2 10/17] ide: migrate initial request state via IDEBus, John Snow, 2014/12/16
- [Qemu-devel] [PATCH v2 12/17] ide: make more functions static, John Snow, 2014/12/16
- [Qemu-devel] [PATCH v2 13/17] ide: support PIO restart for the ISA controller, John Snow, 2014/12/16
- [Qemu-devel] [PATCH v2 15/17] ahci: add support for restarting non-queued commands, John Snow, 2014/12/16
- [Qemu-devel] [PATCH v2 14/17] ahci: Migrate IDEStatus, John Snow, 2014/12/16