diff options
| author |   Glauber Costa <glommer@redhat.com> | 2009-10-09 15:03:11 -0300 |
|---|---|---|
| committer |   Marcelo Tosatti <mtosatti@redhat.com> | 2009-10-13 14:01:06 -0300 |
| commit | 7e37138ee78a097b5717ed5513a5bf6808f2a0f7 (patch) | |
| tree | 1924e5e7323826137974a2ca41afba4269d614b3 /qemu-kvm.c | |
| parent | drop kvm_mmio_read and write (diff) | |
| download | qemu-kvm-7e37138ee78a097b5717ed5513a5bf6808f2a0f7.tar.gz qemu-kvm-7e37138ee78a097b5717ed5513a5bf6808f2a0f7.tar.bz2 qemu-kvm-7e37138ee78a097b5717ed5513a5bf6808f2a0f7.zip | |
remove unneded opaque.
kvm_debug() and kvm_arch_halt() both take an opaque field for no reason,
since it is totally unused. kvm_halt() itself is just a wrapper around
kvm_arch_halt(), and is removed.
Signed-off-by: Glauber Costa <glommer@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'qemu-kvm.c')
| -rw-r--r-- | qemu-kvm.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/qemu-kvm.c b/qemu-kvm.c index a52b0745f..35a3be4dd 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -97,11 +97,10 @@ int kvm_abi = EXPECTED_KVM_API_VERSION; int kvm_page_size; #ifdef KVM_CAP_SET_GUEST_DEBUG -static int kvm_debug(void *opaque, void *data, +static int kvm_debug(CPUState *env, struct kvm_debug_exit_arch *arch_info) { int handle = kvm_arch_debug(arch_info); - CPUState *env = data; if (handle) { kvm_debug_cpu_requested = env; @@ -816,9 +815,8 @@ int handle_debug(kvm_vcpu_context_t vcpu, void *env) { #ifdef KVM_CAP_SET_GUEST_DEBUG struct kvm_run *run = vcpu->run; - kvm_context_t kvm = vcpu->kvm; - return kvm_debug(kvm->opaque, env, &run->debug.arch); + return kvm_debug(env, &run->debug.arch); #else return 0; #endif @@ -895,11 +893,6 @@ int handle_io_window(kvm_context_t kvm) return 1; } -int handle_halt(kvm_vcpu_context_t vcpu) -{ - return kvm_arch_halt(vcpu->kvm->opaque, vcpu); -} - int handle_shutdown(kvm_context_t kvm, CPUState *env) { /* stop the current vcpu from going back to guest mode */ @@ -1019,7 +1012,7 @@ int kvm_run(kvm_vcpu_context_t vcpu, void *env) r = handle_mmio(vcpu); break; case KVM_EXIT_HLT: - r = handle_halt(vcpu); + r = kvm_arch_halt(vcpu); break; case KVM_EXIT_IRQ_WINDOW_OPEN: break; |