diff options
| author | John Snow <jsnow@redhat.com> | 2015-01-19 15:15:58 -0500 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2015-02-16 14:40:55 +0000 |
| commit | 7f410456652463db7312bc839d45396bf48a849e (patch) | |
| tree | c2f47ad95e3da9cf7c0e516d51218825b8712be5 | |
| parent | 8d5eeceddcb6464c7db3b4504c14766453db091e (diff) | |
| download | qemu-7f410456652463db7312bc839d45396bf48a849e.zip qemu-7f410456652463db7312bc839d45396bf48a849e.tar.gz qemu-7f410456652463db7312bc839d45396bf48a849e.tar.bz2 | |
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>
| -rw-r--r-- | tests/ahci-test.c | 14 |
1 files 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) { - /* 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 ***/ |