Re: [Qemu-devel] [RFC 08/10] ahci: Check cmd_fis[1] more explicitly

[Paolo Bonzini]

Il 13/09/2014 06:34, John Snow ha scritto:
> 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 1153ce9..e4eae0c 100644
> --- a/hw/ide/ahci.c
> +++ b/hw/ide/ahci.c
> @@ -993,17 +993,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)) {
> 

Reviewed-by: Paolo Bonzini <address@hidden>