Merge commit '4a942ceac7e38c259116960e45ba9619611d1df9' into upstream-merge

* commit '4a942ceac7e38c259116960e45ba9619611d1df9':
  apic: avoid passing CPUState from CPU code
  apic: avoid passing CPUState from devices

Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c
index 1232049e6..403337a57 100644
--- a/qemu-kvm-x86.c
+++ b/qemu-kvm-x86.c
@@ -906,8 +906,8 @@ void kvm_arch_load_regs(CPUState *env, int level)
     sregs.cr3 = env->cr[3];
     sregs.cr4 = env->cr[4];
 
-    sregs.cr8 = cpu_get_apic_tpr(env);
-    sregs.apic_base = cpu_get_apic_base(env);
+    sregs.cr8 = cpu_get_apic_tpr(env->apic_state);
+    sregs.apic_base = cpu_get_apic_base(env->apic_state);
 
     sregs.efer = env->efer;
 
@@ -1090,7 +1090,7 @@ void kvm_arch_save_regs(CPUState *env)
     env->cr[3] = sregs.cr3;
     env->cr[4] = sregs.cr4;
 
-    cpu_set_apic_base(env, sregs.apic_base);
+    cpu_set_apic_base(env->apic_state, sregs.apic_base);
 
     env->efer = sregs.efer;
     //cpu_set_apic_tpr(env, sregs.cr8);
@@ -1230,7 +1230,7 @@ int kvm_arch_halt(CPUState *env)
 int kvm_arch_pre_run(CPUState *env, struct kvm_run *run)
 {
     if (!kvm_irqchip_in_kernel())
-	kvm_set_cr8(env, cpu_get_apic_tpr(env));
+	kvm_set_cr8(env, cpu_get_apic_tpr(env->apic_state));
     return 0;
 }