OSDN Git Service

qtest/ahci: fix redundant assertion
authorJohn Snow <jsnow@redhat.com>
Mon, 5 Oct 2015 16:00:55 +0000 (12:00 -0400)
committerJohn Snow <jsnow@redhat.com>
Mon, 5 Oct 2015 16:00:55 +0000 (12:00 -0400)
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>
Message-id: 1442868929-17777-1-git-send-email-jsnow@redhat.com

tests/libqos/ahci.c

index cf66b3e..adb2665 100644 (file)
@@ -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;