[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/8] qtest/ahci: Add a macro bootup routine
From: |
John Snow |
Subject: |
[Qemu-devel] [PATCH 2/8] qtest/ahci: Add a macro bootup routine |
Date: |
Thu, 19 Feb 2015 17:29:57 -0500 |
Add a routine that can be used to engage the AHCI
device at a not-granular level so that bringing up
the functionality of the HBA is easy in future tests
that are not concerned with testing the bring-up process.
Signed-off-by: John Snow <address@hidden>
---
tests/ahci-test.c | 23 +++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
diff --git a/tests/ahci-test.c b/tests/ahci-test.c
index 53fd068..9fe9fb5 100644
--- a/tests/ahci-test.c
+++ b/tests/ahci-test.c
@@ -107,6 +107,21 @@ static void ahci_shutdown(AHCIQState *ahci)
qtest_shutdown(qs);
}
+/**
+ * Boot and fully enable the HBA device.
+ * @see ahci_boot, ahci_pci_enable and ahci_hba_enable.
+ */
+static AHCIQState *ahci_boot_and_enable(void)
+{
+ AHCIQState *ahci;
+ ahci = ahci_boot();
+
+ ahci_pci_enable(ahci);
+ ahci_hba_enable(ahci);
+
+ return ahci;
+}
+
/*** Specification Adherence Tests ***/
/**
@@ -831,9 +846,7 @@ static void test_identify(void)
{
AHCIQState *ahci;
- ahci = ahci_boot();
- ahci_pci_enable(ahci);
- ahci_hba_enable(ahci);
+ ahci = ahci_boot_and_enable();
ahci_test_identify(ahci);
ahci_shutdown(ahci);
}
@@ -845,9 +858,7 @@ static void test_dma_rw_simple(void)
{
AHCIQState *ahci;
- ahci = ahci_boot();
- ahci_pci_enable(ahci);
- ahci_hba_enable(ahci);
+ ahci = ahci_boot_and_enable();
ahci_test_dma_rw_simple(ahci);
ahci_shutdown(ahci);
}
--
1.9.3
- [Qemu-devel] [PATCH 0/8] ahci: add more IO tests, John Snow, 2015/02/19
- [Qemu-devel] [PATCH 8/8] qtest/ahci: test different disk sectors, John Snow, 2015/02/19
- [Qemu-devel] [PATCH 6/8] qtest/ahci: add fragmented dma test, John Snow, 2015/02/19
- [Qemu-devel] [PATCH 5/8] qtest/ahci: Add PIO and LBA48 tests, John Snow, 2015/02/19
- [Qemu-devel] [PATCH 4/8] qtest/ahci: Add DMA test variants, John Snow, 2015/02/19
- [Qemu-devel] [PATCH 1/8] libqos/ahci: Zero-fill AHCI headers, John Snow, 2015/02/19