[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/9] ehci: Walk async schedule before and after migr
From: |
Hans de Goede |
Subject: |
[Qemu-devel] [PATCH 2/9] ehci: Walk async schedule before and after migration |
Date: |
Wed, 12 Sep 2012 13:39:05 +0200 |
Signed-off-by: Hans de Goede <address@hidden>
---
hw/usb/hcd-ehci.c | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c
index c5f2635..e67cbc7 100644
--- a/hw/usb/hcd-ehci.c
+++ b/hw/usb/hcd-ehci.c
@@ -34,6 +34,7 @@
#include "monitor.h"
#include "trace.h"
#include "dma.h"
+#include "sysemu.h"
#define EHCI_DEBUG 0
@@ -2574,6 +2575,32 @@ static int usb_ehci_post_load(void *opaque, int
version_id)
return 0;
}
+static void usb_ehci_vm_state_change(void *opaque, int running, RunState state)
+{
+ EHCIState *ehci = opaque;
+
+ /*
+ * We don't migrate the EHCIQueue-s, instead we rebuild them for the
+ * schedule in guest memory. We must do the rebuilt ASAP, so that
+ * USB-devices which have async handled packages have a packet in the
+ * ep queue to match the completion with.
+ */
+ if (state == RUN_STATE_RUNNING) {
+ ehci_advance_async_state(ehci);
+ }
+
+ /*
+ * The schedule rebuilt from guest memory could cause the migration dest
+ * to miss a QH unlink, and fail to cancel packets, since the unlinked QH
+ * will never have existed on the destination. Therefor we must flush the
+ * async schedule on savevm to catch any not yet noticed unlinks.
+ */
+ if (state == RUN_STATE_SAVE_VM) {
+ ehci_advance_async_state(ehci);
+ ehci_queues_rip_unseen(ehci, 1);
+ }
+}
+
static const VMStateDescription vmstate_ehci = {
.name = "ehci",
.version_id = 2,
@@ -2723,6 +2750,7 @@ static int usb_ehci_initfn(PCIDevice *dev)
usb_packet_init(&s->ipacket);
qemu_register_reset(ehci_reset, s);
+ qemu_add_vm_change_state_handler(usb_ehci_vm_state_change, s);
memory_region_init_io(&s->mem, &ehci_mem_ops, s, "ehci", MMIO_SIZE);
pci_register_bar(&s->dev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->mem);
--
1.7.12
- [Qemu-devel] [PATCH 1/9] ehci: Don't set seen to 0 when removing unseen queue-heads, Hans de Goede, 2012/09/12
- [Qemu-devel] [PATCH 2/9] ehci: Walk async schedule before and after migration,
Hans de Goede <=
- [Qemu-devel] [PATCH 1/9] ehci: Don't set seen to 0 when removing unseen queue-heads, Hans de Goede, 2012/09/12
- [Qemu-devel] [PATCH 2/9] ehci: Walk async schedule before and after migration, Hans de Goede, 2012/09/12
- [Qemu-devel] [PATCH 5/9] usb-redir: Store max_packet_size in endp_data, Hans de Goede, 2012/09/12
- [Qemu-devel] [PATCH 3/9] usb-redir: Change cancelled packet code into a generic packet-id queue, Hans de Goede, 2012/09/12
- [Qemu-devel] [PATCH 4/9] usb-redir: Add an already_in_flight packet-id queue, Hans de Goede, 2012/09/12
- [Qemu-devel] [PATCH 7/9] usb-redir: Add chardev open / close debug logging, Hans de Goede, 2012/09/12
- [Qemu-devel] [PATCH 6/9] usb-redir: Add support for migration, Hans de Goede, 2012/09/12
- [Qemu-devel] [PATCH 9/9] uhci: Don't queue up packets after one with the SPD flag set, Hans de Goede, 2012/09/12
- [Qemu-devel] [PATCH 8/9] usb-redir: Revert usb-redir part of commit 93bfef4c, Hans de Goede, 2012/09/12
- Re: [Qemu-devel] [PATCH 1/9] ehci: Don't set seen to 0 when removing unseen queue-heads, Gerd Hoffmann, 2012/09/13