diff options
| author | John Snow <jsnow@redhat.com> | 2015-07-04 02:06:04 -0400 |
|---|---|---|
| committer | John Snow <jsnow@redhat.com> | 2015-07-04 02:06:04 -0400 |
| commit | 359790c2542a8c4da3d4c8fb626ca2675a417d51 (patch) | |
| tree | 5d56fbf0d39eb47368ae9af0e70231fd026d4049 /tests | |
| parent | 4de484698bdda6c5e093dfbe4368cdb364fdf87f (diff) | |
| download | qemu-359790c2542a8c4da3d4c8fb626ca2675a417d51.tar.gz | |
libqos/ahci: adjust expected NCQ interrupts
NCQ commands will expect the SDBS interrupt,
and in the normative case, do not expect to see
a D2H Register FIS unless something went wrong.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 1435016308-6150-13-git-send-email-jsnow@redhat.com
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/libqos/ahci.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tests/libqos/ahci.c b/tests/libqos/ahci.c index da02e2e4c7..953a32097b 100644 --- a/tests/libqos/ahci.c +++ b/tests/libqos/ahci.c @@ -745,12 +745,15 @@ AHCICommand *ahci_command_create(uint8_t command_name) cmd->prd_size = 4096; cmd->buffer = 0xabad1dea; - cmd->interrupts = AHCI_PX_IS_DHRS; + if (!cmd->props->ncq) { + cmd->interrupts = AHCI_PX_IS_DHRS; + } /* BUG: We expect the DPS interrupt for data commands */ /* cmd->interrupts |= props->data ? AHCI_PX_IS_DPS : 0; */ /* BUG: We expect the DMA Setup interrupt for DMA commands */ /* cmd->interrupts |= props->dma ? AHCI_PX_IS_DSS : 0; */ cmd->interrupts |= props->pio ? AHCI_PX_IS_PSS : 0; + cmd->interrupts |= props->ncq ? AHCI_PX_IS_SDBS : 0; command_header_init(cmd); command_table_init(cmd); @@ -934,7 +937,9 @@ void ahci_command_verify(AHCIQState *ahci, AHCICommand *cmd) ahci_port_check_interrupts(ahci, port, cmd->interrupts); ahci_port_check_nonbusy(ahci, port, slot); ahci_port_check_cmd_sanity(ahci, cmd); - ahci_port_check_d2h_sanity(ahci, port, slot); + if (cmd->interrupts & AHCI_PX_IS_DHRS) { + ahci_port_check_d2h_sanity(ahci, port, slot); + } if (cmd->props->pio) { ahci_port_check_pio_sanity(ahci, port, slot, cmd->xbytes); } |