diff options
| author |   Glauber Costa <glommer@redhat.com> | 2009-10-19 11:20:44 -0200 |
|---|---|---|
| committer |   Marcelo Tosatti <mtosatti@redhat.com> | 2009-10-20 12:59:17 -0200 |
| commit | 10b3429c66b0be7dcbd169dea208f98262bb0b52 (patch) | |
| tree | e1fee0e242ad79d5485ee831977c88c836fbc060 /target-i386 | |
| parent | change pre and post kvm_run signatures. (diff) | |
| download | qemu-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 'target-i386')
| -rw-r--r-- | target-i386/kvm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 1cf0dc37b..24c990367 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -748,6 +748,7 @@ int kvm_arch_pre_run(CPUState *env, struct kvm_run *run) return 0; } +#endif int kvm_arch_post_run(CPUState *env, struct kvm_run *run) { @@ -762,6 +763,7 @@ int kvm_arch_post_run(CPUState *env, struct kvm_run *run) return 0; } +#ifdef KVM_UPSTREAM static int kvm_handle_halt(CPUState *env) { if (!((env->interrupt_request & CPU_INTERRUPT_HARD) && |