diff options
| author | John Snow <jsnow@redhat.com> | 2016-01-11 14:10:43 -0500 |
|---|---|---|
| committer | John Snow <jsnow@redhat.com> | 2016-01-11 14:10:43 -0500 |
| commit | b88641e236fbd0187858b8a974c44c2b4c450352 (patch) | |
| tree | 540d9161615985ce906ab2d05a8c0fc9f97418f1 /tests/libqos | |
| parent | d0b282a58c86ea86a2662e6f796a54a86a457dae (diff) | |
| download | qemu-b88641e236fbd0187858b8a974c44c2b4c450352.zip qemu-b88641e236fbd0187858b8a974c44c2b4c450352.tar.gz qemu-b88641e236fbd0187858b8a974c44c2b4c450352.tar.bz2 | |
libqos/ahci: Switch to mutable properties
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 <jsnow@redhat.com>
Message-id: 1452282920-21550-5-git-send-email-jsnow@redhat.com
Diffstat (limited to 'tests/libqos')
| -rw-r--r-- | tests/libqos/ahci.c | 10 |
1 files 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); } |