KVM: Replace irq_requested with more generic irq_requested_type

Separate guest irq type and host irq type, for we can support guest using INTx
with host using MSI (but not opposite combination).

Signed-off-by: Sheng Yang <sheng@linux.intel.com>
Signed-off-by: Avi Kivity <avi@redhat.com>

diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 3a0fb77d1f6a437439ef2ba01f0d95aa49e060be..c3d4b96a08faac115ea0a9b2dd63ef14ea4323a6 100644 (file)
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -307,7 +307,9 @@ struct kvm_assigned_dev_kernel {
        int host_devfn;
        int host_irq;
        int guest_irq;
-       int irq_requested;
+#define KVM_ASSIGNED_DEV_GUEST_INTX    (1 << 0)
+#define KVM_ASSIGNED_DEV_HOST_INTX     (1 << 8)
+       unsigned long irq_requested_type;
        int irq_source_id;
        struct pci_dev *dev;
        struct kvm *kvm;

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index ef2f03cf42c0e2ac5f597bc4743097a8b05f1cb3..638de47e167de6135dec51f0cded47c116b90930 100644 (file)
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -140,7 +140,7 @@ static void kvm_free_assigned_device(struct kvm *kvm,
                                     struct kvm_assigned_dev_kernel
                                     *assigned_dev)
 {
-       if (irqchip_in_kernel(kvm) && assigned_dev->irq_requested)
+       if (irqchip_in_kernel(kvm) && assigned_dev->irq_requested_type)
                free_irq(assigned_dev->host_irq, (void *)assigned_dev);
 
        kvm_unregister_irq_ack_notifier(&assigned_dev->ack_notifier);
@@ -180,7 +180,7 @@ static int assigned_device_update_intx(struct kvm *kvm,
                        struct kvm_assigned_dev_kernel *adev,
                        struct kvm_assigned_irq *airq)
 {
-       if (adev->irq_requested) {
+       if (adev->irq_requested_type & KVM_ASSIGNED_DEV_GUEST_INTX) {
                adev->guest_irq = airq->guest_irq;
                adev->ack_notifier.gsi = airq->guest_irq;
                return 0;
@@ -207,7 +207,8 @@ static int assigned_device_update_intx(struct kvm *kvm,
                        return -EIO;
        }
 
-       adev->irq_requested = true;
+       adev->irq_requested_type = KVM_ASSIGNED_DEV_GUEST_INTX |
+                                  KVM_ASSIGNED_DEV_HOST_INTX;
        return 0;
 }
 
@@ -227,7 +228,7 @@ static int kvm_vm_ioctl_assign_irq(struct kvm *kvm,
                return -EINVAL;
        }
 
-       if (!match->irq_requested) {
+       if (!match->irq_requested_type) {
                INIT_WORK(&match->interrupt_work,
                                kvm_assigned_dev_interrupt_work_handler);
                if (irqchip_in_kernel(kvm)) {