diff options
| author | John Snow <jsnow@redhat.com> | 2015-02-05 12:41:16 -0500 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2015-02-16 15:07:16 +0000 |
| commit | 85c34e9395a97e49def6697537417ead2077c096 (patch) | |
| tree | 9f4a0322d70b46d0c273d4ae542f588e206ab310 /tests/ahci-test.c | |
| parent | 6cae27a6af159ab44f7c265d7f22d9e95880db25 (diff) | |
| download | qemu-85c34e9395a97e49def6697537417ead2077c096.tar.gz | |
libqos/ahci: Add ahci_port_check_error helper
ahci_port_check_error checks a given port's error registers and asserts
that everything from the port-level view is still OK.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 1423158090-25580-6-git-send-email-jsnow@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'tests/ahci-test.c')
| -rw-r--r-- | tests/ahci-test.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/tests/ahci-test.c b/tests/ahci-test.c index fbf329e91e..a3e8f1292b 100644 --- a/tests/ahci-test.c +++ b/tests/ahci-test.c @@ -747,6 +747,7 @@ static void ahci_test_identify(AHCIQState *ahci) while (BITSET(ahci_px_rreg(ahci, i, AHCI_PX_TFD), AHCI_PX_TFD_STS_BSY)) { usleep(50); } + ahci_port_check_error(ahci, i); /* Check for expected interrupts */ reg = ahci_px_rreg(ahci, i, AHCI_PX_IS); @@ -760,13 +761,6 @@ static void ahci_test_identify(AHCIQState *ahci) AHCI_PX_IS_DHRS | AHCI_PX_IS_PSS | AHCI_PX_IS_DPS); g_assert_cmphex(ahci_px_rreg(ahci, i, AHCI_PX_IS), ==, 0); - /* Check for errors. */ - reg = ahci_px_rreg(ahci, i, AHCI_PX_SERR); - g_assert_cmphex(reg, ==, 0); - reg = ahci_px_rreg(ahci, i, AHCI_PX_TFD); - ASSERT_BIT_CLEAR(reg, AHCI_PX_TFD_STS_ERR); - ASSERT_BIT_CLEAR(reg, AHCI_PX_TFD_ERR); - /* Investigate the CMD, assert that we read 512 bytes */ ahci_get_command_header(ahci, i, cx, &cmd); g_assert_cmphex(512, ==, cmd.prdbc); |