[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 4/7] ide: call ide_cmd_done from ide_transfer_stop
From: |
John Snow |
Subject: |
[Qemu-block] [PATCH 4/7] ide: call ide_cmd_done from ide_transfer_stop |
Date: |
Wed, 6 Jun 2018 15:09:52 -0400 |
From: Paolo Bonzini <address@hidden>
The code can simply be moved to the sole caller that has notify == true.
Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: John Snow <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 1a6cb337bf..54799ea6fb 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -548,26 +548,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.14.3
- [Qemu-block] [PATCH 0/7] atapi: change unlimited recursion to while loop, John Snow, 2018/06/06
- [Qemu-block] [PATCH 4/7] ide: call ide_cmd_done from ide_transfer_stop,
John Snow <=
- [Qemu-block] [PATCH 6/7] atapi: call ide_set_irq before ide_transfer_start, John Snow, 2018/06/06
- [Qemu-block] [PATCH 5/7] ide: make ide_transfer_stop idempotent, John Snow, 2018/06/06
- [Qemu-block] [PATCH 1/7] libqos/ahci: track sector size, John Snow, 2018/06/06
- [Qemu-block] [PATCH 7/7] ide: introduce ide_transfer_start_norecurse, John Snow, 2018/06/06
- [Qemu-block] [PATCH 2/7] ahci: move PIO Setup FIS before transfer, fix it for ATAPI commands, John Snow, 2018/06/06
- [Qemu-block] [PATCH 3/7] ide: push end_transfer_func out of start_transfer callback, rename callback, John Snow, 2018/06/06
- Re: [Qemu-block] [PATCH 0/7] atapi: change unlimited recursion to while loop, John Snow, 2018/06/06