Commit 62030ed1 authored by Marc-André Lureau's avatar Marc-André Lureau
Browse files

tests: fix usb-test leaks 



Fix the usb tests leaks.

Spotted by ASAN.

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent d3510ff9

tests/libqos/usb.c

+5 −0
Original line number Diff line number Diff line
@@ -24,6 +24,11 @@ void qusb_pci_init_one(QPCIBus *pcibus, struct qhc *hc, uint32_t devfn, int bar) 
    hc->bar = qpci_iomap(hc->dev, bar, NULL);

}



void uhci_deinit(struct qhc *hc)

{

    g_free(hc->dev);

}



void uhci_port_test(struct qhc *hc, int port, uint16_t expect)

{

    uint16_t value = qpci_io_readw(hc->dev, hc->bar, 0x10 + 2 * port);

tests/libqos/usb.h

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ struct qhc { 
void qusb_pci_init_one(QPCIBus *pcibus, struct qhc *hc,

                       uint32_t devfn, int bar);

void uhci_port_test(struct qhc *hc, int port, uint16_t expect);

void uhci_deinit(struct qhc *hc);



void usb_test_hotplug(const char *bus_name, const int port,

                      void (*port_check)(void));

tests/usb-hcd-ehci-test.c

+10 −0
Original line number Diff line number Diff line
@@ -61,6 +61,15 @@ static void test_init(void) 
    qusb_pci_init_one(pcibus, &ehci1, QPCI_DEVFN(0x1d, 7), 0);

}



static void test_deinit(void)

{

    uhci_deinit(&uhci1);

    uhci_deinit(&uhci2);

    uhci_deinit(&uhci3);

    uhci_deinit(&ehci1);

    qpci_free_pc(pcibus);

}



static void pci_uhci_port_1(void)

{

    g_assert(pcibus != NULL);
@@ -161,6 +170,7 @@ int main(int argc, char **argv) 


    test_init();

    ret = g_test_run();

    test_deinit();



    qtest_end();

tests/usb-hcd-uhci-test.c

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ static void test_port(int port) 
    g_assert(port > 0);

    qusb_pci_init_one(qs->pcibus, &uhci, QPCI_DEVFN(0x1d, 0), 4);

    uhci_port_test(&uhci, port - 1, UHCI_PORT_CCS);

    uhci_deinit(&uhci);

}



static void test_port_1(void)