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

atapi: Prioritize unknown cmd error over BCL error 

If we don't know about the command at all, we need to prioritize
that failure above the zero byte-count-limit failure.

This fixes a failure in the sparc64 NetBSD 7.0 installer bootup.

Reported-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: John Snow <jsnow@redhat.com>
Tested-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-id: 1447095959-10046-3-git-send-email-jsnow@redhat.com
This commit is contained in:
John Snow 2015-11-13 14:31:42 -05:00
parent af0e00db0e
commit f36aa12d2f
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/ide/atapi.c
View File

@ -1195,7 +1195,7 @@ enum {
NONDATA = 0x04, NONDATA = 0x04,
}; };
static const struct { static const struct AtapiCmd {
void (*handler)(IDEState *s, uint8_t *buf); void (*handler)(IDEState *s, uint8_t *buf);
int flags; int flags;
} atapi_cmd_table[0x100] = { } atapi_cmd_table[0x100] = {
@ -1222,9 +1222,9 @@ static const struct {
void ide_atapi_cmd(IDEState *s) void ide_atapi_cmd(IDEState *s)
{ {
uint8_t *buf; uint8_t *buf = s->io_buffer;
const struct AtapiCmd *cmd = &atapi_cmd_table[s->io_buffer[0]];
buf = s->io_buffer;
#ifdef DEBUG_IDE_ATAPI #ifdef DEBUG_IDE_ATAPI
{ {
int i; int i;
@ -1235,14 +1235,14 @@ void ide_atapi_cmd(IDEState *s)
printf("\n"); printf("\n");
} }
#endif #endif
/* /*
* If there's a UNIT_ATTENTION condition pending, only command flagged with * If there's a UNIT_ATTENTION condition pending, only command flagged with
* ALLOW_UA are allowed to complete. with other commands getting a CHECK * ALLOW_UA are allowed to complete. with other commands getting a CHECK
* condition response unless a higher priority status, defined by the drive * condition response unless a higher priority status, defined by the drive
* here, is pending. * here, is pending.
*/ */
if (s->sense_key == UNIT_ATTENTION && if (s->sense_key == UNIT_ATTENTION && !(cmd->flags & ALLOW_UA)) {
!(atapi_cmd_table[s->io_buffer[0]].flags & ALLOW_UA)) {
ide_atapi_cmd_check_status(s); ide_atapi_cmd_check_status(s);
return; return;
} }
@ -1253,7 +1253,7 @@ void ide_atapi_cmd(IDEState *s)
* GET_EVENT_STATUS_NOTIFICATION to detect such tray open/close * GET_EVENT_STATUS_NOTIFICATION to detect such tray open/close
* states rely on this behavior. * states rely on this behavior.
*/ */
if (!(atapi_cmd_table[s->io_buffer[0]].flags & ALLOW_UA) && if (!(cmd->flags & ALLOW_UA) &&
!s->tray_open && blk_is_inserted(s->blk) && s->cdrom_changed) { !s->tray_open && blk_is_inserted(s->blk) && s->cdrom_changed) {
if (s->cdrom_changed == 1) { if (s->cdrom_changed == 1) {
@ -1268,7 +1268,7 @@ void ide_atapi_cmd(IDEState *s)
} }
/* Report a Not Ready condition if appropriate for the command */ /* Report a Not Ready condition if appropriate for the command */
if ((atapi_cmd_table[s->io_buffer[0]].flags & CHECK_READY) && if ((cmd->flags & CHECK_READY) &&
(!media_present(s) || !blk_is_inserted(s->blk))) (!media_present(s) || !blk_is_inserted(s->blk)))
{ {
ide_atapi_cmd_error(s, NOT_READY, ASC_MEDIUM_NOT_PRESENT); ide_atapi_cmd_error(s, NOT_READY, ASC_MEDIUM_NOT_PRESENT);
@ -1279,7 +1279,7 @@ void ide_atapi_cmd(IDEState *s)
* If this is a data-transferring PIO command and BCL is 0, * If this is a data-transferring PIO command and BCL is 0,
* we abort at the /ATA/ level, not the ATAPI level. * we abort at the /ATA/ level, not the ATAPI level.
* See ATA8 ACS3 section 7.17.6.49 and 7.21.5 */ * See ATA8 ACS3 section 7.17.6.49 and 7.21.5 */
if (!(atapi_cmd_table[s->io_buffer[0]].flags & NONDATA)) { if (cmd->handler && !(cmd->flags & NONDATA)) {
/* TODO: Check IDENTIFY data word 125 for default BCL (currently 0) */ /* TODO: Check IDENTIFY data word 125 for default BCL (currently 0) */
if (!(atapi_byte_count_limit(s) || s->atapi_dma)) { if (!(atapi_byte_count_limit(s) || s->atapi_dma)) {
/* TODO: Move abort back into core.c and make static inline again */ /* TODO: Move abort back into core.c and make static inline again */
@ -1289,8 +1289,8 @@ void ide_atapi_cmd(IDEState *s)
} }
/* Execute the command */ /* Execute the command */
if (atapi_cmd_table[s->io_buffer[0]].handler) { if (cmd->handler) {
atapi_cmd_table[s->io_buffer[0]].handler(s, buf); cmd->handler(s, buf);
return; return;
} }