mirror of
https://github.com/torvalds/linux.git
synced 2024-12-08 12:11:30 +00:00
KVM: x86: simplify conditions with split/kernel irqchip
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: David Hildenbrand <david@redhat.com> Signed-off-by: Radim Krčmář <rkrcmar@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
8231f50d98
commit
826da32140
@ -400,7 +400,7 @@ int kvm_setup_empty_irq_routing(struct kvm *kvm)
|
|||||||
|
|
||||||
void kvm_arch_post_irq_routing_update(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;
|
return;
|
||||||
kvm_make_scan_ioapic_request(kvm);
|
kvm_make_scan_ioapic_request(kvm);
|
||||||
}
|
}
|
||||||
|
@ -4027,7 +4027,7 @@ long kvm_arch_vm_ioctl(struct file *filp,
|
|||||||
}
|
}
|
||||||
|
|
||||||
r = -ENXIO;
|
r = -ENXIO;
|
||||||
if (!irqchip_in_kernel(kvm) || irqchip_split(kvm))
|
if (!irqchip_kernel(kvm))
|
||||||
goto get_irqchip_out;
|
goto get_irqchip_out;
|
||||||
r = kvm_vm_ioctl_get_irqchip(kvm, chip);
|
r = kvm_vm_ioctl_get_irqchip(kvm, chip);
|
||||||
if (r)
|
if (r)
|
||||||
@ -4051,7 +4051,7 @@ long kvm_arch_vm_ioctl(struct file *filp,
|
|||||||
}
|
}
|
||||||
|
|
||||||
r = -ENXIO;
|
r = -ENXIO;
|
||||||
if (!irqchip_in_kernel(kvm) || irqchip_split(kvm))
|
if (!irqchip_kernel(kvm))
|
||||||
goto set_irqchip_out;
|
goto set_irqchip_out;
|
||||||
r = kvm_vm_ioctl_set_irqchip(kvm, chip);
|
r = kvm_vm_ioctl_set_irqchip(kvm, chip);
|
||||||
if (r)
|
if (r)
|
||||||
|
Loading…
Reference in New Issue
Block a user