Blame 0359-ehci-Walk-async-schedule-before-and-after-migration.patch

Hans de Goede c8dfc6
From fec70ddafe1632f40608ef6917760a7f946f278a Mon Sep 17 00:00:00 2001
Hans de Goede c8dfc6
From: Hans de Goede <hdegoede@redhat.com>
Hans de Goede c8dfc6
Date: Wed, 5 Sep 2012 12:07:10 +0200
Hans de Goede c8dfc6
Subject: [PATCH 359/366] ehci: Walk async schedule before and after migration
Hans de Goede c8dfc6
Hans de Goede c8dfc6
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede c8dfc6
---
Hans de Goede c8dfc6
 hw/usb/hcd-ehci.c | 28 ++++++++++++++++++++++++++++
Hans de Goede c8dfc6
 1 file changed, 28 insertions(+)
Hans de Goede c8dfc6
Hans de Goede c8dfc6
diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c
Hans de Goede c8dfc6
index 6f48132..30d2b56 100644
Hans de Goede c8dfc6
--- a/hw/usb/hcd-ehci.c
Hans de Goede c8dfc6
+++ b/hw/usb/hcd-ehci.c
Hans de Goede c8dfc6
@@ -34,6 +34,7 @@
Hans de Goede c8dfc6
 #include "monitor.h"
Hans de Goede c8dfc6
 #include "trace.h"
Hans de Goede c8dfc6
 #include "dma.h"
Hans de Goede c8dfc6
+#include "sysemu.h"
Hans de Goede c8dfc6
 
Hans de Goede c8dfc6
 #define EHCI_DEBUG   0
Hans de Goede c8dfc6
 
Hans de Goede c8dfc6
@@ -2558,6 +2559,32 @@ static int usb_ehci_post_load(void *opaque, int version_id)
Hans de Goede c8dfc6
     return 0;
Hans de Goede c8dfc6
 }
Hans de Goede c8dfc6
 
Hans de Goede c8dfc6
+static void usb_ehci_vm_state_change(void *opaque, int running, RunState state)
Hans de Goede c8dfc6
+{
Hans de Goede c8dfc6
+    EHCIState *ehci = opaque;
Hans de Goede c8dfc6
+
Hans de Goede c8dfc6
+    /*
Hans de Goede c8dfc6
+     * We don't migrate the EHCIQueue-s, instead we rebuild them for the
Hans de Goede c8dfc6
+     * schedule in guest memory. We must do the rebuilt ASAP, so that
Hans de Goede c8dfc6
+     * USB-devices which have async handled packages have a packet in the
Hans de Goede c8dfc6
+     * ep queue to match the completion with.
Hans de Goede c8dfc6
+     */
Hans de Goede c8dfc6
+    if (state == RUN_STATE_RUNNING) {
Hans de Goede c8dfc6
+        ehci_advance_async_state(ehci);
Hans de Goede c8dfc6
+    }
Hans de Goede c8dfc6
+
Hans de Goede c8dfc6
+    /*
Hans de Goede c8dfc6
+     * The schedule rebuilt from guest memory could cause the migration dest
Hans de Goede c8dfc6
+     * to miss a QH unlink, and fail to cancel packets, since the unlinked QH
Hans de Goede c8dfc6
+     * will never have existed on the destination. Therefor we must flush the
Hans de Goede c8dfc6
+     * async schedule on savevm to catch any not yet noticed unlinks.
Hans de Goede c8dfc6
+     */
Hans de Goede c8dfc6
+    if (state == RUN_STATE_SAVE_VM) {
Hans de Goede c8dfc6
+        ehci_advance_async_state(ehci);
Hans de Goede c8dfc6
+        ehci_queues_rip_unseen(ehci, 1);
Hans de Goede c8dfc6
+    }
Hans de Goede c8dfc6
+}
Hans de Goede c8dfc6
+
Hans de Goede c8dfc6
 static const VMStateDescription vmstate_ehci = {
Hans de Goede c8dfc6
     .name        = "ehci",
Hans de Goede c8dfc6
     .version_id  = 2,
Hans de Goede c8dfc6
@@ -2707,6 +2734,7 @@ static int usb_ehci_initfn(PCIDevice *dev)
Hans de Goede c8dfc6
     usb_packet_init(&s->ipacket);
Hans de Goede c8dfc6
 
Hans de Goede c8dfc6
     qemu_register_reset(ehci_reset, s);
Hans de Goede c8dfc6
+    qemu_add_vm_change_state_handler(usb_ehci_vm_state_change, s);
Hans de Goede c8dfc6
 
Hans de Goede c8dfc6
     memory_region_init(&s->mem, "ehci", MMIO_SIZE);
Hans de Goede c8dfc6
     memory_region_init_io(&s->mem_caps, &ehci_mmio_caps_ops, s,
Hans de Goede c8dfc6
-- 
Hans de Goede c8dfc6
1.7.12
Hans de Goede c8dfc6