diff options
| -rw-r--r-- | tests/ahci-test.c | 8 | ||||
| -rw-r--r-- | tests/libqos/ahci.c | 5 | ||||
| -rw-r--r-- | tests/libqos/ahci.h | 1 |
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 |