[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 6/9] libqos/ahci: Support expected errors
From: |
John Snow |
Subject: |
[Qemu-devel] [PULL 6/9] libqos/ahci: Support expected errors |
Date: |
Fri, 11 Nov 2016 13:49:52 -0500 |
Sometimes we know we'll get back an error, so let's have the
test framework understand that.
Signed-off-by: John Snow <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>
---
tests/libqos/ahci.c | 16 ++++++++++++----
tests/libqos/ahci.h | 3 ++-
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/tests/libqos/ahci.c b/tests/libqos/ahci.c
index 15fa888..77f9bed 100644
--- a/tests/libqos/ahci.c
+++ b/tests/libqos/ahci.c
@@ -86,6 +86,7 @@ struct AHCICommand {
uint8_t name;
uint8_t port;
uint8_t slot;
+ uint8_t errors;
uint32_t interrupts;
uint64_t xbytes;
uint32_t prd_size;
@@ -402,12 +403,14 @@ void ahci_port_clear(AHCIQState *ahci, uint8_t port)
/**
* Check a port for errors.
*/
-void ahci_port_check_error(AHCIQState *ahci, uint8_t port)
+void ahci_port_check_error(AHCIQState *ahci, uint8_t port,
+ uint32_t imask, uint8_t emask)
{
uint32_t reg;
/* The upper 9 bits of the IS register all indicate errors. */
reg = ahci_px_rreg(ahci, port, AHCI_PX_IS);
+ reg &= ~imask;
reg >>= 23;
g_assert_cmphex(reg, ==, 0);
@@ -417,8 +420,13 @@ void ahci_port_check_error(AHCIQState *ahci, uint8_t port)
/* The TFD also has two error sections. */
reg = ahci_px_rreg(ahci, port, AHCI_PX_TFD);
- ASSERT_BIT_CLEAR(reg, AHCI_PX_TFD_STS_ERR);
- ASSERT_BIT_CLEAR(reg, AHCI_PX_TFD_ERR);
+ if (!emask) {
+ ASSERT_BIT_CLEAR(reg, AHCI_PX_TFD_STS_ERR);
+ } else {
+ ASSERT_BIT_SET(reg, AHCI_PX_TFD_STS_ERR);
+ }
+ ASSERT_BIT_CLEAR(reg, AHCI_PX_TFD_ERR & (~emask << 8));
+ ASSERT_BIT_SET(reg, AHCI_PX_TFD_ERR & (emask << 8));
}
void ahci_port_check_interrupts(AHCIQState *ahci, uint8_t port,
@@ -1118,7 +1126,7 @@ void ahci_command_verify(AHCIQState *ahci, AHCICommand
*cmd)
uint8_t slot = cmd->slot;
uint8_t port = cmd->port;
- ahci_port_check_error(ahci, port);
+ ahci_port_check_error(ahci, port, cmd->interrupts, cmd->errors);
ahci_port_check_interrupts(ahci, port, cmd->interrupts);
ahci_port_check_nonbusy(ahci, port, slot);
ahci_port_check_cmd_sanity(ahci, cmd);
diff --git a/tests/libqos/ahci.h b/tests/libqos/ahci.h
index f144fab..bbe04f8 100644
--- a/tests/libqos/ahci.h
+++ b/tests/libqos/ahci.h
@@ -576,7 +576,8 @@ void ahci_set_command_header(AHCIQState *ahci, uint8_t port,
void ahci_destroy_command(AHCIQState *ahci, uint8_t port, uint8_t slot);
/* AHCI sanity check routines */
-void ahci_port_check_error(AHCIQState *ahci, uint8_t port);
+void ahci_port_check_error(AHCIQState *ahci, uint8_t port,
+ uint32_t imask, uint8_t emask);
void ahci_port_check_interrupts(AHCIQState *ahci, uint8_t port,
uint32_t intr_mask);
void ahci_port_check_nonbusy(AHCIQState *ahci, uint8_t port, uint8_t slot);
--
2.7.4
- [Qemu-devel] [PULL 0/9] Ide patches, John Snow, 2016/11/11
- [Qemu-devel] [PULL 4/9] block-backend: Always notify on blk_eject, John Snow, 2016/11/11
- [Qemu-devel] [PULL 1/9] atapi: classify read_cd as conditionally returning data, John Snow, 2016/11/11
- [Qemu-devel] [PULL 6/9] libqos/ahci: Support expected errors,
John Snow <=
- [Qemu-devel] [PULL 2/9] ahci-test: Create smaller test ISO images, John Snow, 2016/11/11
- [Qemu-devel] [PULL 3/9] ahci-test: test atapi read_cd with bcl, nb_sectors = 0, John Snow, 2016/11/11
- [Qemu-devel] [PULL 7/9] libqos/ahci: Add ATAPI tray macros, John Snow, 2016/11/11
- [Qemu-devel] [PULL 8/9] libqos/ahci: Add get_sense and test_ready, John Snow, 2016/11/11
- [Qemu-devel] [PULL 5/9] libqtest: add qmp_eventwait_ref, John Snow, 2016/11/11
- [Qemu-devel] [PULL 9/9] ahci-test: add QMP tray test for ATAPI, John Snow, 2016/11/11
- Re: [Qemu-devel] [PULL 0/9] Ide patches, no-reply, 2016/11/12