[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/5] ahci: Check cmd_fis[1] more explicitly
From: |
John Snow |
Subject: |
[Qemu-devel] [PATCH 4/5] ahci: Check cmd_fis[1] more explicitly |
Date: |
Mon, 3 Nov 2014 18:56:18 -0500 |
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 <address@hidden>
---
hw/ide/ahci.c | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index 3671be1..536b455 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)) {
--
1.9.3
- [Qemu-devel] [PATCH 0/5] ahci: fis decomposition improvements, John Snow, 2014/11/03
- [Qemu-devel] [PATCH 1/5] ahci: add is_ncq predicate helper, John Snow, 2014/11/03
- [Qemu-devel] [PATCH 2/5] ahci: Fix FIS decomposition, John Snow, 2014/11/03
- [Qemu-devel] [PATCH 3/5] ahci: Reorder error cases in handle_cmd, John Snow, 2014/11/03
- [Qemu-devel] [PATCH 5/5] ahci: factor out FIS decomposition from handle_cmd, John Snow, 2014/11/03
- [Qemu-devel] [PATCH 4/5] ahci: Check cmd_fis[1] more explicitly,
John Snow <=
- Re: [Qemu-devel] [PATCH 0/5] ahci: fis decomposition improvements, Paolo Bonzini, 2014/11/04
- Re: [Qemu-devel] [PATCH 0/5] ahci: fis decomposition improvements, Stefan Hajnoczi, 2014/11/13