[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 10/15] qtest/ahci: remove pcibus global
From: |
John Snow |
Subject: |
[Qemu-devel] [PATCH v2 10/15] qtest/ahci: remove pcibus global |
Date: |
Mon, 19 Jan 2015 15:15:58 -0500 |
Rely on the PCI Device's bus pointer instead.
One less global to worry about.
Signed-off-by: John Snow <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
---
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 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)
{
+ 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 ***/
--
1.9.3
- [Qemu-devel] [PATCH v2 00/15] ahci-test preliminary refactoring, John Snow, 2015/01/19
- [Qemu-devel] [PATCH v2 01/15] libqos: Split apart pc_alloc_init, John Snow, 2015/01/19
- [Qemu-devel] [PATCH v2 06/15] libqos: Update QGuestAllocator to be opaque, John Snow, 2015/01/19
- [Qemu-devel] [PATCH v2 03/15] libqos: create libqos.c, John Snow, 2015/01/19
- [Qemu-devel] [PATCH v2 05/15] libqos: add alloc_init_flags, John Snow, 2015/01/19
- [Qemu-devel] [PATCH v2 04/15] libqos: add qtest_vboot, John Snow, 2015/01/19
- [Qemu-devel] [PATCH v2 02/15] qtest/ahci: Create ahci.h, John Snow, 2015/01/19
- [Qemu-devel] [PATCH v2 09/15] qtest/ahci: finalize AHCIQState consolidation, John Snow, 2015/01/19
- [Qemu-devel] [PATCH v2 10/15] qtest/ahci: remove pcibus global,
John Snow <=
- [Qemu-devel] [PATCH v2 07/15] libqos: add pc specific interface, John Snow, 2015/01/19
- [Qemu-devel] [PATCH v2 13/15] qtest/ahci: remove getter/setter macros, John Snow, 2015/01/19
- [Qemu-devel] [PATCH v2 08/15] qtest/ahci: Store hba_base in AHCIQState, John Snow, 2015/01/19
- [Qemu-devel] [PATCH v2 12/15] libqos/ahci: Functional register helpers, John Snow, 2015/01/19
- [Qemu-devel] [PATCH v2 11/15] qtest/ahci: remove guest_malloc global, John Snow, 2015/01/19
- [Qemu-devel] [PATCH v2 15/15] libqos/ahci: create libqos/ahci.c, John Snow, 2015/01/19
- [Qemu-devel] [PATCH v2 14/15] qtest/ahci: Bookmark FB and CLB pointers, John Snow, 2015/01/19
- Re: [Qemu-devel] [PATCH v2 00/15] ahci-test preliminary refactoring, John Snow, 2015/01/27