From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50226) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHGWZ-0008Lx-7c for qemu-devel@nongnu.org; Fri, 30 Jan 2015 13:42:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YHGWY-0000HA-8D for qemu-devel@nongnu.org; Fri, 30 Jan 2015 13:42:35 -0500 Received: from mx1.redhat.com ([209.132.183.28]:34769) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHGWX-0000F7-Nd for qemu-devel@nongnu.org; Fri, 30 Jan 2015 13:42:33 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t0UIgXO2026639 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Fri, 30 Jan 2015 13:42:33 -0500 From: John Snow Date: Fri, 30 Jan 2015 13:42:11 -0500 Message-Id: <1422643333-27926-18-git-send-email-jsnow@redhat.com> In-Reply-To: <1422643333-27926-1-git-send-email-jsnow@redhat.com> References: <1422643333-27926-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PATCH 17/19] 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: famz@redhat.com, mst@redhat.com, armbru@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, John Snow 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 | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/tests/ahci-test.c b/tests/ahci-test.c index 3a0131a..9207e73 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_macro_bootup(void) +{ + AHCIQState *ahci; + ahci = ahci_boot(); + + ahci_pci_enable(ahci); + ahci_hba_enable(ahci); + + return ahci; +} + /*** Specification Adherence Tests ***/ /** @@ -787,9 +802,7 @@ static void test_identify(void) { AHCIQState *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