move tpr stuff to qemu-kvm-x86.c

Commit Message

Glauber Costa Oct. 19, 2009, 1:29 p.m. UTC

None

Patch

diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c
index db0b351..12da778 100644
--- a/qemu-kvm-x86.c
+++ b/qemu-kvm-x86.c
@@ -157,6 +157,10 @@  int kvm_arch_create(kvm_context_t kvm, unsigned long phys_mem_bytes,
 	if (r < 0)
 		return r;
 
+#ifdef KVM_EXIT_TPR_ACCESS
+    kvm_tpr_opt_setup();
+#endif
+
 	return 0;
 }
 
@@ -1305,6 +1309,9 @@  int kvm_arch_init_vcpu(CPUState *cenv)
     }
 #endif
 
+#ifdef KVM_EXIT_TPR_ACCESS
+    kvm_tpr_vcpu_start(cenv);
+#endif
     return 0;
 }
 
diff --git a/qemu-kvm.c b/qemu-kvm.c
index 57d8b1a..54cc12d 100644
--- a/qemu-kvm.c
+++ b/qemu-kvm.c
@@ -1865,9 +1865,6 @@  static int kvm_main_loop_cpu(CPUState *env)
     pthread_mutex_lock(&qemu_mutex);
 
     kvm_arch_init_vcpu(env);
-#ifdef TARGET_I386
-    kvm_tpr_vcpu_start(env);
-#endif
 
     cpu_single_env = env;
     kvm_arch_load_regs(env);
@@ -1960,9 +1957,6 @@  int kvm_init_ap(void)
 {
     struct sigaction action;
 
-#ifdef TARGET_I386
-    kvm_tpr_opt_setup();
-#endif
     qemu_add_vm_change_state_handler(kvm_vm_state_change_handler, NULL);
 
     signal(SIG_IPI, sig_ipi_handler);