From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41342) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aHhlL-0007F1-2F for qemu-devel@nongnu.org; Fri, 08 Jan 2016 19:52:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aHhlK-0005ld-0e for qemu-devel@nongnu.org; Fri, 08 Jan 2016 19:52:10 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46211) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aHhlJ-0005lY-RR for qemu-devel@nongnu.org; Fri, 08 Jan 2016 19:52:09 -0500 From: John Snow Date: Fri, 8 Jan 2016 19:51:55 -0500 Message-Id: <1452300718-10660-9-git-send-email-jsnow@redhat.com> In-Reply-To: <1452300718-10660-1-git-send-email-jsnow@redhat.com> References: <1452300718-10660-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PULL 08/11] libqos/ahci: allow nondata commands for ahci_io variants 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 These variants try to set a data offset, even if you don't specify one. In the cases where the offset is zero and it's a nondata command, just ignore the instruction. Signed-off-by: John Snow Message-id: 1452282920-21550-7-git-send-email-jsnow@redhat.com --- tests/ahci-test.c | 14 ++------------ tests/libqos/ahci.c | 3 +++ 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/tests/ahci-test.c b/tests/ahci-test.c index 8c48587..2bee2a2 100644 --- a/tests/ahci-test.c +++ b/tests/ahci-test.c @@ -1080,7 +1080,6 @@ static void test_flush_retry(void) AHCIQState *ahci; AHCICommand *cmd; uint8_t port; - const char *s; prepare_blkdebug_script(debug_path, "flush_to_disk"); ahci = ahci_boot_and_enable("-drive file=blkdebug:%s:%s,if=none,id=drive0," @@ -1094,19 +1093,10 @@ static void test_flush_retry(void) /* Issue Flush Command and wait for error */ port = ahci_port_select(ahci); ahci_port_clear(ahci, port); - cmd = ahci_command_create(CMD_FLUSH_CACHE); - ahci_command_commit(ahci, cmd, port); - ahci_command_issue_async(ahci, cmd); - qmp_eventwait("STOP"); - /* Complete the command */ - s = "{'execute':'cont' }"; - qmp_async(s); - qmp_eventwait("RESUME"); - ahci_command_wait(ahci, cmd); - ahci_command_verify(ahci, cmd); + cmd = ahci_guest_io_halt(ahci, port, CMD_FLUSH_CACHE, 0, 0, 0); + ahci_guest_io_resume(ahci, cmd); - ahci_command_free(cmd); ahci_shutdown(ahci); } diff --git a/tests/libqos/ahci.c b/tests/libqos/ahci.c index df29560..0fa9bf2 100644 --- a/tests/libqos/ahci.c +++ b/tests/libqos/ahci.c @@ -844,6 +844,9 @@ void ahci_command_set_offset(AHCICommand *cmd, uint64_t lba_sect) if (cmd->props->atapi) { ahci_atapi_command_set_offset(cmd, lba_sect); return; + } else if (!cmd->props->data && !lba_sect) { + /* Not meaningful, ignore. */ + return; } else if (cmd->props->lba28) { g_assert_cmphex(lba_sect, <=, 0xFFFFFFF); } else if (cmd->props->lba48 || cmd->props->ncq) { -- 2.4.3