[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/6] ide: call ide_cmd_done from ide_transfer_stop
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 3/6] ide: call ide_cmd_done from ide_transfer_stop |
Date: |
Tue, 17 Apr 2018 17:39:42 +0200 |
The code can simply be moved to the sole caller that has notify == true.
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/ide/core.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/hw/ide/core.c b/hw/ide/core.c
index 7932b7c069..edda171b47 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -549,26 +549,23 @@ static void ide_cmd_done(IDEState *s)
}
static void ide_transfer_halt(IDEState *s,
- void(*end_transfer_func)(IDEState *),
- bool notify)
+ void(*end_transfer_func)(IDEState *))
{
s->end_transfer_func = end_transfer_func;
s->data_ptr = s->io_buffer;
s->data_end = s->io_buffer;
s->status &= ~DRQ_STAT;
- if (notify) {
- ide_cmd_done(s);
- }
}
void ide_transfer_stop(IDEState *s)
{
- ide_transfer_halt(s, ide_transfer_stop, true);
+ ide_transfer_halt(s, ide_transfer_stop);
+ ide_cmd_done(s);
}
static void ide_transfer_cancel(IDEState *s)
{
- ide_transfer_halt(s, ide_transfer_cancel, false);
+ ide_transfer_halt(s, ide_transfer_cancel);
}
int64_t ide_get_sector(IDEState *s)
--
2.17.0
- [Qemu-devel] [PATCH 0/6] atapi: change unlimited recursion to while loop, Paolo Bonzini, 2018/04/17
- [Qemu-devel] [PATCH 3/6] ide: call ide_cmd_done from ide_transfer_stop,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 5/6] atapi: call ide_set_irq before ide_transfer_start, Paolo Bonzini, 2018/04/17
- [Qemu-devel] [PATCH 2/6] ide: push end_transfer_func out of start_transfer callback, rename callback, Paolo Bonzini, 2018/04/17
- [Qemu-devel] [PATCH 1/6] ahci: move PIO Setup FIS before transfer, fix it for ATAPI commands, Paolo Bonzini, 2018/04/17
- [Qemu-devel] [PATCH 4/6] ide: make ide_transfer_stop idempotent, Paolo Bonzini, 2018/04/17
- [Qemu-devel] [PATCH 6/6] ide: introduce ide_transfer_start_norecurse, Paolo Bonzini, 2018/04/17