ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ide: simplify reset callbacks 

Drop the unused return value and make the callback optional.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: John Snow <jsnow@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Paolo Bonzini 2014-08-04 17:11:06 -04:00 committed by Stefan Hajnoczi
parent 69f72a2221
commit 1374bec063
5 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/ide/ahci.c
View File

@ -1147,11 +1147,6 @@ static void ahci_dma_restart_cb(void *opaque, int running, RunState state)
{ {
} }
static int ahci_dma_reset(IDEDMA *dma)
{
return 0;
}
static const IDEDMAOps ahci_dma_ops = { static const IDEDMAOps ahci_dma_ops = {
.start_dma = ahci_start_dma, .start_dma = ahci_start_dma,
.start_transfer = ahci_start_transfer, .start_transfer = ahci_start_transfer,
@ -1162,7 +1157,6 @@ static const IDEDMAOps ahci_dma_ops = {
.set_inactive = ahci_dma_set_inactive, .set_inactive = ahci_dma_set_inactive,
.async_cmd_done = ahci_async_cmd_done, .async_cmd_done = ahci_async_cmd_done,
.restart_cb = ahci_dma_restart_cb, .restart_cb = ahci_dma_restart_cb,
.reset = ahci_dma_reset,
}; };
void ahci_init(AHCIState *s, DeviceState *qdev, AddressSpace *as, int ports) void ahci_init(AHCIState *s, DeviceState *qdev, AddressSpace *as, int ports)

5
hw/ide/core.c
View File

@ -2088,7 +2088,9 @@ void ide_bus_reset(IDEBus *bus)
} }
/* reset dma provider too */ /* reset dma provider too */
bus->dma->ops->reset(bus->dma); if (bus->dma->ops->reset) {
bus->dma->ops->reset(bus->dma);
}
} }
static bool ide_cd_is_tray_open(void *opaque) static bool ide_cd_is_tray_open(void *opaque)
@ -2226,7 +2228,6 @@ static const IDEDMAOps ide_dma_nop_ops = {
.add_status = ide_nop_int, .add_status = ide_nop_int,
.set_inactive = ide_nop, .set_inactive = ide_nop,
.restart_cb = ide_nop_restart, .restart_cb = ide_nop_restart,
.reset = ide_nop,
}; };
static IDEDMA ide_dma_nop = { static IDEDMA ide_dma_nop = {

3
hw/ide/internal.h
View File

@ -320,6 +320,7 @@ typedef enum { IDE_HD, IDE_CD, IDE_CFATA } IDEDriveKind;
typedef void EndTransferFunc(IDEState *); typedef void EndTransferFunc(IDEState *);
typedef void DMAStartFunc(IDEDMA *, IDEState *, BlockDriverCompletionFunc *); typedef void DMAStartFunc(IDEDMA *, IDEState *, BlockDriverCompletionFunc *);
typedef void DMAVoidFunc(IDEDMA *);
typedef int DMAFunc(IDEDMA *); typedef int DMAFunc(IDEDMA *);
typedef int DMAIntFunc(IDEDMA *, int); typedef int DMAIntFunc(IDEDMA *, int);
typedef void DMARestartFunc(void *, int, RunState); typedef void DMARestartFunc(void *, int, RunState);
@ -435,7 +436,7 @@ struct IDEDMAOps {
DMAFunc *set_inactive; DMAFunc *set_inactive;
DMAFunc *async_cmd_done; DMAFunc *async_cmd_done;
DMARestartFunc *restart_cb; DMARestartFunc *restart_cb;
DMAFunc *reset; DMAVoidFunc *reset;
}; };
struct IDEDMA { struct IDEDMA {

1
hw/ide/macio.c
View File

@ -578,7 +578,6 @@ static const IDEDMAOps dbdma_ops = {
.add_status = ide_nop_int, .add_status = ide_nop_int,
.set_inactive = ide_nop, .set_inactive = ide_nop,
.restart_cb = ide_nop_restart, .restart_cb = ide_nop_restart,
.reset = ide_nop,
}; };
static void macio_ide_realizefn(DeviceState *dev, Error **errp) static void macio_ide_realizefn(DeviceState *dev, Error **errp)

4
hw/ide/pci.c
View File

@ -247,7 +247,7 @@ static void bmdma_cancel(BMDMAState *bm)
} }
} }
static int bmdma_reset(IDEDMA *dma) static void bmdma_reset(IDEDMA *dma)
{ {
BMDMAState *bm = DO_UPCAST(BMDMAState, dma, dma); BMDMAState *bm = DO_UPCAST(BMDMAState, dma, dma);
@ -264,8 +264,6 @@ static int bmdma_reset(IDEDMA *dma)
bm->cur_prd_len = 0; bm->cur_prd_len = 0;
bm->sector_num = 0; bm->sector_num = 0;
bm->nsector = 0; bm->nsector = 0;
return 0;
} }
static int bmdma_start_transfer(IDEDMA *dma) static int bmdma_start_transfer(IDEDMA *dma)