[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 10/19] qtest/ahci: add ahci_write_fis
From: |
John Snow |
Subject: |
[Qemu-devel] [PATCH v2 10/19] qtest/ahci: add ahci_write_fis |
Date: |
Tue, 3 Feb 2015 16:46:30 -0500 |
Similar to ahci_set_command_header, add a helper that takes an
in-memory representation of a command FIS and writes it to guest
memory, handling endianness as-needed.
Signed-off-by: John Snow <address@hidden>
---
tests/ahci-test.c | 2 +-
tests/libqos/ahci.c | 10 ++++++++++
tests/libqos/ahci.h | 1 +
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/tests/ahci-test.c b/tests/ahci-test.c
index 211274e..658956d 100644
--- a/tests/ahci-test.c
+++ b/tests/ahci-test.c
@@ -728,7 +728,7 @@ static void ahci_test_identify(AHCIQState *ahci)
g_assert_cmphex(ahci_px_rreg(ahci, i, AHCI_PX_IS), ==, 0);
/* Commit the Command FIS to the Command Table */
- memwrite(table, &fis, sizeof(fis));
+ ahci_write_fis(ahci, &fis, table);
/* Commit the PRD entry to the Command Table */
memwrite(table + 0x80, &prd, sizeof(prd));
diff --git a/tests/libqos/ahci.c b/tests/libqos/ahci.c
index ec72627..7336781 100644
--- a/tests/libqos/ahci.c
+++ b/tests/libqos/ahci.c
@@ -464,6 +464,16 @@ void ahci_destroy_command(AHCIQState *ahci, uint8_t px,
uint8_t cx)
ahci->port[px].prdtl[cx] = 0;
}
+void ahci_write_fis(AHCIQState *ahci, RegH2DFIS *fis, uint64_t addr)
+{
+ RegH2DFIS tmp = *fis;
+
+ /* All other FIS fields are 8 bit and do not need to be flipped. */
+ tmp.count = cpu_to_le16(tmp.count);
+
+ memwrite(addr, &tmp, sizeof(tmp));
+}
+
unsigned ahci_pick_cmd(AHCIQState *ahci, uint8_t px)
{
unsigned i;
diff --git a/tests/libqos/ahci.h b/tests/libqos/ahci.h
index 0d12582..d43210f 100644
--- a/tests/libqos/ahci.h
+++ b/tests/libqos/ahci.h
@@ -515,6 +515,7 @@ void ahci_get_command_header(AHCIQState *ahci, uint8_t px,
void ahci_set_command_header(AHCIQState *ahci, uint8_t px,
uint8_t cx, AHCICommandHeader *cmd);
void ahci_destroy_command(AHCIQState *ahci, uint8_t px, uint8_t cx);
+void ahci_write_fis(AHCIQState *ahci, RegH2DFIS *fis, uint64_t addr);
unsigned ahci_pick_cmd(AHCIQState *ahci, uint8_t px);
#endif
--
1.9.3
- [Qemu-devel] [PATCH v2 00/19] qtest/ahci: add dma test, John Snow, 2015/02/03
- [Qemu-devel] [PATCH v2 05/19] libqos/ahci: Add ahci_port_check_error helper, John Snow, 2015/02/03
- [Qemu-devel] [PATCH v2 04/19] libqos/ahci: Add command header helpers, John Snow, 2015/02/03
- [Qemu-devel] [PATCH v2 11/19] libqos/ahci: Add ide cmd properties, John Snow, 2015/02/03
- [Qemu-devel] [PATCH v2 07/19] libqos/ahci: Add port_check_nonbusy helper, John Snow, 2015/02/03
- [Qemu-devel] [PATCH v2 14/19] libqos/ahci: add ahci command size setters, John Snow, 2015/02/03