From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59151) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YDIkL-0001DC-Rv for qemu-devel@nongnu.org; Mon, 19 Jan 2015 15:16:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YDIkF-0006m0-MT for qemu-devel@nongnu.org; Mon, 19 Jan 2015 15:16:25 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43105) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YDIkF-0006lq-Fl for qemu-devel@nongnu.org; Mon, 19 Jan 2015 15:16:19 -0500 From: John Snow Date: Mon, 19 Jan 2015 15:15:58 -0500 Message-Id: <1421698563-6977-11-git-send-email-jsnow@redhat.com> In-Reply-To: <1421698563-6977-1-git-send-email-jsnow@redhat.com> References: <1421698563-6977-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PATCH v2 10/15] qtest/ahci: remove pcibus global List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, marc.mari.barcelo@gmail.com, armbru@redhat.com, mreitz@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, jsnow@redhat.com Rely on the PCI Device's bus pointer instead. One less global to worry about. Signed-off-by: John Snow Reviewed-by: Paolo Bonzini --- tests/ahci-test.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/tests/ahci-test.c b/tests/ahci-test.c index 96fb45c..0cc56ab 100644 --- a/tests/ahci-test.c +++ b/tests/ahci-test.c @@ -45,7 +45,6 @@ /*** Globals ***/ static QGuestAllocator *guest_malloc; -static QPCIBus *pcibus; static char tmp_path[] = "/tmp/qtest.XXXXXX"; static bool ahci_pedantic; @@ -100,6 +99,7 @@ static QPCIDevice *get_ahci_device(uint32_t *fingerprint) { QPCIDevice *ahci; uint32_t ahci_fingerprint; + QPCIBus *pcibus; pcibus = qpci_init_pc(); @@ -123,15 +123,13 @@ static QPCIDevice *get_ahci_device(uint32_t *fingerprint) return ahci; } -static void free_ahci_device(QPCIDevice *ahci) +static void free_ahci_device(QPCIDevice *dev) { + QPCIBus *pcibus = dev ? dev->bus : NULL; + /* libqos doesn't have a function for this, so free it manually */ - g_free(ahci); - - if (pcibus) { - qpci_free_pc(pcibus); - pcibus = NULL; - } + g_free(dev); + qpci_free_pc(pcibus); } /*** Test Setup & Teardown ***/ -- 1.9.3