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

apic: avoid passing CPUState from CPU code

Browse source 
Pass only APICState when accessing APIC from CPU code.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Blue Swirl 2010-06-19 10:42:31 +03:00
parent cf6d64bfd9
commit 4a942ceac7
5 changed files with 36 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

8
target-i386/op_helper.c
View file

@ -2888,7 +2888,7 @@ target_ulong helper_read_crN(int reg)
break;
case 8:
if (!(env->hflags2 & HF2_VINTR_MASK)) {
val = cpu_get_apic_tpr(env);
val = cpu_get_apic_tpr(env->apic_state);
} else {
val = env->v_tpr;
}
@ -2912,7 +2912,7 @@ void helper_write_crN(int reg, target_ulong t0)
break;
case 8:
if (!(env->hflags2 & HF2_VINTR_MASK)) {
cpu_set_apic_tpr(env, t0);
cpu_set_apic_tpr(env->apic_state, t0);
}
env->v_tpr = t0 & 0x0f;
break;
@ -3020,7 +3020,7 @@ void helper_wrmsr(void)
env->sysenter_eip = val;
break;
case MSR_IA32_APICBASE:
cpu_set_apic_base(env, val);
cpu_set_apic_base(env->apic_state, val);
break;
case MSR_EFER:
{
@ -3153,7 +3153,7 @@ void helper_rdmsr(void)
val = env->sysenter_eip;
break;
case MSR_IA32_APICBASE:
val = cpu_get_apic_base(env);
val = cpu_get_apic_base(env->apic_state);
break;
case MSR_EFER:
val = env->efer;