redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

KVM: Replace irq_requested with more generic irq_requested_type

Browse source 
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>
This commit is contained in:
Sheng Yang 2008-11-24 14:32:51 +08:00 committed by Avi Kivity
parent 00e3ed39e2
commit 4f906c19ae
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/linux/kvm_host.h
View file

@ -307,7 +307,9 @@ struct kvm_assigned_dev_kernel {
int host_devfn; int host_devfn;
int host_irq; int host_irq;
int guest_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; int irq_source_id;
struct pci_dev *dev; struct pci_dev *dev;
struct kvm *kvm; struct kvm *kvm;

9
virt/kvm/kvm_main.c
View file

@ -140,7 +140,7 @@ static void kvm_free_assigned_device(struct kvm *kvm,
struct kvm_assigned_dev_kernel struct kvm_assigned_dev_kernel
*assigned_dev) *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); free_irq(assigned_dev->host_irq, (void *)assigned_dev);
kvm_unregister_irq_ack_notifier(&assigned_dev->ack_notifier); 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_dev_kernel *adev,
struct kvm_assigned_irq *airq) 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->guest_irq = airq->guest_irq;
adev->ack_notifier.gsi = airq->guest_irq; adev->ack_notifier.gsi = airq->guest_irq;
return 0; return 0;
@ -207,7 +207,8 @@ static int assigned_device_update_intx(struct kvm *kvm,
return -EIO; return -EIO;
} }
adev->irq_requested = true; adev->irq_requested_type = KVM_ASSIGNED_DEV_GUEST_INTX |
KVM_ASSIGNED_DEV_HOST_INTX;
return 0; return 0;
} }
@ -227,7 +228,7 @@ static int kvm_vm_ioctl_assign_irq(struct kvm *kvm,
return -EINVAL; return -EINVAL;
} }
if (!match->irq_requested) { if (!match->irq_requested_type) {
INIT_WORK(&match->interrupt_work, INIT_WORK(&match->interrupt_work,
kvm_assigned_dev_interrupt_work_handler); kvm_assigned_dev_interrupt_work_handler);
if (irqchip_in_kernel(kvm)) { if (irqchip_in_kernel(kvm)) {