Rely on the PCI Device's bus pointer instead.
One less global to worry about.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id:
1421698563-6977-11-git-send-email-jsnow@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
/*** Globals ***/
static QGuestAllocator *guest_malloc;
-static QPCIBus *pcibus;
static char tmp_path[] = "/tmp/qtest.XXXXXX";
static bool ahci_pedantic;
{
QPCIDevice *ahci;
uint32_t ahci_fingerprint;
+ QPCIBus *pcibus;
pcibus = qpci_init_pc();
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) {
- qpci_free_pc(pcibus);
- pcibus = NULL;
- }
+ /* libqos doesn't have a function for this, so free it manually */
+ g_free(dev);
+ qpci_free_pc(pcibus);
}
/*** Test Setup & Teardown ***/