[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 4/6] ide: make ide_transfer_stop idempotent
From: |
Paolo Bonzini |
Subject: |
[Qemu-block] [PATCH 4/6] ide: make ide_transfer_stop idempotent |
Date: |
Tue, 17 Apr 2018 17:39:43 +0200 |
There is code checking s->end_transfer_func and it was not taught about
ide_transfer_cancel. We can just use ide_transfer_stop because
s->end_transfer_func is only ever called in the DRQ phase.
ide_transfer_cancel can then be removed, since it would just be
calling ide_transfer_halt.
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/ide/core.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/hw/ide/core.c b/hw/ide/core.c
index edda171b47..bc3648eb13 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -548,10 +548,9 @@ static void ide_cmd_done(IDEState *s)
}
}
-static void ide_transfer_halt(IDEState *s,
- void(*end_transfer_func)(IDEState *))
+static void ide_transfer_halt(IDEState *s)
{
- s->end_transfer_func = end_transfer_func;
+ s->end_transfer_func = ide_transfer_stop;
s->data_ptr = s->io_buffer;
s->data_end = s->io_buffer;
s->status &= ~DRQ_STAT;
@@ -559,15 +558,10 @@ static void ide_transfer_halt(IDEState *s,
void ide_transfer_stop(IDEState *s)
{
- ide_transfer_halt(s, ide_transfer_stop);
+ ide_transfer_halt(s);
ide_cmd_done(s);
}
-static void ide_transfer_cancel(IDEState *s)
-{
- ide_transfer_halt(s, ide_transfer_cancel);
-}
-
int64_t ide_get_sector(IDEState *s)
{
int64_t sector_num;
@@ -1362,7 +1356,7 @@ static bool cmd_nop(IDEState *s, uint8_t cmd)
static bool cmd_device_reset(IDEState *s, uint8_t cmd)
{
/* Halt PIO (in the DRQ phase), then DMA */
- ide_transfer_cancel(s);
+ ide_transfer_halt(s);
ide_cancel_dma_sync(s);
/* Reset any PIO commands, reset signature, etc */
--
2.17.0
- [Qemu-block] [PATCH 0/6] atapi: change unlimited recursion to while loop, Paolo Bonzini, 2018/04/17
- [Qemu-block] [PATCH 4/6] ide: make ide_transfer_stop idempotent,
Paolo Bonzini <=
- [Qemu-block] [PATCH 3/6] ide: call ide_cmd_done from ide_transfer_stop, Paolo Bonzini, 2018/04/17
- [Qemu-block] [PATCH 5/6] atapi: call ide_set_irq before ide_transfer_start, Paolo Bonzini, 2018/04/17
- [Qemu-block] [PATCH 1/6] ahci: move PIO Setup FIS before transfer, fix it for ATAPI commands, Paolo Bonzini, 2018/04/17
- [Qemu-block] [PATCH 2/6] ide: push end_transfer_func out of start_transfer callback, rename callback, Paolo Bonzini, 2018/04/17
- [Qemu-block] [PATCH 6/6] ide: introduce ide_transfer_start_norecurse, Paolo Bonzini, 2018/04/17