Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 807f12e5 authored by Guo Chao's avatar Guo Chao Committed by Marcelo Tosatti
Browse files

KVM: remove unnecessary return value check 



No need to check return value before breaking switch.

Signed-off-by: default avatarGuo Chao <yan@linux.vnet.ibm.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent 951179ce

arch/x86/kvm/x86.c

+0 −32
Original line number Diff line number Diff line
@@ -2696,9 +2696,6 @@ long kvm_arch_vcpu_ioctl(struct file *filp, 
			return PTR_ERR(u.lapic);



		r = kvm_vcpu_ioctl_set_lapic(vcpu, u.lapic);

		if (r)

			goto out;

		r = 0;

		break;

	}

	case KVM_INTERRUPT: {
@@ -2708,16 +2705,10 @@ long kvm_arch_vcpu_ioctl(struct file *filp, 
		if (copy_from_user(&irq, argp, sizeof irq))

			goto out;

		r = kvm_vcpu_ioctl_interrupt(vcpu, &irq);

		if (r)

			goto out;

		r = 0;

		break;

	}

	case KVM_NMI: {

		r = kvm_vcpu_ioctl_nmi(vcpu);

		if (r)

			goto out;

		r = 0;

		break;

	}

	case KVM_SET_CPUID: {
@@ -2728,8 +2719,6 @@ long kvm_arch_vcpu_ioctl(struct file *filp, 
		if (copy_from_user(&cpuid, cpuid_arg, sizeof cpuid))

			goto out;

		r = kvm_vcpu_ioctl_set_cpuid(vcpu, &cpuid, cpuid_arg->entries);

		if (r)

			goto out;

		break;

	}

	case KVM_SET_CPUID2: {
@@ -2741,8 +2730,6 @@ long kvm_arch_vcpu_ioctl(struct file *filp, 
			goto out;

		r = kvm_vcpu_ioctl_set_cpuid2(vcpu, &cpuid,

					      cpuid_arg->entries);

		if (r)

			goto out;

		break;

	}

	case KVM_GET_CPUID2: {
@@ -3207,8 +3194,6 @@ long kvm_arch_vm_ioctl(struct file *filp, 
	switch (ioctl) {

	case KVM_SET_TSS_ADDR:

		r = kvm_vm_ioctl_set_tss_addr(kvm, arg);

		if (r < 0)

			goto out;

		break;

	case KVM_SET_IDENTITY_MAP_ADDR: {

		u64 ident_addr;
@@ -3217,14 +3202,10 @@ long kvm_arch_vm_ioctl(struct file *filp, 
		if (copy_from_user(&ident_addr, argp, sizeof ident_addr))

			goto out;

		r = kvm_vm_ioctl_set_identity_map_addr(kvm, ident_addr);

		if (r < 0)

			goto out;

		break;

	}

	case KVM_SET_NR_MMU_PAGES:

		r = kvm_vm_ioctl_set_nr_mmu_pages(kvm, arg);

		if (r)

			goto out;

		break;

	case KVM_GET_NR_MMU_PAGES:

		r = kvm_vm_ioctl_get_nr_mmu_pages(kvm);
@@ -3315,8 +3296,6 @@ long kvm_arch_vm_ioctl(struct file *filp, 
		r = 0;

	get_irqchip_out:

		kfree(chip);

		if (r)

			goto out;

		break;

	}

	case KVM_SET_IRQCHIP: {
@@ -3338,8 +3317,6 @@ long kvm_arch_vm_ioctl(struct file *filp, 
		r = 0;

	set_irqchip_out:

		kfree(chip);

		if (r)

			goto out;

		break;

	}

	case KVM_GET_PIT: {
@@ -3366,9 +3343,6 @@ long kvm_arch_vm_ioctl(struct file *filp, 
		if (!kvm->arch.vpit)

			goto out;

		r = kvm_vm_ioctl_set_pit(kvm, &u.ps);

		if (r)

			goto out;

		r = 0;

		break;

	}

	case KVM_GET_PIT2: {
@@ -3392,9 +3366,6 @@ long kvm_arch_vm_ioctl(struct file *filp, 
		if (!kvm->arch.vpit)

			goto out;

		r = kvm_vm_ioctl_set_pit2(kvm, &u.ps2);

		if (r)

			goto out;

		r = 0;

		break;

	}

	case KVM_REINJECT_CONTROL: {
@@ -3403,9 +3374,6 @@ long kvm_arch_vm_ioctl(struct file *filp, 
		if (copy_from_user(&control, argp, sizeof(control)))

			goto out;

		r = kvm_vm_ioctl_reinject(kvm, &control);

		if (r)

			goto out;

		r = 0;

		break;

	}

	case KVM_XEN_HVM_CONFIG: {

virt/kvm/kvm_main.c

+0 −30
Original line number Diff line number Diff line
@@ -1929,10 +1929,6 @@ static long kvm_vcpu_ioctl(struct file *filp, 
			goto out;

		}

		r = kvm_arch_vcpu_ioctl_set_regs(vcpu, kvm_regs);

		if (r)

			goto out_free2;

		r = 0;

out_free2:

		kfree(kvm_regs);

		break;

	}
@@ -1958,9 +1954,6 @@ static long kvm_vcpu_ioctl(struct file *filp, 
			goto out;

		}

		r = kvm_arch_vcpu_ioctl_set_sregs(vcpu, kvm_sregs);

		if (r)

			goto out;

		r = 0;

		break;

	}

	case KVM_GET_MP_STATE: {
@@ -1982,9 +1975,6 @@ static long kvm_vcpu_ioctl(struct file *filp, 
		if (copy_from_user(&mp_state, argp, sizeof mp_state))

			goto out;

		r = kvm_arch_vcpu_ioctl_set_mpstate(vcpu, &mp_state);

		if (r)

			goto out;

		r = 0;

		break;

	}

	case KVM_TRANSLATE: {
@@ -2009,9 +1999,6 @@ static long kvm_vcpu_ioctl(struct file *filp, 
		if (copy_from_user(&dbg, argp, sizeof dbg))

			goto out;

		r = kvm_arch_vcpu_ioctl_set_guest_debug(vcpu, &dbg);

		if (r)

			goto out;

		r = 0;

		break;

	}

	case KVM_SET_SIGNAL_MASK: {
@@ -2059,9 +2046,6 @@ static long kvm_vcpu_ioctl(struct file *filp, 
			goto out;

		}

		r = kvm_arch_vcpu_ioctl_set_fpu(vcpu, fpu);

		if (r)

			goto out;

		r = 0;

		break;

	}

	default:
@@ -2131,8 +2115,6 @@ static long kvm_vm_ioctl(struct file *filp, 
	switch (ioctl) {

	case KVM_CREATE_VCPU:

		r = kvm_vm_ioctl_create_vcpu(kvm, arg);

		if (r < 0)

			goto out;

		break;

	case KVM_SET_USER_MEMORY_REGION: {

		struct kvm_userspace_memory_region kvm_userspace_mem;
@@ -2143,8 +2125,6 @@ static long kvm_vm_ioctl(struct file *filp, 
			goto out;



		r = kvm_vm_ioctl_set_memory_region(kvm, &kvm_userspace_mem, 1);

		if (r)

			goto out;

		break;

	}

	case KVM_GET_DIRTY_LOG: {
@@ -2154,8 +2134,6 @@ static long kvm_vm_ioctl(struct file *filp, 
		if (copy_from_user(&log, argp, sizeof log))

			goto out;

		r = kvm_vm_ioctl_get_dirty_log(kvm, &log);

		if (r)

			goto out;

		break;

	}

#ifdef KVM_COALESCED_MMIO_PAGE_OFFSET
@@ -2165,9 +2143,6 @@ static long kvm_vm_ioctl(struct file *filp, 
		if (copy_from_user(&zone, argp, sizeof zone))

			goto out;

		r = kvm_vm_ioctl_register_coalesced_mmio(kvm, &zone);

		if (r)

			goto out;

		r = 0;

		break;

	}

	case KVM_UNREGISTER_COALESCED_MMIO: {
@@ -2176,9 +2151,6 @@ static long kvm_vm_ioctl(struct file *filp, 
		if (copy_from_user(&zone, argp, sizeof zone))

			goto out;

		r = kvm_vm_ioctl_unregister_coalesced_mmio(kvm, &zone);

		if (r)

			goto out;

		r = 0;

		break;

	}

#endif
@@ -2287,8 +2259,6 @@ static long kvm_vm_compat_ioctl(struct file *filp, 
		log.dirty_bitmap = compat_ptr(compat_log.dirty_bitmap);



		r = kvm_vm_ioctl_get_dirty_log(kvm, &log);

		if (r)

			goto out;

		break;

	}

	default: