Commit 7f410456 authored by John Snow's avatar John Snow Committed by Stefan Hajnoczi
Browse files

qtest/ahci: remove pcibus global 



Rely on the PCI Device's bus pointer instead.
One less global to worry about.

Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-id: 1421698563-6977-11-git-send-email-jsnow@redhat.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 8d5eeced

tests/ahci-test.c

+6 −8
Original line number Diff line number Diff line
@@ -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)

{

    /* libqos doesn't have a function for this, so free it manually */

    g_free(ahci);

    QPCIBus *pcibus = dev ? dev->bus : NULL;



    if (pcibus) {

    /* libqos doesn't have a function for this, so free it manually */

    g_free(dev);

    qpci_free_pc(pcibus);

        pcibus = NULL;

    }

}



/*** Test Setup & Teardown ***/