aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Snow <jsnow@redhat.com>2015-02-25 18:06:36 -0500
committerKevin Wolf <kwolf@redhat.com>2015-03-10 14:02:23 +0100
commitd63b4017c2dff9cf0f15d06d5f604a97a30ef4c5 (patch)
tree5c427d02553ca85b8363a31304b2bdaab68e2294
parent4a42f6d408079830099dbffc1b0cb2869db69215 (diff)
downloadqemu-d63b4017c2dff9cf0f15d06d5f604a97a30ef4c5.zip
qemu-d63b4017c2dff9cf0f15d06d5f604a97a30ef4c5.tar.gz
qemu-d63b4017c2dff9cf0f15d06d5f604a97a30ef4c5.tar.bz2
qtest/ahci: Add a macro bootup routine
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 <jsnow@redhat.com> Message-id: 1424905602-24715-3-git-send-email-jsnow@redhat.com Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rw-r--r--tests/ahci-test.c23
1 files 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);
}