[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 06/11] libqos/ahci: Switch to mutable properties
From: |
John Snow |
Subject: |
[Qemu-devel] [PULL v2 06/11] libqos/ahci: Switch to mutable properties |
Date: |
Mon, 11 Jan 2016 14:33:55 -0500 |
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 <address@hidden>
Message-id: address@hidden
---
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
- [Qemu-devel] [PULL v2 00/11] Ide patches, John Snow, 2016/01/11
- [Qemu-devel] [PULL v2 01/11] macio: fix overflow in lba to offset conversion for ATAPI devices, John Snow, 2016/01/11
- [Qemu-devel] [PULL v2 06/11] libqos/ahci: Switch to mutable properties,
John Snow <=
- [Qemu-devel] [PULL v2 05/11] libqos/ahci: ATAPI identify, John Snow, 2016/01/11
- [Qemu-devel] [PULL v2 07/11] libqos: allow zero-size allocations, John Snow, 2016/01/11
- [Qemu-devel] [PULL v2 10/11] qtest/ahci: ATAPI data tests, John Snow, 2016/01/11
- [Qemu-devel] [PULL v2 03/11] ahci-test: fix memory leak, John Snow, 2016/01/11
- [Qemu-devel] [PULL v2 02/11] ide: ahci: reset ncq object to unused on error, John Snow, 2016/01/11
- [Qemu-devel] [PULL v2 04/11] libqos/ahci: ATAPI support, John Snow, 2016/01/11
- [Qemu-devel] [PULL v2 08/11] libqos/ahci: allow nondata commands for ahci_io variants, John Snow, 2016/01/11
- [Qemu-devel] [PULL v2 11/11] libqos/ahci: organize header, John Snow, 2016/01/11
- [Qemu-devel] [PULL v2 09/11] libqos/ahci: add ahci_exec, John Snow, 2016/01/11
- Re: [Qemu-devel] [PULL v2 00/11] Ide patches, Peter Maydell, 2016/01/12