david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uhci: fixes for save/load-vm (Max Krasnyansky)

Browse Source 
For some reason we were not registering save/load-vm handler for piix3
flavor of UHCI and hence save/load was broken.

Async transactions need to be canceled when we save the VM because there
is no way we can save/restore all that state. Since we do not mess the
original TD/QH the driver will simply resubmit the transfers.

Tested with Windows XP-SP2 running under QEMU/KQEMU.

Signed-off-by: Max Krasnyansky <maxk@kernel.org>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>



git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5054 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
aliguori 2008-08-21 19:33:09 +00:00
parent 0d38064858
commit 6f382b5ec0
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/usb-uhci.c
View File

@ -310,6 +310,8 @@ static void uhci_reset(UHCIState *s)
int i; int i;
UHCIPort *port; UHCIPort *port;
dprintf("uhci: full reset\n");
pci_conf = s->dev.config; pci_conf = s->dev.config;
pci_conf[0x6a] = 0x01; /* usb clock */ pci_conf[0x6a] = 0x01; /* usb clock */
@ -331,13 +333,14 @@ static void uhci_reset(UHCIState *s)
uhci_async_cancel_all(s); uhci_async_cancel_all(s);
} }
#if 1
static void uhci_save(QEMUFile *f, void *opaque) static void uhci_save(QEMUFile *f, void *opaque)
{ {
UHCIState *s = opaque; UHCIState *s = opaque;
uint8_t num_ports = NB_PORTS; uint8_t num_ports = NB_PORTS;
int i; int i;
uhci_async_cancel_all(s);
pci_device_save(&s->dev, f); pci_device_save(&s->dev, f);
qemu_put_8s(f, &num_ports); qemu_put_8s(f, &num_ports);
@ -383,7 +386,6 @@ static int uhci_load(QEMUFile *f, void *opaque, int version_id)
return 0; return 0;
} }
#endif
static void uhci_ioport_writeb(void *opaque, uint32_t addr, uint32_t val) static void uhci_ioport_writeb(void *opaque, uint32_t addr, uint32_t val)
{ {
@ -1009,6 +1011,8 @@ static void uhci_frame_timer(void *opaque)
qemu_del_timer(s->frame_timer); qemu_del_timer(s->frame_timer);
/* set hchalted bit in status - UHCI11D 2.1.2 */ /* set hchalted bit in status - UHCI11D 2.1.2 */
s->status |= UHCI_STS_HCHALTED; s->status |= UHCI_STS_HCHALTED;
dprintf("uhci: halted\n");
return; return;
} }
@ -1082,6 +1086,8 @@ void usb_uhci_piix3_init(PCIBus *bus, int devfn)
to rely on this. */ to rely on this. */
pci_register_io_region(&s->dev, 4, 0x20, pci_register_io_region(&s->dev, 4, 0x20,
PCI_ADDRESS_SPACE_IO, uhci_map); PCI_ADDRESS_SPACE_IO, uhci_map);
register_savevm("uhci", 0, 1, uhci_save, uhci_load, s);
} }
void usb_uhci_piix4_init(PCIBus *bus, int devfn) void usb_uhci_piix4_init(PCIBus *bus, int devfn)