diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-20 15:16:00 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-20 15:16:00 -0500 |
| commit | 7f67d8922e2da59c02852de39f888d7873e8645c (patch) | |
| tree | fde41774a54f63bce66a739332c3dbd27365af91 /hw/kvmclock.c | |
| parent | 27acf660aa1678ff3e7291fa81f4d5d4020b20f8 (diff) | |
| parent | 6e0ca8820dddd04056c43327f3b3699f572d03d4 (diff) | |
| download | focaccia-qemu-7f67d8922e2da59c02852de39f888d7873e8645c.tar.gz focaccia-qemu-7f67d8922e2da59c02852de39f888d7873e8645c.zip | |
Merge remote-tracking branch 'qmp/queue/qmp' into staging
Diffstat (limited to 'hw/kvmclock.c')
| -rw-r--r-- | hw/kvmclock.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/kvmclock.c b/hw/kvmclock.c index b73aec409c..5388bc489d 100644 --- a/hw/kvmclock.c +++ b/hw/kvmclock.c @@ -46,7 +46,7 @@ static void kvmclock_pre_save(void *opaque) * it on next vmsave (which would return a different value). Will be reset * when the VM is continued. */ - s->clock_valid = !vm_running; + s->clock_valid = !runstate_is_running(); } static int kvmclock_post_load(void *opaque, int version_id) @@ -59,7 +59,8 @@ static int kvmclock_post_load(void *opaque, int version_id) return kvm_vm_ioctl(kvm_state, KVM_SET_CLOCK, &data); } -static void kvmclock_vm_state_change(void *opaque, int running, int reason) +static void kvmclock_vm_state_change(void *opaque, int running, + RunState state) { KVMClockState *s = opaque; |