summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlauber Costa <glommer@redhat.com>2009-10-19 11:20:44 -0200
committerMarcelo Tosatti <mtosatti@redhat.com>2009-10-20 12:59:17 -0200
commit10b3429c66b0be7dcbd169dea208f98262bb0b52 (patch)
treee1fee0e242ad79d5485ee831977c88c836fbc060 /qemu-kvm-x86.c
parentchange pre and post kvm_run signatures. (diff)
downloadqemu-kvm-10b3429c66b0be7dcbd169dea208f98262bb0b52.tar.gz
qemu-kvm-10b3429c66b0be7dcbd169dea208f98262bb0b52.tar.bz2
qemu-kvm-10b3429c66b0be7dcbd169dea208f98262bb0b52.zip
use upstream version of kvm_arch_post_run
Replace ours with qemu.git version. A couple of functions go unused, and are deleted. Signed-off-by: Glauber Costa <glommer@redhat.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'qemu-kvm-x86.c')
-rw-r--r--qemu-kvm-x86.c22
1 files changed, 0 insertions, 22 deletions
diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c
index f4d9e7a7c..eb9d13a89 100644
--- a/qemu-kvm-x86.c
+++ b/qemu-kvm-x86.c
@@ -538,21 +538,11 @@ void kvm_show_regs(CPUState *env)
sregs.efer);
}
-static uint64_t kvm_get_apic_base(CPUState *env)
-{
- return env->kvm_run->apic_base;
-}
-
static void kvm_set_cr8(CPUState *env, uint64_t cr8)
{
env->kvm_run->cr8 = cr8;
}
-static __u64 kvm_get_cr8(CPUState *env)
-{
- return env->kvm_run->cr8;
-}
-
int kvm_setup_cpuid(CPUState *env, int nent,
struct kvm_cpuid_entry *entries)
{
@@ -1417,18 +1407,6 @@ int kvm_arch_pre_run(CPUState *env, struct kvm_run *run)
return 0;
}
-int kvm_arch_post_run(CPUState *env, struct kvm_run *run)
-{
- cpu_single_env = env;
-
- env->eflags = kvm_get_interrupt_flag(env)
- ? env->eflags | IF_MASK : env->eflags & ~IF_MASK;
-
- cpu_set_apic_tpr(env, kvm_get_cr8(env));
- cpu_set_apic_base(env, kvm_get_apic_base(env));
- return 0;
-}
-
int kvm_arch_has_work(CPUState *env)
{
if (((env->interrupt_request & CPU_INTERRUPT_HARD) &&