Commit 0c0eb302 authored by Marc-André Lureau's avatar Marc-André Lureau
Browse files

tests: fix vhost-user-test leaks 



Spotted by ASAN.

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

tests/libqos/virtio-pci.c

+6 −0
Original line number Diff line number Diff line
@@ -27,6 +27,12 @@ typedef struct QVirtioPCIForeachData { 
    void *user_data;

} QVirtioPCIForeachData;



void qvirtio_pci_device_free(QVirtioPCIDevice *dev)

{

    g_free(dev->pdev);

    g_free(dev);

}



static QVirtioPCIDevice *qpcidevice_to_qvirtiodevice(QPCIDevice *pdev)

{

    QVirtioPCIDevice *vpcidev;

tests/libqos/virtio-pci.h

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ extern const QVirtioBus qvirtio_pci; 
void qvirtio_pci_foreach(QPCIBus *bus, uint16_t device_type,

                void (*func)(QVirtioDevice *d, void *data), void *data);

QVirtioPCIDevice *qvirtio_pci_device_find(QPCIBus *bus, uint16_t device_type);

void qvirtio_pci_device_free(QVirtioPCIDevice *dev);



void qvirtio_pci_device_enable(QVirtioPCIDevice *d);

void qvirtio_pci_device_disable(QVirtioPCIDevice *d);

tests/vhost-user-test.c

+7 −4
Original line number Diff line number Diff line
@@ -139,6 +139,7 @@ enum { 
};



typedef struct TestServer {

    QPCIBus *bus;

    gchar *socket_path;

    gchar *mig_path;

    gchar *chr_name;
@@ -160,14 +161,13 @@ static const char *root; 


static void init_virtio_dev(TestServer *s)

{

    QPCIBus *bus;

    QVirtioPCIDevice *dev;

    uint32_t features;



    bus = qpci_init_pc(NULL);

    g_assert_nonnull(bus);

    s->bus = qpci_init_pc(NULL);

    g_assert_nonnull(s->bus);



    dev = qvirtio_pci_device_find(bus, VIRTIO_ID_NET);

    dev = qvirtio_pci_device_find(s->bus, VIRTIO_ID_NET);

    g_assert_nonnull(dev);



    qvirtio_pci_device_enable(dev);
@@ -180,6 +180,7 @@ static void init_virtio_dev(TestServer *s) 
    qvirtio_set_features(&dev->vdev, features);



    qvirtio_set_driver_ok(&dev->vdev);

    qvirtio_pci_device_free(dev);

}



static void wait_for_fds(TestServer *s)
@@ -507,6 +508,8 @@ static gboolean _test_server_free(TestServer *server) 
    g_free(server->mig_path);



    g_free(server->chr_name);

    qpci_free_pc(server->bus);



    g_free(server);



    return FALSE;