From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Thu, 16 Oct 2008 09:29:00 +0000 (+0100)
Subject: enable usb uhci save/restore
X-Git-Tag: t.master-before-merge~72^2
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=466efb506c62eafe5ce4ad7ef6a68d24eaf95b6b;p=qemu-xen-4.3-testing.git

enable usb uhci save/restore

enables the usb uhci save and restore functions that
for some reasons were commented out.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

[ These were commented out in 1e4146791b46f0a798589c58a09f18b2841a9212
  aka svn://svn.savannah.nongnu.org/qemu/trunk@3609
  c046a42c-6fe2-441c-8c8c-71466251a162
  apparently by mistake.  This commit reverts 1e414679
  -Ian Jackson ]
---

diff --git a/hw/usb-uhci.c b/hw/usb-uhci.c
index b55fd849a..b72649507 100644
--- a/hw/usb-uhci.c
+++ b/hw/usb-uhci.c
@@ -151,7 +151,6 @@ static void uhci_reset(UHCIState *s)
     }
 }
 
-#if 0
 static void uhci_save(QEMUFile *f, void *opaque)
 {
     UHCIState *s = opaque;
@@ -203,7 +202,6 @@ static int uhci_load(QEMUFile *f, void *opaque, int version_id)
 
     return 0;
 }
-#endif
 
 static void uhci_ioport_writeb(void *opaque, uint32_t addr, uint32_t val)
 {
@@ -915,6 +913,7 @@ void usb_uhci_piix3_init(PCIBus *bus, int devfn)
        to rely on this.  */
     pci_register_io_region(&s->dev, 4, 0x20,
                            PCI_ADDRESS_SPACE_IO, uhci_map);
+    register_savevm("UHCI usb controller", 0, 1, uhci_save, uhci_load, s);
 }
 
 void usb_uhci_piix4_init(PCIBus *bus, int devfn)
@@ -950,4 +949,5 @@ void usb_uhci_piix4_init(PCIBus *bus, int devfn)
        to rely on this.  */
     pci_register_io_region(&s->dev, 4, 0x20,
                            PCI_ADDRESS_SPACE_IO, uhci_map);
+    register_savevm("UHCI usb controller", 0, 1, uhci_save, uhci_load, s);
 }