diff options
| -rw-r--r-- | tests/ahci-test.c | 8 | ||||
| -rw-r--r-- | tests/libqos/ahci.h | 7 |
2 files changed, 7 insertions, 8 deletions
diff --git a/tests/ahci-test.c b/tests/ahci-test.c index 90647f2a0c..d420e5f8be 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,9 +703,9 @@ 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.prdtl = cpu_to_le16(1); /* One PRD table entry. */ + cmd.flags = cpu_to_le16(5); /* reg_h2d_fis is 5 double-words long */ + cmd.flags |= cpu_to_le16(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); cmd.ctbau = 0; diff --git a/tests/libqos/ahci.h b/tests/libqos/ahci.h index 39ba94e3f4..1fddf33156 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, |