From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Hans de Goede <hdegoede@redhat.com>, Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [PATCH 07/14] ehci: Walk async schedule before and after migration
Date: Thu, 13 Sep 2012 10:39:53 +0200 [thread overview]
Message-ID: <1347525600-28220-8-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1347525600-28220-1-git-send-email-kraxel@redhat.com>
From: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/usb/hcd-ehci.c | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c
index bc86460..6a5da84 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
@@ -2572,6 +2573,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,
@@ -2721,6 +2748,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(&s->mem, "ehci", MMIO_SIZE);
memory_region_init_io(&s->mem_caps, &ehci_mmio_caps_ops, s,
--
1.7.1
next prev parent reply other threads:[~2012-09-13 8:40 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-13 8:39 [Qemu-devel] [PULL 00/14] usb patch queue Gerd Hoffmann
2012-09-13 8:39 ` [Qemu-devel] [PATCH 01/14] usb-host: allow emulated (non-async) control requests without USBPacket Gerd Hoffmann
2012-09-13 8:39 ` [Qemu-devel] [PATCH 02/14] ehci: switch to new-style memory ops Gerd Hoffmann
2012-09-13 8:39 ` [Qemu-devel] [PATCH 03/14] ehci: Fix interrupts stopping when Interrupt Threshold Control is 8 Gerd Hoffmann
2012-09-13 8:39 ` [Qemu-devel] [PATCH 04/14] ehci: Don't process too much frames in 1 timer tick (v2) Gerd Hoffmann
2012-09-13 8:39 ` [Qemu-devel] [PATCH 05/14] configure: usbredir fixes Gerd Hoffmann
2012-09-13 8:39 ` [Qemu-devel] [PATCH 06/14] ehci: Don't set seen to 0 when removing unseen queue-heads Gerd Hoffmann
2012-09-13 8:39 ` Gerd Hoffmann [this message]
2012-09-13 8:39 ` [Qemu-devel] [PATCH 08/14] usb-redir: Change cancelled packet code into a generic packet-id queue Gerd Hoffmann
2012-09-13 8:39 ` [Qemu-devel] [PATCH 09/14] usb-redir: Add an already_in_flight " Gerd Hoffmann
2012-09-13 8:39 ` [Qemu-devel] [PATCH 10/14] usb-redir: Store max_packet_size in endp_data Gerd Hoffmann
2012-09-13 8:39 ` [Qemu-devel] [PATCH 11/14] usb-redir: Add support for migration Gerd Hoffmann
2012-09-13 8:39 ` [Qemu-devel] [PATCH 12/14] usb-redir: Add chardev open / close debug logging Gerd Hoffmann
2012-09-13 8:39 ` [Qemu-devel] [PATCH 13/14] usb-redir: Revert usb-redir part of commit 93bfef4c Gerd Hoffmann
2012-09-13 8:40 ` [Qemu-devel] [PATCH 14/14] uhci: Don't queue up packets after one with the SPD flag set Gerd Hoffmann
2012-09-14 7:59 ` [Qemu-devel] [PULL 00/14] usb patch queue Michael Tokarev
2012-09-14 8:27 ` Gerd Hoffmann
2012-09-14 15:21 ` Hans de Goede
2012-09-21 18:17 ` Aurelien Jarno
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1347525600-28220-8-git-send-email-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=hdegoede@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).