Commit 826da321 authored by Radim Krčmář's avatar Radim Krčmář
Browse files

KVM: x86: simplify conditions with split/kernel irqchip 



Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Signed-off-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 8231f50d

arch/x86/kvm/irq_comm.c

+1 −1
Original line number Diff line number Diff line
@@ -400,7 +400,7 @@ int kvm_setup_empty_irq_routing(struct kvm *kvm) 


void kvm_arch_post_irq_routing_update(struct kvm *kvm)

{

	if (ioapic_in_kernel(kvm) || !irqchip_in_kernel(kvm))

	if (!irqchip_split(kvm))

		return;

	kvm_make_scan_ioapic_request(kvm);

}

arch/x86/kvm/x86.c

+2 −2
Original line number Diff line number Diff line
@@ -4027,7 +4027,7 @@ long kvm_arch_vm_ioctl(struct file *filp, 
		}



		r = -ENXIO;

		if (!irqchip_in_kernel(kvm) || irqchip_split(kvm))

		if (!irqchip_kernel(kvm))

			goto get_irqchip_out;

		r = kvm_vm_ioctl_get_irqchip(kvm, chip);

		if (r)
@@ -4051,7 +4051,7 @@ long kvm_arch_vm_ioctl(struct file *filp, 
		}



		r = -ENXIO;

		if (!irqchip_in_kernel(kvm) || irqchip_split(kvm))

		if (!irqchip_kernel(kvm))

			goto set_irqchip_out;

		r = kvm_vm_ioctl_set_irqchip(kvm, chip);

		if (r)