diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2012-07-10 12:51:07 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2012-07-12 15:00:50 +0200 |
| commit | 75f151cd271bb0fd3b3b871f1850a673d534e65e (patch) | |
| tree | 3e1566542aff8909037d3ace132072f175b06c78 /hw/usb/hcd-uhci.c | |
| parent | 0f58f68b58eb0528545553d2c44f6b8e472cedb0 (diff) | |
| download | focaccia-qemu-75f151cd271bb0fd3b3b871f1850a673d534e65e.tar.gz focaccia-qemu-75f151cd271bb0fd3b3b871f1850a673d534e65e.zip | |
uhci: initialize expire_time when loading v1 vmstate
$subject says all: when loading old (v1) vmstate which doesn't contain expire_time initialize it with a reasonable default (current time). Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw/usb/hcd-uhci.c')
| -rw-r--r-- | hw/usb/hcd-uhci.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c index 8f652d2f4a..2aac8a2505 100644 --- a/hw/usb/hcd-uhci.c +++ b/hw/usb/hcd-uhci.c @@ -388,11 +388,23 @@ static const VMStateDescription vmstate_uhci_port = { } }; +static int uhci_post_load(void *opaque, int version_id) +{ + UHCIState *s = opaque; + + if (version_id < 2) { + s->expire_time = qemu_get_clock_ns(vm_clock) + + (get_ticks_per_sec() / FRAME_TIMER_FREQ); + } + return 0; +} + static const VMStateDescription vmstate_uhci = { .name = "uhci", .version_id = 2, .minimum_version_id = 1, .minimum_version_id_old = 1, + .post_load = uhci_post_load, .fields = (VMStateField []) { VMSTATE_PCI_DEVICE(dev, UHCIState), VMSTATE_UINT8_EQUAL(num_ports_vmstate, UHCIState), |