aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Snow <jsnow@redhat.com>2016-01-11 14:10:42 -0500
committerJohn Snow <jsnow@redhat.com>2016-01-11 14:10:42 -0500
commitd0b282a58c86ea86a2662e6f796a54a86a457dae (patch)
tree1155c5b847e5db016a39861f360ef502c7214862
parent54d268b26ace741f2acab2b8fee0eb325da66b2c (diff)
downloadqemu-arm-d0b282a58c86ea86a2662e6f796a54a86a457dae.tar.gz
libqos/ahci: ATAPI identify
We need to say "hello!" to our ATAPI friends in a slightly different manner. Signed-off-by: John Snow <jsnow@redhat.com> Message-id: 1452282920-21550-4-git-send-email-jsnow@redhat.com
-rw-r--r--tests/ahci-test.c8
-rw-r--r--tests/libqos/ahci.c5
-rw-r--r--tests/libqos/ahci.h1
3 files changed, 13 insertions, 1 deletions
diff --git a/tests/ahci-test.c b/tests/ahci-test.c
index f4945dc70b..8ebbd33349 100644
--- a/tests/ahci-test.c
+++ b/tests/ahci-test.c
@@ -215,6 +215,7 @@ static AHCIQState *ahci_boot_and_enable(const char *cli, ...)
va_list ap;
uint16_t buff[256];
uint8_t port;
+ uint8_t hello;
if (cli) {
va_start(ap, cli);
@@ -229,7 +230,12 @@ static AHCIQState *ahci_boot_and_enable(const char *cli, ...)
/* Initialize test device */
port = ahci_port_select(ahci);
ahci_port_clear(ahci, port);
- ahci_io(ahci, port, CMD_IDENTIFY, &buff, sizeof(buff), 0);
+ if (is_atapi(ahci, port)) {
+ hello = CMD_PACKET_ID;
+ } else {
+ hello = CMD_IDENTIFY;
+ }
+ ahci_io(ahci, port, hello, &buff, sizeof(buff), 0);
return ahci;
}
diff --git a/tests/libqos/ahci.c b/tests/libqos/ahci.c
index 4bdde4c1a7..276a466d83 100644
--- a/tests/libqos/ahci.c
+++ b/tests/libqos/ahci.c
@@ -114,6 +114,11 @@ void ahci_free(AHCIQState *ahci, uint64_t addr)
qfree(ahci->parent, addr);
}
+bool is_atapi(AHCIQState *ahci, uint8_t port)
+{
+ return ahci_px_rreg(ahci, port, AHCI_PX_SIG) == AHCI_SIGNATURE_CDROM;
+}
+
/**
* Locate, verify, and return a handle to the AHCI device.
*/
diff --git a/tests/libqos/ahci.h b/tests/libqos/ahci.h
index 9ffd415f48..705fbd6748 100644
--- a/tests/libqos/ahci.h
+++ b/tests/libqos/ahci.h
@@ -596,5 +596,6 @@ void ahci_command_adjust(AHCICommand *cmd, uint64_t lba_sect, uint64_t gbuffer,
/* Command Misc */
uint8_t ahci_command_slot(AHCICommand *cmd);
+bool is_atapi(AHCIQState *ahci, uint8_t port);
#endif