From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38509) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIiEC-0003lE-NG 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 1aIiEB-0004iQ-3O for qemu-devel@nongnu.org; Mon, 11 Jan 2016 14:34:08 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48431) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIiEA-0004iF-UT for qemu-devel@nongnu.org; Mon, 11 Jan 2016 14:34:07 -0500 From: John Snow Date: Mon, 11 Jan 2016 14:33:55 -0500 Message-Id: <1452540840-23433-7-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 06/11] libqos/ahci: Switch to mutable properties 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 ATAPI commands are, unfortunately, weird in that they can be either DMA or PIO depending on a header bit. In order to accommodate them, I'll need to make AHCI command properties mutable so we can toggle between which "flavor" of ATAPI command we want to test. The default ATAPI transfer mechanism is PIO and the default properties are adjusted accordingly. Signed-off-by: John Snow Message-id: 1452282920-21550-5-git-send-email-jsnow@redhat.com --- tests/libqos/ahci.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/libqos/ahci.c b/tests/libqos/ahci.c index 276a466..96a05a8 100644 --- a/tests/libqos/ahci.c +++ b/tests/libqos/ahci.c @@ -76,7 +76,7 @@ AHCICommandProp ahci_command_properties[] = { { .cmd = CMD_READ_MAX_EXT, .lba48 = true }, { .cmd = CMD_FLUSH_CACHE, .data = false }, { .cmd = CMD_PACKET, .data = true, .size = 16, - .atapi = true, }, + .atapi = true, .pio = true }, { .cmd = CMD_PACKET_ID, .data = true, .pio = true, .size = 512, .read = true } }; @@ -745,6 +745,11 @@ void ahci_command_enable_atapi_dma(AHCICommand *cmd) RegH2DFIS *fis = &(cmd->fis); g_assert(cmd->props->atapi); fis->feature_low |= 0x01; + cmd->interrupts &= ~AHCI_PX_IS_PSS; + cmd->props->dma = true; + cmd->props->pio = false; + /* BUG: We expect the DMA Setup interrupt for DMA commands */ + /* cmd->interrupts |= AHCI_PX_IS_DSS; */ } AHCICommand *ahci_command_create(uint8_t command_name) @@ -761,7 +766,7 @@ AHCICommand *ahci_command_create(uint8_t command_name) g_assert(!props->ncq || props->lba48); /* Defaults and book-keeping */ - cmd->props = props; + cmd->props = g_memdup(props, sizeof(AHCICommandProp)); cmd->name = command_name; cmd->xbytes = props->size; cmd->prd_size = 4096; @@ -799,6 +804,7 @@ AHCICommand *ahci_atapi_command_create(uint8_t scsi_cmd) void ahci_command_free(AHCICommand *cmd) { g_free(cmd->atapi_cmd); + g_free(cmd->props); g_free(cmd); } -- 2.4.3