Revision 4a942cea target-i386/kvm.c
| b/target-i386/kvm.c | ||
|---|---|---|
| 540 | 540 |
sregs.cr3 = env->cr[3]; |
| 541 | 541 |
sregs.cr4 = env->cr[4]; |
| 542 | 542 |
|
| 543 |
sregs.cr8 = cpu_get_apic_tpr(env); |
|
| 544 |
sregs.apic_base = cpu_get_apic_base(env); |
|
| 543 |
sregs.cr8 = cpu_get_apic_tpr(env->apic_state);
|
|
| 544 |
sregs.apic_base = cpu_get_apic_base(env->apic_state);
|
|
| 545 | 545 |
|
| 546 | 546 |
sregs.efer = env->efer; |
| 547 | 547 |
|
| ... | ... | |
| 652 | 652 |
env->cr[3] = sregs.cr3; |
| 653 | 653 |
env->cr[4] = sregs.cr4; |
| 654 | 654 |
|
| 655 |
cpu_set_apic_base(env, sregs.apic_base); |
|
| 655 |
cpu_set_apic_base(env->apic_state, sregs.apic_base);
|
|
| 656 | 656 |
|
| 657 | 657 |
env->efer = sregs.efer; |
| 658 |
//cpu_set_apic_tpr(env, sregs.cr8); |
|
| 658 |
//cpu_set_apic_tpr(env->apic_state, sregs.cr8);
|
|
| 659 | 659 |
|
| 660 | 660 |
#define HFLAG_COPY_MASK ~( \ |
| 661 | 661 |
HF_CPL_MASK | HF_PE_MASK | HF_MP_MASK | HF_EM_MASK | \ |
| ... | ... | |
| 1055 | 1055 |
run->request_interrupt_window = 0; |
| 1056 | 1056 |
|
| 1057 | 1057 |
DPRINTF("setting tpr\n");
|
| 1058 |
run->cr8 = cpu_get_apic_tpr(env); |
|
| 1058 |
run->cr8 = cpu_get_apic_tpr(env->apic_state);
|
|
| 1059 | 1059 |
|
| 1060 | 1060 |
return 0; |
| 1061 | 1061 |
} |
| ... | ... | |
| 1067 | 1067 |
else |
| 1068 | 1068 |
env->eflags &= ~IF_MASK; |
| 1069 | 1069 |
|
| 1070 |
cpu_set_apic_tpr(env, run->cr8); |
|
| 1071 |
cpu_set_apic_base(env, run->apic_base); |
|
| 1070 |
cpu_set_apic_tpr(env->apic_state, run->cr8);
|
|
| 1071 |
cpu_set_apic_base(env->apic_state, run->apic_base);
|
|
| 1072 | 1072 |
|
| 1073 | 1073 |
return 0; |
| 1074 | 1074 |
} |
Also available in: Unified diff