On 13/01/2015 04:34, John Snow wrote:
> Rely on the PCI Device's bus pointer instead.
> One less global to worry about.
>
> Signed-off-by: John Snow <js...@redhat.com>
> ---
> 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 c41c7d9..1981b6a 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 ***/
>
Reviewed-by: Paolo Bonzini <pbonz...@redhat.com>
