summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlauber Costa <glommer@redhat.com>2009-10-19 11:29:25 -0200
committerMarcelo Tosatti <mtosatti@redhat.com>2009-10-20 14:35:36 -0200
commit1440f73422af2beaffb9463a0321c970fb77e993 (patch)
treeec9d43c551f927f483aaabdbb8ad606acfa84cc1
parentuse upstream version of kvm_arch_post_run (diff)
downloadqemu-kvm-1440f73422af2beaffb9463a0321c970fb77e993.tar.gz
qemu-kvm-1440f73422af2beaffb9463a0321c970fb77e993.tar.bz2
qemu-kvm-1440f73422af2beaffb9463a0321c970fb77e993.zip
move tpr stuff to qemu-kvm-x86.c
this whole tpr thing does not belong in common code. Move it to i386 specific files. Signed-off-by: Glauber Costa <glommer@redhat.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
-rw-r--r--qemu-kvm-x86.c7
-rw-r--r--qemu-kvm.c6
2 files changed, 7 insertions, 6 deletions
diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c
index eb9d13a89..0dcbd4488 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;
}
@@ -1386,6 +1390,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 cc91194a9..aff87e9f0 100644
--- a/qemu-kvm.c
+++ b/qemu-kvm.c
@@ -1907,9 +1907,6 @@ static void *ap_main_loop(void *_env)
cpu_single_env = env;
kvm_arch_init_vcpu(env);
-#ifdef TARGET_I386
- kvm_tpr_vcpu_start(env);
-#endif
kvm_arch_load_regs(env);
@@ -1965,9 +1962,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);