[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/28] ide: wrap start_dma callback
From: |
John Snow |
Subject: |
[Qemu-devel] [PATCH 09/28] ide: wrap start_dma callback |
Date: |
Mon, 7 Jul 2014 14:17:50 -0400 |
From: Paolo Bonzini <address@hidden>
Make it optional and prepare for the next patches.
Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: John Snow <address@hidden>
---
hw/ide/atapi.c | 6 ++----
hw/ide/core.c | 15 ++++++++-------
hw/ide/internal.h | 1 +
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c
index f7d2009..d13395e 100644
--- a/hw/ide/atapi.c
+++ b/hw/ide/atapi.c
@@ -255,8 +255,7 @@ static void ide_atapi_cmd_reply(IDEState *s, int size, int
max_size)
if (s->atapi_dma) {
bdrv_acct_start(s->bs, &s->acct, size, BDRV_ACCT_READ);
s->status = READY_STAT | SEEK_STAT | DRQ_STAT;
- s->bus->dma->ops->start_dma(s->bus->dma, s,
- ide_atapi_cmd_read_dma_cb);
+ ide_start_dma(s, ide_atapi_cmd_read_dma_cb);
} else {
s->status = READY_STAT | SEEK_STAT;
ide_atapi_cmd_reply_end(s);
@@ -375,8 +374,7 @@ static void ide_atapi_cmd_read_dma(IDEState *s, int lba,
int nb_sectors,
/* XXX: check if BUSY_STAT should be set */
s->status = READY_STAT | SEEK_STAT | DRQ_STAT | BUSY_STAT;
- s->bus->dma->ops->start_dma(s->bus->dma, s,
- ide_atapi_cmd_read_dma_cb);
+ ide_start_dma(s, ide_atapi_cmd_read_dma_cb);
}
static void ide_atapi_cmd_read(IDEState *s, int lba, int nb_sectors,
diff --git a/hw/ide/core.c b/hw/ide/core.c
index 4b47bf5..82aa0b9 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -722,7 +722,14 @@ static void ide_sector_start_dma(IDEState *s, enum
ide_dma_cmd dma_cmd)
break;
}
- s->bus->dma->ops->start_dma(s->bus->dma, s, ide_dma_cb);
+ ide_start_dma(s, ide_dma_cb);
+}
+
+void ide_start_dma(IDEState *s, BlockDriverCompletionFunc *cb)
+{
+ if (s->bus->dma->ops->start_dma) {
+ s->bus->dma->ops->start_dma(s->bus->dma, s, cb);
+ }
}
static void ide_sector_write_timer_cb(void *opaque)
@@ -2176,11 +2183,6 @@ static void ide_init1(IDEBus *bus, int unit)
ide_sector_write_timer_cb, s);
}
-static void ide_nop_start(IDEDMA *dma, IDEState *s,
- BlockDriverCompletionFunc *cb)
-{
-}
-
static int ide_nop_int(IDEDMA *dma, int x)
{
return 0;
@@ -2191,7 +2193,6 @@ static void ide_nop_restart(void *opaque, int x, RunState
y)
}
static const IDEDMAOps ide_dma_nop_ops = {
- .start_dma = ide_nop_start,
.prepare_buf = ide_nop_int,
.rw_buf = ide_nop_int,
.set_unit = ide_nop_int,
diff --git a/hw/ide/internal.h b/hw/ide/internal.h
index 64fbf2f..2fe1f0a 100644
--- a/hw/ide/internal.h
+++ b/hw/ide/internal.h
@@ -532,6 +532,7 @@ void ide_bus_reset(IDEBus *bus);
int64_t ide_get_sector(IDEState *s);
void ide_set_sector(IDEState *s, int64_t sector_num);
+void ide_start_dma(IDEState *s, BlockDriverCompletionFunc *cb);
void ide_dma_error(IDEState *s);
void ide_atapi_cmd_ok(IDEState *s);
--
1.9.3
- [Qemu-devel] [PATCH 05/28] ide: simplify reset callbacks, (continued)
- [Qemu-devel] [PATCH 05/28] ide: simplify reset callbacks, John Snow, 2014/07/07
- [Qemu-devel] [PATCH 11/28] ide: fold add_status callback into set_inactive, John Snow, 2014/07/07
- [Qemu-devel] [PATCH 12/28] ide: move BM_STATUS bits to pci.[ch], John Snow, 2014/07/07
- [Qemu-devel] [PATCH 08/28] ide: simplify start_transfer callbacks, John Snow, 2014/07/07
- [Qemu-devel] [PATCH 14/28] ahci: remove duplicate PORT_IRQ_* constants, John Snow, 2014/07/07
- [Qemu-devel] [PATCH 09/28] ide: wrap start_dma callback,
John Snow <=
- [Qemu-devel] [PATCH 13/28] ide: move retry constants out of BM_STATUS_* namespace, John Snow, 2014/07/07
- [Qemu-devel] [PATCH 16/28] ide: make all commands go through cmd_done, John Snow, 2014/07/07
- [Qemu-devel] [PATCH 10/28] ide: remove wrong setting of BM_STATUS_INT, John Snow, 2014/07/07
- [Qemu-devel] [PATCH 15/28] ide: stop PIO transfer on errors, John Snow, 2014/07/07