Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-04 18:13:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

KVM: x86: simplify conditions with split/kernel irqchip

Browse Source 
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:
Radim Krčmář 2016-12-16 16:10:06 +01:00
parent 8231f50d98
commit 826da32140
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/kvm/irq_comm.c
View File

@ -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);
} }

4
arch/x86/kvm/x86.c
View File

@ -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)