diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-02-15 18:41:28 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-02-15 18:41:28 -0600 |
| commit | 6c263e26a5c162a8cd79e32bb82422697db5c57c (patch) | |
| tree | de3955b0d0d026c74e05f1342e7dac75b3c6ab78 /hw/apic_common.c | |
| parent | cf5cfe0471eb3693401f390bc467413d14dce368 (diff) | |
| parent | a4aecd2819fd31641ab62472e3385073043521fb (diff) | |
| download | focaccia-qemu-6c263e26a5c162a8cd79e32bb82422697db5c57c.tar.gz focaccia-qemu-6c263e26a5c162a8cd79e32bb82422697db5c57c.zip | |
Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
* qemu-kvm/uq/master: apic: Fix legacy vmstate loading for KVM kvm: Implement kvm_irqchip_in_kernel like kvm_enabled kvm: Allow to set shadow MMU size
Diffstat (limited to 'hw/apic_common.c')
| -rw-r--r-- | hw/apic_common.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/hw/apic_common.c b/hw/apic_common.c index a440ea8ff5..c91f7d5391 100644 --- a/hw/apic_common.c +++ b/hw/apic_common.c @@ -188,6 +188,7 @@ static void apic_reset_common(DeviceState *d) static int apic_load_old(QEMUFile *f, void *opaque, int version_id) { APICCommonState *s = opaque; + APICCommonClass *info = APIC_COMMON_GET_CLASS(s); int i; if (version_id > 2) { @@ -220,7 +221,11 @@ static int apic_load_old(QEMUFile *f, void *opaque, int version_id) s->next_time = qemu_get_be64(f); if (version_id >= 2) { - qemu_get_timer(f, s->timer); + s->timer_expiry = qemu_get_be64(f); + } + + if (info->post_load) { + info->post_load(s); } return 0; } |