[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 3/9] libqos/ahci: ATAPI identify
From: |
John Snow |
Subject: |
[Qemu-devel] [PATCH v2 3/9] libqos/ahci: ATAPI identify |
Date: |
Fri, 8 Jan 2016 14:55:14 -0500 |
We need to say "hello!" to our ATAPI friends
in a slightly different manner.
Signed-off-by: John Snow <address@hidden>
---
tests/ahci-test.c | 8 +++++++-
tests/libqos/ahci.c | 5 +++++
tests/libqos/ahci.h | 1 +
3 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/tests/ahci-test.c b/tests/ahci-test.c
index f4945dc..8ebbd33 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 59bf893..81edf34 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 9ffd415..705fbd6 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
--
2.4.3
- [Qemu-devel] [PATCH v2 0/9] ahci: atapi qtests, John Snow, 2016/01/08
- [Qemu-devel] [PATCH v2 1/9] ahci-test: fix memory leak, John Snow, 2016/01/08
- [Qemu-devel] [PATCH v2 3/9] libqos/ahci: ATAPI identify,
John Snow <=
- [Qemu-devel] [PATCH v2 4/9] libqos/ahci: Switch to mutable properties, John Snow, 2016/01/08
- [Qemu-devel] [PATCH v2 2/9] libqos/ahci: ATAPI support, John Snow, 2016/01/08
- [Qemu-devel] [PATCH v2 8/9] qtest/ahci: ATAPI data tests, John Snow, 2016/01/08
- [Qemu-devel] [PATCH v2 7/9] libqos/ahci: add ahci_exec, John Snow, 2016/01/08
- [Qemu-devel] [PATCH v2 6/9] libqos/ahci: allow nondata commands for ahci_io variants, John Snow, 2016/01/08
- [Qemu-devel] [PATCH v2 5/9] libqos: allow zero-size allocations, John Snow, 2016/01/08
- [Qemu-devel] [PATCH v2 9/9] libqos/ahci: organize header, John Snow, 2016/01/08
- Re: [Qemu-devel] [PATCH v2 0/9] ahci: atapi qtests, John Snow, 2016/01/08