[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 03/19] qtest/ahci: rename 'Command' to 'CommandHeade
From: |
John Snow |
Subject: |
[Qemu-devel] [PATCH 03/19] qtest/ahci: rename 'Command' to 'CommandHeader' |
Date: |
Fri, 30 Jan 2015 13:41:57 -0500 |
The structure name is a bit of a misnomer; the structure currently named
command is actually the commandheader. A future patch in this series
will add an actual "Command" structure, so we'll rename it now before the
rest of the functions in this series try to use it.
In addition, rename the "b1" and "b2" fields
to be a unified uint16_t named "flags."
Signed-off-by: John Snow <address@hidden>
---
tests/ahci-test.c | 6 +++---
tests/libqos/ahci.h | 7 +++----
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/tests/ahci-test.c b/tests/ahci-test.c
index 90647f2..85e5761 100644
--- a/tests/ahci-test.c
+++ b/tests/ahci-test.c
@@ -660,7 +660,7 @@ static void ahci_test_identify(AHCIQState *ahci)
RegD2HFIS *d2h = g_malloc0(0x20);
RegD2HFIS *pio = g_malloc0(0x20);
RegH2DFIS fis;
- AHCICommand cmd;
+ AHCICommandHeader cmd;
PRD prd;
uint32_t reg, table, data_ptr;
uint16_t buff[256];
@@ -703,8 +703,8 @@ static void ahci_test_identify(AHCIQState *ahci)
/* Copy the existing Command #0 structure from the CLB into local memory,
* and build a new command #0. */
memread(ahci->port[i].clb, &cmd, sizeof(cmd));
- cmd.b1 = 5; /* reg_h2d_fis is 5 double-words long */
- cmd.b2 = 0x04; /* clear PxTFD.STS.BSY when done */
+ cmd.flags = 5; /* reg_h2d_fis is 5 double-words long */
+ cmd.flags |= 0x400; /* clear PxTFD.STS.BSY when done */
cmd.prdtl = cpu_to_le16(1); /* One PRD table entry. */
cmd.prdbc = 0;
cmd.ctba = cpu_to_le32(table);
diff --git a/tests/libqos/ahci.h b/tests/libqos/ahci.h
index 49ddee5..e3ada6e 100644
--- a/tests/libqos/ahci.h
+++ b/tests/libqos/ahci.h
@@ -329,15 +329,14 @@ typedef struct RegH2DFIS {
* Command List entry structure.
* The command list contains between 1-32 of these structures.
*/
-typedef struct AHCICommand {
- uint8_t b1;
- uint8_t b2;
+typedef struct AHCICommandHeader {
+ uint16_t flags; /* Cmd-Fis-Len, PMP#, and flags. */
uint16_t prdtl; /* Phys Region Desc. Table Length */
uint32_t prdbc; /* Phys Region Desc. Byte Count */
uint32_t ctba; /* Command Table Descriptor Base Address */
uint32_t ctbau; /* '' Upper */
uint32_t res[4];
-} __attribute__((__packed__)) AHCICommand;
+} __attribute__((__packed__)) AHCICommandHeader;
/**
* Physical Region Descriptor; pointed to by the Command List Header,
--
1.9.3
- [Qemu-devel] [PATCH 00/19] qtest/ahci: add dma test, John Snow, 2015/01/30
- [Qemu-devel] [PATCH 01/19] libqos/ahci: Add ahci_port_select helper, John Snow, 2015/01/30
- [Qemu-devel] [PATCH 06/19] libqos/ahci: Add ahci_port_check_interrupts helper, John Snow, 2015/01/30
- [Qemu-devel] [PATCH 07/19] libqos/ahci: Add port_check_nonbusy helper, John Snow, 2015/01/30
- [Qemu-devel] [PATCH 03/19] qtest/ahci: rename 'Command' to 'CommandHeader',
John Snow <=
- [Qemu-devel] [PATCH 02/19] libqos/ahci: Add ahci_port_clear helper, John Snow, 2015/01/30
- [Qemu-devel] [PATCH 05/19] libqos/ahci: Add ahci_port_check_error helper, John Snow, 2015/01/30
- [Qemu-devel] [PATCH 04/19] libqos/ahci: Add command header helpers, John Snow, 2015/01/30
- [Qemu-devel] [PATCH 09/19] qtest/ahci: Demagic ahci tests., John Snow, 2015/01/30
- [Qemu-devel] [PATCH 13/19] libqos/ahci: add ahci command size setters, John Snow, 2015/01/30
- [Qemu-devel] [PATCH 08/19] libqos/ahci: Add cmd response sanity check helpers, John Snow, 2015/01/30
- [Qemu-devel] [PATCH 10/19] libqos/ahci: Add ide cmd properties, John Snow, 2015/01/30
- [Qemu-devel] [PATCH 14/19] libqos/ahci: Add ahci_guest_io, John Snow, 2015/01/30
- [Qemu-devel] [PATCH 11/19] libqos/ahci: add ahci command functions, John Snow, 2015/01/30
- [Qemu-devel] [PATCH 17/19] qtest/ahci: Add a macro bootup routine, John Snow, 2015/01/30