[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 6/9] libqos/ahci: allow nondata commands for ahci_io
From: |
John Snow |
Subject: |
[Qemu-block] [PATCH 6/9] libqos/ahci: allow nondata commands for ahci_io variants |
Date: |
Mon, 9 Nov 2015 18:32:45 -0500 |
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 <address@hidden>
---
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 f18669c..2cd4809 100644
--- a/tests/ahci-test.c
+++ b/tests/ahci-test.c
@@ -1069,7 +1069,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,"
@@ -1083,19 +1082,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
- [Qemu-block] [PATCH 0/9] ahci: atapi qtests, John Snow, 2015/11/09
- [Qemu-block] [PATCH 4/9] libqos/ahci: Switch to mutable properties, John Snow, 2015/11/09
- [Qemu-block] [PATCH 6/9] libqos/ahci: allow nondata commands for ahci_io variants,
John Snow <=
- [Qemu-block] [PATCH 2/9] libqos/ahci: ATAPI support, John Snow, 2015/11/09
- [Qemu-block] [PATCH 1/9] ahci-test: fix memory leak, John Snow, 2015/11/09
- [Qemu-block] [PATCH 3/9] libqos/ahci: ATAPI identify, John Snow, 2015/11/09
- [Qemu-block] [PATCH 7/9] libqos/ahci: add ahci_exec, John Snow, 2015/11/09
- [Qemu-block] [PATCH 5/9] libqos: allow zero-size allocations, John Snow, 2015/11/09
- [Qemu-block] [PATCH 8/9] qtest/ahci: ATAPI data tests, John Snow, 2015/11/09
- [Qemu-block] [PATCH 9/9] libqos/ahci: organize header, John Snow, 2015/11/09