motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-03 07:43:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'qmp/queue/qmp' into staging

Browse source
This commit is contained in:
Anthony Liguori 2011-09-20 15:16:00 -05:00
commit 7f67d8922e
30 changed files with 292 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

4
target-i386/kvm.c
View file

@ -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