diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-07-29 09:39:37 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-07-29 09:39:37 -0500 |
| commit | e374560232776d4141866abc9f520c132b394926 (patch) | |
| tree | 3a6eb078cb127fe8fc82422c8ce09e77d5983835 /hw/usb-ehci.c | |
| parent | c62f6d1d76aea587556c85b6b7b5c44167006264 (diff) | |
| parent | 98e51ec92e678cf0e501b5ef013753ec8710e222 (diff) | |
| download | qemu-e374560232776d4141866abc9f520c132b394926.zip qemu-e374560232776d4141866abc9f520c132b394926.tar.gz qemu-e374560232776d4141866abc9f520c132b394926.tar.bz2 | |
Merge remote-tracking branch 'kraxel/migration.2' into staging
Diffstat (limited to 'hw/usb-ehci.c')
| -rw-r--r-- | hw/usb-ehci.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/hw/usb-ehci.c b/hw/usb-ehci.c index a4758f9..8b0dcc3 100644 --- a/hw/usb-ehci.c +++ b/hw/usb-ehci.c @@ -2244,6 +2244,11 @@ static USBBusOps ehci_bus_ops = { .register_companion = ehci_register_companion, }; +static const VMStateDescription vmstate_ehci = { + .name = "ehci", + .unmigratable = 1, +}; + static Property ehci_properties[] = { DEFINE_PROP_UINT32("freq", EHCIState, freq, FRAME_TIMER_FREQ), DEFINE_PROP_UINT32("maxframes", EHCIState, maxframes, 128), @@ -2254,6 +2259,7 @@ static PCIDeviceInfo ehci_info[] = { { .qdev.name = "usb-ehci", .qdev.size = sizeof(EHCIState), + .qdev.vmsd = &vmstate_ehci, .init = usb_ehci_initfn, .vendor_id = PCI_VENDOR_ID_INTEL, .device_id = PCI_DEVICE_ID_INTEL_82801D, /* ich4 */ @@ -2263,6 +2269,7 @@ static PCIDeviceInfo ehci_info[] = { },{ .qdev.name = "ich9-usb-ehci1", .qdev.size = sizeof(EHCIState), + .qdev.vmsd = &vmstate_ehci, .init = usb_ehci_initfn, .vendor_id = PCI_VENDOR_ID_INTEL, .device_id = PCI_DEVICE_ID_INTEL_82801I_EHCI1, |