aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kvm/x86.c
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2010-05-13 05:35:17 -0400
committerAvi Kivity <avi@redhat.com>2010-08-01 03:35:48 -0400
commit93736624635235cc5372ffca6d62816d02170724 (patch)
tree801205636b4d6da4127a6d33873902d690431f52 /arch/x86/kvm/x86.c
parent19483d144023f7f4817dedafe26d5fe9ff2e7087 (diff)
KVM: Consolidate arch specific vcpu ioctl locking
Now that all arch specific ioctls have centralized locking, it is easy to move it to the central dispatcher. Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm/x86.c')
-rw-r--r--arch/x86/kvm/x86.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 999b017011f4..4c2096f30d90 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -2298,7 +2298,6 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
2298 int r; 2298 int r;
2299 struct kvm_lapic_state *lapic = NULL; 2299 struct kvm_lapic_state *lapic = NULL;
2300 2300
2301 vcpu_load(vcpu);
2302 switch (ioctl) { 2301 switch (ioctl) {
2303 case KVM_GET_LAPIC: { 2302 case KVM_GET_LAPIC: {
2304 r = -EINVAL; 2303 r = -EINVAL;
@@ -2496,7 +2495,6 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
2496 r = -EINVAL; 2495 r = -EINVAL;
2497 } 2496 }
2498out: 2497out:
2499 vcpu_put(vcpu);
2500 kfree(lapic); 2498 kfree(lapic);
2501 return r; 2499 return r;
2502} 2500}