From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38499) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIiEC-0003lB-Dk for qemu-devel@nongnu.org; Mon, 11 Jan 2016 14:34:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aIiEA-0004iB-Hn for qemu-devel@nongnu.org; Mon, 11 Jan 2016 14:34:08 -0500 Received: from mx1.redhat.com ([209.132.183.28]:39863) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIiEA-0004i0-Ck for qemu-devel@nongnu.org; Mon, 11 Jan 2016 14:34:06 -0500 From: John Snow Date: Mon, 11 Jan 2016 14:33:54 -0500 Message-Id: <1452540840-23433-6-git-send-email-jsnow@redhat.com> In-Reply-To: <1452540840-23433-1-git-send-email-jsnow@redhat.com> References: <1452540840-23433-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PULL v2 05/11] libqos/ahci: ATAPI identify List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, jsnow@redhat.com We need to say "hello!" to our ATAPI friends in a slightly different manner. Signed-off-by: John Snow Message-id: 1452282920-21550-4-git-send-email-jsnow@redhat.com --- 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 4bdde4c..276a466 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