ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
John Snow 2016-02-10 13:29:39 -05:00
parent e3044e2383
commit f34ae00d6d
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
hw/ide/core.c
View File

@ -505,7 +505,6 @@ void ide_transfer_stop(IDEState *s)
ide_transfer_halt(s, ide_transfer_stop, true); ide_transfer_halt(s, ide_transfer_stop, true);
} }
__attribute__((__unused__))
static void ide_transfer_cancel(IDEState *s) static void ide_transfer_cancel(IDEState *s)
{ {
ide_transfer_halt(s, ide_transfer_cancel, false); ide_transfer_halt(s, ide_transfer_cancel, false);
@ -1298,6 +1297,23 @@ static bool cmd_nop(IDEState *s, uint8_t cmd)
return true; 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) static bool cmd_data_set_management(IDEState *s, uint8_t cmd)
{ {
switch (s->feature) { switch (s->feature) {
@ -1614,15 +1630,6 @@ static bool cmd_exec_dev_diagnostic(IDEState *s, uint8_t cmd)
return false; 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) static bool cmd_packet(IDEState *s, uint8_t cmd)
{ {
/* overlapping commands not supported */ /* overlapping commands not supported */