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

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: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Marc-André Lureau 2017-02-07 16:55:14 +04:00
parent c4523aae06
commit 80e1eea37a
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/libqos/virtio-pci.c
View File

@ -61,13 +61,14 @@ static void qvirtio_pci_foreach_callback(
(!d->has_slot || vpcidev->pdev->devfn == d->slot << 3)) { (!d->has_slot || vpcidev->pdev->devfn == d->slot << 3)) {
d->func(&vpcidev->vdev, d->user_data); d->func(&vpcidev->vdev, d->user_data);
} else { } else {
g_free(vpcidev); qvirtio_pci_device_free(vpcidev);
} }
} }
static void qvirtio_pci_assign_device(QVirtioDevice *d, void *data) static void qvirtio_pci_assign_device(QVirtioDevice *d, void *data)
{ {
QVirtioPCIDevice **vpcidev = data; QVirtioPCIDevice **vpcidev = data;
assert(!*vpcidev);
*vpcidev = (QVirtioPCIDevice *)d; *vpcidev = (QVirtioPCIDevice *)d;
} }

14
tests/virtio-blk-test.c
View File

@ -108,7 +108,7 @@ static QVirtioPCIDevice *virtio_blk_pci_init(QPCIBus *bus, int slot)
{ {
QVirtioPCIDevice *dev; 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(dev != NULL);
g_assert_cmphex(dev->vdev.device_type, ==, VIRTIO_ID_BLOCK); g_assert_cmphex(dev->vdev.device_type, ==, VIRTIO_ID_BLOCK);
g_assert_cmphex(dev->pdev->devfn, ==, ((slot << 3) | PCI_FN)); g_assert_cmphex(dev->pdev->devfn, ==, ((slot << 3) | PCI_FN));
@ -296,7 +296,7 @@ static void pci_basic(void)
/* End test */ /* End test */
qvirtqueue_cleanup(dev->vdev.bus, &vqpci->vq, qs->alloc); qvirtqueue_cleanup(dev->vdev.bus, &vqpci->vq, qs->alloc);
qvirtio_pci_device_disable(dev); qvirtio_pci_device_disable(dev);
g_free(dev); qvirtio_pci_device_free(dev);
qtest_shutdown(qs); qtest_shutdown(qs);
} }
@ -389,7 +389,7 @@ static void pci_indirect(void)
/* End test */ /* End test */
qvirtqueue_cleanup(dev->vdev.bus, &vqpci->vq, qs->alloc); qvirtqueue_cleanup(dev->vdev.bus, &vqpci->vq, qs->alloc);
qvirtio_pci_device_disable(dev); qvirtio_pci_device_disable(dev);
g_free(dev); qvirtio_pci_device_free(dev);
qtest_shutdown(qs); qtest_shutdown(qs);
} }
@ -418,7 +418,7 @@ static void pci_config(void)
g_assert_cmpint(capacity, ==, n_size / 512); g_assert_cmpint(capacity, ==, n_size / 512);
qvirtio_pci_device_disable(dev); qvirtio_pci_device_disable(dev);
g_free(dev); qvirtio_pci_device_free(dev);
qtest_shutdown(qs); qtest_shutdown(qs);
} }
@ -526,7 +526,7 @@ static void pci_msix(void)
qvirtqueue_cleanup(dev->vdev.bus, &vqpci->vq, qs->alloc); qvirtqueue_cleanup(dev->vdev.bus, &vqpci->vq, qs->alloc);
qpci_msix_disable(dev->pdev); qpci_msix_disable(dev->pdev);
qvirtio_pci_device_disable(dev); qvirtio_pci_device_disable(dev);
g_free(dev); qvirtio_pci_device_free(dev);
qtest_shutdown(qs); qtest_shutdown(qs);
} }
@ -642,7 +642,7 @@ static void pci_idx(void)
qvirtqueue_cleanup(dev->vdev.bus, &vqpci->vq, qs->alloc); qvirtqueue_cleanup(dev->vdev.bus, &vqpci->vq, qs->alloc);
qpci_msix_disable(dev->pdev); qpci_msix_disable(dev->pdev);
qvirtio_pci_device_disable(dev); qvirtio_pci_device_disable(dev);
g_free(dev); qvirtio_pci_device_free(dev);
qtest_shutdown(qs); qtest_shutdown(qs);
} }
@ -661,7 +661,7 @@ static void pci_hotplug(void)
dev = virtio_blk_pci_init(qs->pcibus, PCI_SLOT_HP); dev = virtio_blk_pci_init(qs->pcibus, PCI_SLOT_HP);
g_assert(dev); g_assert(dev);
qvirtio_pci_device_disable(dev); qvirtio_pci_device_disable(dev);
g_free(dev); qvirtio_pci_device_free(dev);
/* unplug secondary disk */ /* unplug secondary disk */
if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) { if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) {