diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2018-06-06 15:09:51 -0400 |
|---|---|---|
| committer | John Snow <jsnow@redhat.com> | 2018-06-08 13:36:25 -0400 |
| commit | bed9bcfa3275a9cfee82846a9f521c4858a9739a (patch) | |
| tree | 2a240e83cbbbf0438045e526abee224d0c9a1d9e /hw/ide/ahci.c | |
| parent | 956556e131e35f387ac482ad7b41151576fef057 (diff) | |
| download | qemu-bed9bcfa3275a9cfee82846a9f521c4858a9739a.zip qemu-bed9bcfa3275a9cfee82846a9f521c4858a9739a.tar.gz qemu-bed9bcfa3275a9cfee82846a9f521c4858a9739a.tar.bz2 | |
ide: push end_transfer_func out of start_transfer callback, rename callback
Now that end_transfer_func is a tail call in ahci_start_transfer,
formalize the fact that the callback (of which ahci_start_transfer is
the sole implementation) takes care of the transfer too: rename it to
pio_transfer and, if it is present, call the end_transfer_func as soon
as it returns.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20180606190955.20845-4-jsnow@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>
Diffstat (limited to 'hw/ide/ahci.c')
| -rw-r--r-- | hw/ide/ahci.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index f25bef5..f7852be 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -1340,8 +1340,8 @@ out: return 0; } -/* DMA dev <-> ram */ -static void ahci_start_transfer(IDEDMA *dma) +/* Transfer PIO data between RAM and device */ +static void ahci_pio_transfer(IDEDMA *dma) { AHCIDevice *ad = DO_UPCAST(AHCIDevice, dma, dma); IDEState *s = &ad->port.ifs[0]; @@ -1365,9 +1365,9 @@ static void ahci_start_transfer(IDEDMA *dma) has_sglist = 1; } - trace_ahci_start_transfer(ad->hba, ad->port_no, is_write ? "writ" : "read", - size, is_atapi ? "atapi" : "ata", - has_sglist ? "" : "o"); + trace_ahci_pio_transfer(ad->hba, ad->port_no, is_write ? "writ" : "read", + size, is_atapi ? "atapi" : "ata", + has_sglist ? "" : "o"); if (has_sglist && size) { if (is_write) { @@ -1382,7 +1382,6 @@ static void ahci_start_transfer(IDEDMA *dma) out: /* declare that we processed everything */ s->data_ptr = s->data_end; - s->end_transfer_func(s); } static void ahci_start_dma(IDEDMA *dma, IDEState *s, @@ -1503,7 +1502,7 @@ static const IDEDMAOps ahci_dma_ops = { .start_dma = ahci_start_dma, .restart = ahci_restart, .restart_dma = ahci_restart_dma, - .start_transfer = ahci_start_transfer, + .pio_transfer = ahci_pio_transfer, .prepare_buf = ahci_dma_prepare_buf, .commit_buf = ahci_commit_buf, .rw_buf = ahci_dma_rw_buf, |