diff options
| author | John Snow <jsnow@redhat.com> | 2016-02-10 13:29:39 -0500 |
|---|---|---|
| committer | John Snow <jsnow@redhat.com> | 2016-02-10 13:29:39 -0500 |
| commit | e3044e238302a887cc1a022e358d68b9bdc69573 (patch) | |
| tree | 1355e1107a66693b1eb7316122f8a1dff6d57d1d /hw/ide | |
| parent | 51f7b5b883a2c9cb98ae28f1563b67f4f6d34c90 (diff) | |
ide: Add silent DRQ cancellation
Split apart the ide_transfer_stop function into two versions: one that
interrupts and one that doesn't. The one that doesn't can be used to
halt any PIO transfers that are in the DRQ phase. It will not halt
any PIO transfers that are currently in the process of buffering data
for the guest to read.
Signed-off-by: John Snow <jsnow@redhat.com>
Reported-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
[Renamed 'etf' to 'end_transfer_func' --js]
Message-id: 1453225191-11871-6-git-send-email-jsnow@redhat.com
Diffstat (limited to 'hw/ide')
| -rw-r--r-- | hw/ide/core.c | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/hw/ide/core.c b/hw/ide/core.c index 40b6cc8c62..3c32b392a0 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -487,13 +487,28 @@ static void ide_cmd_done(IDEState *s) } } -void ide_transfer_stop(IDEState *s) +static void ide_transfer_halt(IDEState *s, + void(*end_transfer_func)(IDEState *), + bool notify) { - s->end_transfer_func = ide_transfer_stop; + s->end_transfer_func = end_transfer_func; s->data_ptr = s->io_buffer; s->data_end = s->io_buffer; s->status &= ~DRQ_STAT; - ide_cmd_done(s); + if (notify) { + ide_cmd_done(s); + } +} + +void ide_transfer_stop(IDEState *s) +{ + ide_transfer_halt(s, ide_transfer_stop, true); +} + +__attribute__((__unused__)) +static void ide_transfer_cancel(IDEState *s) +{ + ide_transfer_halt(s, ide_transfer_cancel, false); } int64_t ide_get_sector(IDEState *s) |