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 <js...@redhat.com> --- tests/ahci-test.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/tests/ahci-test.c b/tests/ahci-test.c index 3f92618..63fc309 100644 --- a/tests/ahci-test.c +++ b/tests/ahci-test.c @@ -739,6 +739,21 @@ static void ahci_hba_enable(AHCIState *ahci) * and clear the initial interrupts might be good. */ } +/** + * Boot and fully enable the HBA device. + * @see ahci_boot, ahci_pci_enable and ahci_hba_enable. + */ +static AHCIState *ahci_macro_bootup(void) +{ + AHCIState *ahci; + ahci = ahci_boot(); + + ahci_pci_enable(ahci); + ahci_hba_enable(ahci); + + return ahci; +} + /*** Specification Adherence Tests ***/ /** @@ -1773,9 +1788,7 @@ static void test_identify(void) { AHCIState *ahci; - ahci = ahci_boot(); - ahci_pci_enable(ahci); - ahci_hba_enable(ahci); + ahci = ahci_macro_bootup(); ahci_test_identify(ahci); ahci_shutdown(ahci); } -- 1.9.3