aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaurabh Sengar <saurabh.truth@gmail.com>2015-10-30 03:26:11 -0400
committerPaolo Bonzini <pbonzini@redhat.com>2015-11-04 10:24:31 -0500
commit2da29bccc5045ea10c70cb3a69be777768fd0b66 (patch)
treecb75b67f4e3d9274cf30dec499981618955aaede
parent6956d8946d5d1cb2ac913caa8d4259a4d0e00c48 (diff)
KVM: x86: removing unused variable
removing unused variables, found by coccinelle Signed-off-by: Saurabh Sengar <saurabh.truth@gmail.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--arch/x86/kvm/x86.c16
1 files changed, 5 insertions, 11 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 9e9c226cb79d..57b5f79aad08 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -3438,41 +3438,35 @@ static int kvm_vm_ioctl_set_irqchip(struct kvm *kvm, struct kvm_irqchip *chip)
3438 3438
3439static int kvm_vm_ioctl_get_pit(struct kvm *kvm, struct kvm_pit_state *ps) 3439static int kvm_vm_ioctl_get_pit(struct kvm *kvm, struct kvm_pit_state *ps)
3440{ 3440{
3441 int r = 0;
3442
3443 mutex_lock(&kvm->arch.vpit->pit_state.lock); 3441 mutex_lock(&kvm->arch.vpit->pit_state.lock);
3444 memcpy(ps, &kvm->arch.vpit->pit_state, sizeof(struct kvm_pit_state)); 3442 memcpy(ps, &kvm->arch.vpit->pit_state, sizeof(struct kvm_pit_state));
3445 mutex_unlock(&kvm->arch.vpit->pit_state.lock); 3443 mutex_unlock(&kvm->arch.vpit->pit_state.lock);
3446 return r; 3444 return 0;
3447} 3445}
3448 3446
3449static int kvm_vm_ioctl_set_pit(struct kvm *kvm, struct kvm_pit_state *ps) 3447static int kvm_vm_ioctl_set_pit(struct kvm *kvm, struct kvm_pit_state *ps)
3450{ 3448{
3451 int r = 0;
3452
3453 mutex_lock(&kvm->arch.vpit->pit_state.lock); 3449 mutex_lock(&kvm->arch.vpit->pit_state.lock);
3454 memcpy(&kvm->arch.vpit->pit_state, ps, sizeof(struct kvm_pit_state)); 3450 memcpy(&kvm->arch.vpit->pit_state, ps, sizeof(struct kvm_pit_state));
3455 kvm_pit_load_count(kvm, 0, ps->channels[0].count, 0); 3451 kvm_pit_load_count(kvm, 0, ps->channels[0].count, 0);
3456 mutex_unlock(&kvm->arch.vpit->pit_state.lock); 3452 mutex_unlock(&kvm->arch.vpit->pit_state.lock);
3457 return r; 3453 return 0;
3458} 3454}
3459 3455
3460static int kvm_vm_ioctl_get_pit2(struct kvm *kvm, struct kvm_pit_state2 *ps) 3456static int kvm_vm_ioctl_get_pit2(struct kvm *kvm, struct kvm_pit_state2 *ps)
3461{ 3457{
3462 int r = 0;
3463
3464 mutex_lock(&kvm->arch.vpit->pit_state.lock); 3458 mutex_lock(&kvm->arch.vpit->pit_state.lock);
3465 memcpy(ps->channels, &kvm->arch.vpit->pit_state.channels, 3459 memcpy(ps->channels, &kvm->arch.vpit->pit_state.channels,
3466 sizeof(ps->channels)); 3460 sizeof(ps->channels));
3467 ps->flags = kvm->arch.vpit->pit_state.flags; 3461 ps->flags = kvm->arch.vpit->pit_state.flags;
3468 mutex_unlock(&kvm->arch.vpit->pit_state.lock); 3462 mutex_unlock(&kvm->arch.vpit->pit_state.lock);
3469 memset(&ps->reserved, 0, sizeof(ps->reserved)); 3463 memset(&ps->reserved, 0, sizeof(ps->reserved));
3470 return r; 3464 return 0;
3471} 3465}
3472 3466
3473static int kvm_vm_ioctl_set_pit2(struct kvm *kvm, struct kvm_pit_state2 *ps) 3467static int kvm_vm_ioctl_set_pit2(struct kvm *kvm, struct kvm_pit_state2 *ps)
3474{ 3468{
3475 int r = 0, start = 0; 3469 int start = 0;
3476 u32 prev_legacy, cur_legacy; 3470 u32 prev_legacy, cur_legacy;
3477 mutex_lock(&kvm->arch.vpit->pit_state.lock); 3471 mutex_lock(&kvm->arch.vpit->pit_state.lock);
3478 prev_legacy = kvm->arch.vpit->pit_state.flags & KVM_PIT_FLAGS_HPET_LEGACY; 3472 prev_legacy = kvm->arch.vpit->pit_state.flags & KVM_PIT_FLAGS_HPET_LEGACY;
@@ -3484,7 +3478,7 @@ static int kvm_vm_ioctl_set_pit2(struct kvm *kvm, struct kvm_pit_state2 *ps)
3484 kvm->arch.vpit->pit_state.flags = ps->flags; 3478 kvm->arch.vpit->pit_state.flags = ps->flags;
3485 kvm_pit_load_count(kvm, 0, kvm->arch.vpit->pit_state.channels[0].count, start); 3479 kvm_pit_load_count(kvm, 0, kvm->arch.vpit->pit_state.channels[0].count, start);
3486 mutex_unlock(&kvm->arch.vpit->pit_state.lock); 3480 mutex_unlock(&kvm->arch.vpit->pit_state.lock);
3487 return r; 3481 return 0;
3488} 3482}
3489 3483
3490static int kvm_vm_ioctl_reinject(struct kvm *kvm, 3484static int kvm_vm_ioctl_reinject(struct kvm *kvm,