diff options
| author | John Snow <jsnow@redhat.com> | 2014-11-03 18:56:18 -0500 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2014-11-14 09:20:35 +0000 |
| commit | 102e56254dbf5f789e43d7eb29023f296cb67536 (patch) | |
| tree | 4cb511e450e5bda73ed9f4a2752c36a6148cc57f /hw | |
| parent | 36ab3c3400ac941e4d9afc044be08143ff9eea62 (diff) | |
ahci: Check cmd_fis[1] more explicitly
Instead of checking for a known byte, inspect the
fields of this byte explicitly to produce more meaningful
error messages and improve the readability of this section.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 1415058979-16604-5-git-send-email-jsnow@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/ide/ahci.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 578a93b627..d6b012c88f 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -1004,17 +1004,18 @@ static int handle_cmd(AHCIState *s, int port, int slot) break; } - switch (cmd_fis[1]) { - case SATA_FIS_REG_H2D_UPDATE_COMMAND_REGISTER: - break; - case 0: - break; - default: - DPRINTF(port, "unknown command cmd_fis[0]=%02x cmd_fis[1]=%02x " - "cmd_fis[2]=%02x\n", cmd_fis[0], cmd_fis[1], - cmd_fis[2]); - goto out; - break; + if (cmd_fis[1] & 0x0F) { + DPRINTF(port, "Port Multiplier not supported." + " cmd_fis[0]=%02x cmd_fis[1]=%02x cmd_fis[2]=%02x\n", + cmd_fis[0], cmd_fis[1], cmd_fis[2]); + goto out; + } + + if (cmd_fis[1] & 0x70) { + DPRINTF(port, "Reserved flags set in H2D Register FIS." + " cmd_fis[0]=%02x cmd_fis[1]=%02x cmd_fis[2]=%02x\n", + cmd_fis[0], cmd_fis[1], cmd_fis[2]); + goto out; } if (!(cmd_fis[1] & SATA_FIS_REG_H2D_UPDATE_COMMAND_REGISTER)) { |