[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] ehci: make idt processing more robust
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH] ehci: make idt processing more robust |
Date: |
Mon, 14 Dec 2015 12:39:32 +0100 |
Make ehci_process_itd return an error in case we didn't do any actual
iso transfer because we've found no active transaction. That'll avoid
ehci happily run in circles forever if the guest builds a loop out of
idts.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb/hcd-ehci.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c
index 4e2161b..d07f228 100644
--- a/hw/usb/hcd-ehci.c
+++ b/hw/usb/hcd-ehci.c
@@ -1389,7 +1389,7 @@ static int ehci_process_itd(EHCIState *ehci,
{
USBDevice *dev;
USBEndpoint *ep;
- uint32_t i, len, pid, dir, devaddr, endp;
+ uint32_t i, len, pid, dir, devaddr, endp, xfers = 0;
uint32_t pg, off, ptr1, ptr2, max, mult;
ehci->periodic_sched_active = PERIODIC_ACTIVE;
@@ -1479,9 +1479,10 @@ static int ehci_process_itd(EHCIState *ehci,
ehci_raise_irq(ehci, USBSTS_INT);
}
itd->transact[i] &= ~ITD_XACT_ACTIVE;
+ xfers++;
}
}
- return 0;
+ return xfers ? 0 : -1;
}
--
1.8.3.1
- [Qemu-devel] [PATCH v2 00/10] igd passthrough chipset tweaks, Gerd Hoffmann, 2015/12/14
- [Qemu-devel] [PATCH v2 01/10] pc: wire up TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE for !xen, Gerd Hoffmann, 2015/12/14
- [Qemu-devel] [PATCH v2 02/10] pc: remove has_igd_gfx_passthru global, Gerd Hoffmann, 2015/12/14
- [Qemu-devel] [PATCH v2 07/10] igd: revamp host config read, Gerd Hoffmann, 2015/12/14
- [Qemu-devel] [PATCH v2 05/10] igd: TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE: call parent realize, Gerd Hoffmann, 2015/12/14
- [Qemu-devel] [PATCH v2 09/10] igd: move igd-passthrough-isa-bridge to igd.c too, Gerd Hoffmann, 2015/12/14
- [Qemu-devel] [PATCH v2 06/10] igd: use defines for standard pci config space offsets, Gerd Hoffmann, 2015/12/14
- [Qemu-devel] [PATCH v2 04/10] igd: switch TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE to realize, Gerd Hoffmann, 2015/12/14
- [Qemu-devel] [PATCH v2 08/10] igd: add q35 support, Gerd Hoffmann, 2015/12/14
- [Qemu-devel] [PATCH v2 03/10] pc: move igd support code to igd.c, Gerd Hoffmann, 2015/12/14
- [Qemu-devel] [PATCH] ehci: make idt processing more robust,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH v2 10/10] igd: handle igd-passthrough-isa-bridge setup in realize(), Gerd Hoffmann, 2015/12/14