[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/6] uhci: initialize expire_time when loading v1 vm
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 3/6] uhci: initialize expire_time when loading v1 vmstate |
Date: |
Thu, 12 Jul 2012 15:08:36 +0200 |
$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 <address@hidden>
---
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 8f652d2..2aac8a2 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),
--
1.7.1
- [Qemu-devel] [PULL 0/6] usb patch queue, Gerd Hoffmann, 2012/07/12
- [Qemu-devel] [PATCH 3/6] uhci: initialize expire_time when loading v1 vmstate,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 5/6] ehci: implement Interrupt Threshold Control support, Gerd Hoffmann, 2012/07/12
- [Qemu-devel] [PATCH 4/6] ehci: raise irq in the frame timer, Gerd Hoffmann, 2012/07/12
- [Qemu-devel] [PATCH 1/6] scsi: add free_request callback, Gerd Hoffmann, 2012/07/12
- [Qemu-devel] [PATCH 6/6] ehci: improve expire time calculation, Gerd Hoffmann, 2012/07/12
- [Qemu-devel] [PATCH 2/6] usb: add usb attached scsi emulation, Gerd Hoffmann, 2012/07/12