ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qtest/ahci: remove pcibus global 

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>
This commit is contained in:
John Snow 2015-01-19 15:15:58 -05:00 committed by Stefan Hajnoczi
parent 8d5eeceddc
commit 7f41045665
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/ahci-test.c
View File

@ -45,7 +45,6 @@
/*** Globals ***/ /*** Globals ***/
static QGuestAllocator *guest_malloc; static QGuestAllocator *guest_malloc;
static QPCIBus *pcibus;
static char tmp_path[] = "/tmp/qtest.XXXXXX"; static char tmp_path[] = "/tmp/qtest.XXXXXX";
static bool ahci_pedantic; static bool ahci_pedantic;
@ -100,6 +99,7 @@ static QPCIDevice *get_ahci_device(uint32_t *fingerprint)
{ {
QPCIDevice *ahci; QPCIDevice *ahci;
uint32_t ahci_fingerprint; uint32_t ahci_fingerprint;
QPCIBus *pcibus;
pcibus = qpci_init_pc(); pcibus = qpci_init_pc();
@ -123,15 +123,13 @@ static QPCIDevice *get_ahci_device(uint32_t *fingerprint)
return ahci; 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 */ QPCIBus *pcibus = dev ? dev->bus : NULL;
g_free(ahci);
if (pcibus) { /* libqos doesn't have a function for this, so free it manually */
qpci_free_pc(pcibus); g_free(dev);
pcibus = NULL; qpci_free_pc(pcibus);
}
} }
/*** Test Setup & Teardown ***/ /*** Test Setup & Teardown ***/