From: Avi Kivity <avi@redhat.com>
Date: Mon, 10 Aug 2009 14:00:52 +0000 (+0300)
Subject: KVM: Move #endif KVM_CAP_IRQ_ROUTING to correct place
X-Git-Tag: firefly_0821_release~12973^2~26
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6621fbc2c6add9c9abfc87d7bc9b248ffd307ae3;p=firefly-linux-kernel-4.4.55.git

KVM: Move #endif KVM_CAP_IRQ_ROUTING to correct place

The symbol only controls irq routing, not MSI-X.

Signed-off-by: Avi Kivity <avi@redhat.com>
---

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 4470251ddc53..1df4c0422f68 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -2236,6 +2236,7 @@ static long kvm_vm_ioctl(struct file *filp,
 		vfree(entries);
 		break;
 	}
+#endif /* KVM_CAP_IRQ_ROUTING */
 #ifdef __KVM_HAVE_MSIX
 	case KVM_ASSIGN_SET_MSIX_NR: {
 		struct kvm_assigned_msix_nr entry_nr;
@@ -2258,7 +2259,6 @@ static long kvm_vm_ioctl(struct file *filp,
 		break;
 	}
 #endif
-#endif /* KVM_CAP_IRQ_ROUTING */
 	case KVM_IRQFD: {
 		struct kvm_irqfd data;