From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Subject: [PATCH 2 of 2 ] qemu-remote: enable usb uhci
	save\restore
Date: Wed, 15 Oct 2008 18:03:50 +0100
Message-ID: <48F62276.3010107@eu.citrix.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xensource.com>
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: xen-devel <xen-devel@lists.xensource.com>
List-Id: xen-devel@lists.xenproject.org

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

---

diff --git a/hw/usb-uhci.c b/hw/usb-uhci.c
index d0be523..80581d9 100644
--- a/hw/usb-uhci.c
+++ b/hw/usb-uhci.c
@@ -157,7 +157,6 @@ static void uhci_reset(UHCIState *s)
     }
 }
 
-#if 0
 static void uhci_save(QEMUFile *f, void *opaque)
 {
     UHCIState *s = opaque;
@@ -209,7 +208,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)
 {
@@ -935,6 +933,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)
@@ -970,4 +969,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);
 }