Commit 80e1eea3 authored by Marc-André Lureau's avatar Marc-André Lureau
Browse files

tests: fix virtio-blk-test leaks 



Use qvirtio_pci_device_find_slot() to avoid leaking the non-hp
device. Add assert() to avoid further leaks in the future.

Use qvirtio_pci_device_free() to correctly free QVirtioPCIDevice.

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
parent c4523aae

tests/libqos/virtio-pci.c

+2 −1
Original line number Diff line number Diff line
@@ -61,13 +61,14 @@ static void qvirtio_pci_foreach_callback( 
        (!d->has_slot || vpcidev->pdev->devfn == d->slot << 3)) {

        d->func(&vpcidev->vdev, d->user_data);

    } else {

        g_free(vpcidev);

        qvirtio_pci_device_free(vpcidev);

    }

}



static void qvirtio_pci_assign_device(QVirtioDevice *d, void *data)

{

    QVirtioPCIDevice **vpcidev = data;

    assert(!*vpcidev);

    *vpcidev = (QVirtioPCIDevice *)d;

}

tests/virtio-blk-test.c

+7 −7
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ static QVirtioPCIDevice *virtio_blk_pci_init(QPCIBus *bus, int slot) 
{

    QVirtioPCIDevice *dev;



    dev = qvirtio_pci_device_find(bus, VIRTIO_ID_BLOCK);

    dev = qvirtio_pci_device_find_slot(bus, VIRTIO_ID_BLOCK, slot);

    g_assert(dev != NULL);

    g_assert_cmphex(dev->vdev.device_type, ==, VIRTIO_ID_BLOCK);

    g_assert_cmphex(dev->pdev->devfn, ==, ((slot << 3) | PCI_FN));
@@ -296,7 +296,7 @@ static void pci_basic(void) 
    /* End test */

    qvirtqueue_cleanup(dev->vdev.bus, &vqpci->vq, qs->alloc);

    qvirtio_pci_device_disable(dev);

    g_free(dev);

    qvirtio_pci_device_free(dev);

    qtest_shutdown(qs);

}
@@ -389,7 +389,7 @@ static void pci_indirect(void) 
    /* End test */

    qvirtqueue_cleanup(dev->vdev.bus, &vqpci->vq, qs->alloc);

    qvirtio_pci_device_disable(dev);

    g_free(dev);

    qvirtio_pci_device_free(dev);

    qtest_shutdown(qs);

}
@@ -418,7 +418,7 @@ static void pci_config(void) 
    g_assert_cmpint(capacity, ==, n_size / 512);



    qvirtio_pci_device_disable(dev);

    g_free(dev);

    qvirtio_pci_device_free(dev);



    qtest_shutdown(qs);

}
@@ -526,7 +526,7 @@ static void pci_msix(void) 
    qvirtqueue_cleanup(dev->vdev.bus, &vqpci->vq, qs->alloc);

    qpci_msix_disable(dev->pdev);

    qvirtio_pci_device_disable(dev);

    g_free(dev);

    qvirtio_pci_device_free(dev);

    qtest_shutdown(qs);

}
@@ -642,7 +642,7 @@ static void pci_idx(void) 
    qvirtqueue_cleanup(dev->vdev.bus, &vqpci->vq, qs->alloc);

    qpci_msix_disable(dev->pdev);

    qvirtio_pci_device_disable(dev);

    g_free(dev);

    qvirtio_pci_device_free(dev);

    qtest_shutdown(qs);

}
@@ -661,7 +661,7 @@ static void pci_hotplug(void) 
    dev = virtio_blk_pci_init(qs->pcibus, PCI_SLOT_HP);

    g_assert(dev);

    qvirtio_pci_device_disable(dev);

    g_free(dev);

    qvirtio_pci_device_free(dev);



    /* unplug secondary disk */

    if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) {