From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47351) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YDFlU-0004zg-LX for qemu-devel@nongnu.org; Mon, 19 Jan 2015 12:05:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YDFlQ-0005Y2-Ay for qemu-devel@nongnu.org; Mon, 19 Jan 2015 12:05:24 -0500 Received: from mail-wi0-x22e.google.com ([2a00:1450:400c:c05::22e]:33081) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YDFlQ-0005Xh-4w for qemu-devel@nongnu.org; Mon, 19 Jan 2015 12:05:20 -0500 Received: by mail-wi0-f174.google.com with SMTP id n3so653446wiv.1 for ; Mon, 19 Jan 2015 09:05:19 -0800 (PST) Sender: Paolo Bonzini Message-ID: <54BD394B.2000000@redhat.com> Date: Mon, 19 Jan 2015 18:05:15 +0100 From: Paolo Bonzini MIME-Version: 1.0 References: <1421120079-987-1-git-send-email-jsnow@redhat.com> <1421120079-987-10-git-send-email-jsnow@redhat.com> In-Reply-To: <1421120079-987-10-git-send-email-jsnow@redhat.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 09/14] qtest/ahci: remove pcibus global List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: John Snow , qemu-devel@nongnu.org Cc: kwolf@redhat.com, marc.mari.barcelo@gmail.com, armbru@redhat.com, stefanha@redhat.com, mreitz@redhat.com On 13/01/2015 04:34, John Snow wrote: > Rely on the PCI Device's bus pointer instead. > One less global to worry about. > > Signed-off-by: John Snow > --- > 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 c41c7d9..1981b6a 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 ***/ > Reviewed-by: Paolo Bonzini