KVM: x86: Replace irq_requested with guest_intr_type
PATCH 2/4 KVM: x86: Replace irq_requested with guest_intr_type
Signed-off-by Sheng Yang <[email protected]>
--- arch/x86/kvm/x86.c | 8 ++++---- include/linux/kvm_host.h | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-)
arch/x86/kvm/x86.c +4 -4
@@ -170,7 +170,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->guest_intr_type)free_irq (assigned_dev->host_irq, (void *)assigned_dev);kvm_unregister_irq_ack_notifier (kvm, &assigned_dev->ack_notifier);
@@ -209,7 +209,7 @@ static int assigned_device_update_irq(struct kvm *kvm, struct kvm_assigned_dev_kernel *assigned_dev, struct kvm_assigned_irq *assigned_irq) { -if (assigned_dev->irq_requested) { +if (assigned_dev->guest_intr_type ==KVM_ASSIGNED_DEV_INTR ) { assigned_dev->guest_irq = assigned_irq->guest_irq; assigned_dev->ack_notifier.gsi = assigned_irq->guest_irq;return 0 ;
@@ -236,7 +236,7 @@ static int assigned_device_update_irq(struct kvm *kvm, 0, "kvm_assigned_device", (void *)assigned_dev))return -EIO ; } - assigned_dev->irq_requested = true; + assigned_dev->guest_intr_type =KVM_ASSIGNED_DEV_INTR ;return 0 ; }
@@ -257,7 +257,7 @@ static int kvm_vm_ioctl_assign_irq(struct kvm *kvm,return -EINVAL ; } -if (!match->irq_requested) +if (!match->guest_intr_type)INIT_WORK (&match->interrupt_work, kvm_assigned_dev_interrupt_work_handler);
include/linux/kvm_host.h +2 -1
@@ -301,7 +301,8 @@ struct kvm_assigned_dev_kernel {int host_devfn;int host_irq;int guest_irq; -int irq_requested; +#define KVM_ASSIGNED_DEV_INTR 1 +int guest_intr_type;struct pci_dev *dev;struct kvm *kvm; };
Signature · 1 line
1.5.4.5