From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34558) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zj8DC-0002YS-Dk for qemu-devel@nongnu.org; Mon, 05 Oct 2015 12:02:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zj8D7-0002aA-Il for qemu-devel@nongnu.org; Mon, 05 Oct 2015 12:02:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42738) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zj8D7-0002Zz-EP for qemu-devel@nongnu.org; Mon, 05 Oct 2015 12:01:57 -0400 From: John Snow Date: Mon, 5 Oct 2015 12:01:52 -0400 Message-Id: <1444060914-17069-2-git-send-email-jsnow@redhat.com> In-Reply-To: <1444060914-17069-1-git-send-email-jsnow@redhat.com> References: <1444060914-17069-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PULL 1/3] qtest/ahci: fix redundant assertion List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, jsnow@redhat.com 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 Message-id: 1442868929-17777-1-git-send-email-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; -- 2.4.3