]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
KVM: x86: remove duplicate checks for ioapic
authorDavid Hildenbrand <david@redhat.com>
Fri, 7 Apr 2017 08:50:26 +0000 (10:50 +0200)
committerRadim Krčmář <rkrcmar@redhat.com>
Wed, 12 Apr 2017 18:17:14 +0000 (20:17 +0200)
When handling KVM_GET_IRQCHIP, we already check irqchip_kernel(), which
implies a fully inititalized ioapic.

Signed-off-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
arch/x86/kvm/ioapic.c

index da66650e3313296d038fcbda7250339286a54689..f8e988a14e8da6c5e9999051061e6eb3a5ead84d 100644 (file)
@@ -645,8 +645,6 @@ void kvm_ioapic_destroy(struct kvm *kvm)
 int kvm_get_ioapic(struct kvm *kvm, struct kvm_ioapic_state *state)
 {
        struct kvm_ioapic *ioapic = kvm->arch.vioapic;
-       if (!ioapic)
-               return -EINVAL;
 
        spin_lock(&ioapic->lock);
        memcpy(state, ioapic, sizeof(struct kvm_ioapic_state));
@@ -658,8 +656,6 @@ int kvm_get_ioapic(struct kvm *kvm, struct kvm_ioapic_state *state)
 int kvm_set_ioapic(struct kvm *kvm, struct kvm_ioapic_state *state)
 {
        struct kvm_ioapic *ioapic = kvm->arch.vioapic;
-       if (!ioapic)
-               return -EINVAL;
 
        spin_lock(&ioapic->lock);
        memcpy(ioapic, state, sizeof(struct kvm_ioapic_state));