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 /target-i386 | |
| parent | 27acf660aa1678ff3e7291fa81f4d5d4020b20f8 (diff) | |
| parent | 6e0ca8820dddd04056c43327f3b3699f572d03d4 (diff) | |
| download | qemu-7f67d8922e2da59c02852de39f888d7873e8645c.zip qemu-7f67d8922e2da59c02852de39f888d7873e8645c.tar.gz qemu-7f67d8922e2da59c02852de39f888d7873e8645c.tar.bz2 | |
Merge remote-tracking branch 'qmp/queue/qmp' into staging
Diffstat (limited to 'target-i386')
| -rw-r--r-- | target-i386/kvm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 22b1dd0..b6eef04 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -334,7 +334,7 @@ static int kvm_inject_mce_oldstyle(CPUState *env) return 0; } -static void cpu_update_state(void *opaque, int running, int reason) +static void cpu_update_state(void *opaque, int running, RunState state) { CPUState *env = opaque; @@ -1130,7 +1130,7 @@ static int kvm_get_msrs(CPUState *env) if (!env->tsc_valid) { msrs[n++].index = MSR_IA32_TSC; - env->tsc_valid = !vm_running; + env->tsc_valid = !runstate_is_running(); } #ifdef TARGET_X86_64 |