Received: from eggs.gnu.org ([2001:4830:134:3::10]:50101) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YQl2i-0006PP-JZ for qemu-devel@nongnu.org; Wed, 25 Feb 2015 18:07:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YQl2V-0002Jh-BY for qemu-devel@nongnu.org; Wed, 25 Feb 2015 18:07:00 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40594) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YQl2V-0002JV-4H for qemu-devel@nongnu.org; Wed, 25 Feb 2015 18:06:47 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t1PN6kfb004112 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Wed, 25 Feb 2015 18:06:46 -0500 From: John Snow Date: Wed, 25 Feb 2015 18:06:36 -0500 Message-Id: <1424905602-24715-3-git-send-email-jsnow@redhat.com> In-Reply-To: <1424905602-24715-1-git-send-email-jsnow@redhat.com> References: <1424905602-24715-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PATCH v2 2/8] qtest/ahci: Add a macro bootup routine List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, John Snow , armbru@redhat.com, stefanha@redhat.com 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 --- 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