[Qemu-devel] [PATCH 0/2] Fix pci bus-master & ehci migration

[Qemu-devel] [PATCH 0/2] Fix pci bus-master & ehci migration

[Hans de Goede]

Not sure if this should go in through your USB tree, as this also touched PCI
in general, but my ehci migration troubles were the reason I wrote this...

Regards,

Hans

[Qemu-devel] [PATCH 1/2] ehci-pci: Fix crash on migration / migration not working

[Hans de Goede]

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 hw/usb/hcd-ehci-pci.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hw/usb/hcd-ehci-pci.c b/hw/usb/hcd-ehci-pci.c
index d5c7d46..fe45a1f 100644
--- a/hw/usb/hcd-ehci-pci.c
+++ b/hw/usb/hcd-ehci-pci.c
@@ -91,6 +91,7 @@ static const VMStateDescription vmstate_ehci_pci = {
     .fields      = (VMStateField[]) {
         VMSTATE_PCI_DEVICE(pcidev, EHCIPCIState),
         VMSTATE_STRUCT(ehci, EHCIPCIState, 2, vmstate_ehci, EHCIState),
+        VMSTATE_END_OF_LIST()
     }
 };
 
@@ -105,7 +106,7 @@ static void ehci_class_init(ObjectClass *klass, void *data)
     k->device_id = i->device_id;
     k->revision = i->revision;
     k->class_id = PCI_CLASS_SERIAL_USB;
-    dc->vmsd = &vmstate_ehci;
+    dc->vmsd = &vmstate_ehci_pci;
     dc->props = ehci_pci_properties;
 }
 
-- 
1.7.12.1

[Qemu-devel] [PATCH 2/2] pci: Restore bus-master memory mapping state after migration

[Hans de Goede]

This fixes dma reads / writes from pci-devices no longer working after
migration.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 hw/pci.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/hw/pci.c b/hw/pci.c
index dceda0b..6666651 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -367,6 +367,10 @@ static int get_pci_config_device(QEMUFile *f, void *pv, size_t size)
 
     pci_update_mappings(s);
 
+    memory_region_set_enabled(&s->bus_master_enable_region,
+                              pci_get_word(s->config + PCI_COMMAND)
+                                & PCI_COMMAND_MASTER);
+
     g_free(config);
     return 0;
 }
-- 
1.7.12.1