Re: [Qemu-trivial] [Qemu-devel] [PATCH] qtest/ahci: fix redundant assertion

[John Snow <jsnow@redhat.com>]

On 09/21/2015 04:55 PM, John Snow wrote:
> Fixes https://bugs.launchpad.net/qemu/+bug/1497711
> 
> (!ncq || (ncq && lba48)) is the same as
> (!ncq || lba48).
> 
> The intention is simply: "If a command is NCQ,
> it must also be LBA48."
> 
> Signed-off-by: John Snow <jsnow@redhat.com>
> ---
>  tests/libqos/ahci.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/libqos/ahci.c b/tests/libqos/ahci.c
> index cf66b3e..adb2665 100644
> --- a/tests/libqos/ahci.c
> +++ b/tests/libqos/ahci.c
> @@ -742,7 +742,7 @@ AHCICommand *ahci_command_create(uint8_t command_name)
>      g_assert(!(props->lba28 && props->lba48));
>      g_assert(!(props->read && props->write));
>      g_assert(!props->size || props->data);
> -    g_assert(!props->ncq || (props->ncq && props->lba48));
> +    g_assert(!props->ncq || props->lba48);
>  
>      /* Defaults and book-keeping */
>      cmd->props = props;
> 

Tentatively staged. Barring objections, I will send a pull request for
this tomorrow, thanks.

https://github.com/jnsnow/qemu/commits/ide
https://github.com/jnsnow/qemu.git

--js