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 | f34ae00d6d22671d8583892fa702f21f3049ef72 (patch) | |
| tree | ecc7fce59219b71f18fe5d4eeb7448491c1e6a81 /hw/ide | |
| parent | e3044e238302a887cc1a022e358d68b9bdc69573 (diff) | |
ide: fix device_reset to not ignore pending AIO
Signed-off-by: John Snow <jsnow@redhat.com>
Reported-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 1453225191-11871-7-git-send-email-jsnow@redhat.com
Diffstat (limited to 'hw/ide')
| -rw-r--r-- | hw/ide/core.c | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/hw/ide/core.c b/hw/ide/core.c index 3c32b392a0..241e840de0 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -505,7 +505,6 @@ 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); @@ -1298,6 +1297,23 @@ static bool cmd_nop(IDEState *s, uint8_t cmd) return true; } +static bool cmd_device_reset(IDEState *s, uint8_t cmd) +{ + /* Halt PIO (in the DRQ phase), then DMA */ + ide_transfer_cancel(s); + ide_cancel_dma_sync(s); + + /* Reset any PIO commands, reset signature, etc */ + ide_reset(s); + + /* RESET: ATA8-ACS3 7.10.4 "Normal Outputs"; + * ATA8-ACS3 Table 184 "Device Signatures for Normal Output" */ + s->status = 0x00; + + /* Do not overwrite status register */ + return false; +} + static bool cmd_data_set_management(IDEState *s, uint8_t cmd) { switch (s->feature) { @@ -1614,15 +1630,6 @@ static bool cmd_exec_dev_diagnostic(IDEState *s, uint8_t cmd) return false; } -static bool cmd_device_reset(IDEState *s, uint8_t cmd) -{ - ide_set_signature(s); - s->status = 0x00; /* NOTE: READY is _not_ set */ - s->error = 0x01; - - return false; -} - static bool cmd_packet(IDEState *s, uint8_t cmd) { /* overlapping commands not supported */ |