diff options
| author | Anthony Liguori | 2013-09-20 15:08:08 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2013-09-20 15:08:09 +0200 |
| commit | ce63e9c258a05e344f81b28f2b995c530909a3f0 (patch) | |
| tree | bdfa0b168a485a85fda674689a0fc0222f291d74 /hw/usb/combined-packet.c | |
| parent | Merge remote-tracking branch 'luiz/queue/qmp' into staging (diff) | |
| parent | usb: Fix iovec memleak on combined-packet free (diff) | |
| download | qemu-ce63e9c258a05e344f81b28f2b995c530909a3f0.tar.gz qemu-ce63e9c258a05e344f81b28f2b995c530909a3f0.tar.xz qemu-ce63e9c258a05e344f81b28f2b995c530909a3f0.zip | |
Merge remote-tracking branch 'kraxel/usb.90' into staging
# By Hans de Goede (6) and Gerd Hoffmann (1)
# Via Gerd Hoffmann
* kraxel/usb.90:
usb: Fix iovec memleak on combined-packet free
usb: Also reset max_packet_size on ep_reset
xhci: Fix memory leak on xhci_disable_ep
xhci: Add xhci_epid_to_usbep helper function
xhci: Init a transfers xhci, slotid and epid member on epctx alloc
xhci: Fix number of streams allocated when using streams
usb: remove old usb-host code
Message-id: 1379583298-7524-1-git-send-email-kraxel@redhat.com
Diffstat (limited to 'hw/usb/combined-packet.c')
| -rw-r--r-- | hw/usb/combined-packet.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/usb/combined-packet.c b/hw/usb/combined-packet.c index 13f6602ad2..ad77705f8c 100644 --- a/hw/usb/combined-packet.c +++ b/hw/usb/combined-packet.c @@ -39,6 +39,7 @@ static void usb_combined_packet_remove(USBCombinedPacket *combined, p->combined = NULL; QTAILQ_REMOVE(&combined->packets, p, combined_entry); if (QTAILQ_EMPTY(&combined->packets)) { + qemu_iovec_destroy(&combined->iov); g_free(combined); } } |