[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/14] hw/vfio/pci: generalize mask/unmask to any IRQ
From: |
Alex Williamson |
Subject: |
[Qemu-devel] [PULL 05/14] hw/vfio/pci: generalize mask/unmask to any IRQ index |
Date: |
Mon, 22 Dec 2014 13:43:40 -0700 |
User-agent: |
StGit/0.17-dirty |
From: Eric Auger <address@hidden>
To prepare for platform device introduction, rename vfio_mask_intx
and vfio_unmask_intx into vfio_mask_single_irqindex and respectively
unmask_single_irqindex. Also use a nex index parameter.
With that name and prototype the function will be usable for other
indexes than VFIO_PCI_INTX_IRQ_INDEX.
Signed-off-by: Eric Auger <address@hidden>
Signed-off-by: Alex Williamson <address@hidden>
---
hw/vfio/pci.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index f882dc7..7083151 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -293,12 +293,12 @@ static void vfio_disable_irqindex(VFIOPCIDevice *vdev,
int index)
/*
* INTx
*/
-static void vfio_unmask_intx(VFIOPCIDevice *vdev)
+static void vfio_unmask_single_irqindex(VFIOPCIDevice *vdev, int index)
{
struct vfio_irq_set irq_set = {
.argsz = sizeof(irq_set),
.flags = VFIO_IRQ_SET_DATA_NONE | VFIO_IRQ_SET_ACTION_UNMASK,
- .index = VFIO_PCI_INTX_IRQ_INDEX,
+ .index = index,
.start = 0,
.count = 1,
};
@@ -307,12 +307,12 @@ static void vfio_unmask_intx(VFIOPCIDevice *vdev)
}
#ifdef CONFIG_KVM /* Unused outside of CONFIG_KVM code */
-static void vfio_mask_intx(VFIOPCIDevice *vdev)
+static void vfio_mask_single_irqindex(VFIOPCIDevice *vdev, int index)
{
struct vfio_irq_set irq_set = {
.argsz = sizeof(irq_set),
.flags = VFIO_IRQ_SET_DATA_NONE | VFIO_IRQ_SET_ACTION_MASK,
- .index = VFIO_PCI_INTX_IRQ_INDEX,
+ .index = index,
.start = 0,
.count = 1,
};
@@ -381,7 +381,7 @@ static void vfio_eoi(VFIOPCIDevice *vdev)
vdev->intx.pending = false;
pci_irq_deassert(&vdev->pdev);
- vfio_unmask_intx(vdev);
+ vfio_unmask_single_irqindex(vdev, VFIO_PCI_INTX_IRQ_INDEX);
}
static void vfio_enable_intx_kvm(VFIOPCIDevice *vdev)
@@ -404,7 +404,7 @@ static void vfio_enable_intx_kvm(VFIOPCIDevice *vdev)
/* Get to a known interrupt state */
qemu_set_fd_handler(irqfd.fd, NULL, NULL, vdev);
- vfio_mask_intx(vdev);
+ vfio_mask_single_irqindex(vdev, VFIO_PCI_INTX_IRQ_INDEX);
vdev->intx.pending = false;
pci_irq_deassert(&vdev->pdev);
@@ -442,7 +442,7 @@ static void vfio_enable_intx_kvm(VFIOPCIDevice *vdev)
}
/* Let'em rip */
- vfio_unmask_intx(vdev);
+ vfio_unmask_single_irqindex(vdev, VFIO_PCI_INTX_IRQ_INDEX);
vdev->intx.kvm_accel = true;
@@ -458,7 +458,7 @@ fail_irqfd:
event_notifier_cleanup(&vdev->intx.unmask);
fail:
qemu_set_fd_handler(irqfd.fd, vfio_intx_interrupt, NULL, vdev);
- vfio_unmask_intx(vdev);
+ vfio_unmask_single_irqindex(vdev, VFIO_PCI_INTX_IRQ_INDEX);
#endif
}
@@ -479,7 +479,7 @@ static void vfio_disable_intx_kvm(VFIOPCIDevice *vdev)
* Get to a known state, hardware masked, QEMU ready to accept new
* interrupts, QEMU IRQ de-asserted.
*/
- vfio_mask_intx(vdev);
+ vfio_mask_single_irqindex(vdev, VFIO_PCI_INTX_IRQ_INDEX);
vdev->intx.pending = false;
pci_irq_deassert(&vdev->pdev);
@@ -497,7 +497,7 @@ static void vfio_disable_intx_kvm(VFIOPCIDevice *vdev)
vdev->intx.kvm_accel = false;
/* If we've missed an event, let it re-fire through QEMU */
- vfio_unmask_intx(vdev);
+ vfio_unmask_single_irqindex(vdev, VFIO_PCI_INTX_IRQ_INDEX);
trace_vfio_disable_intx_kvm(vdev->host.domain, vdev->host.bus,
vdev->host.slot, vdev->host.function);
- [Qemu-devel] [PULL 00/14] QEMU: VFIO updates, Alex Williamson, 2014/12/22
- [Qemu-devel] [PULL 01/14] vfio: migration to trace points, Alex Williamson, 2014/12/22
- [Qemu-devel] [PULL 02/14] vfio: fix adding memory listener to the right address space, Alex Williamson, 2014/12/22
- [Qemu-devel] [PULL 04/14] hw/vfio/pci: Rename VFIODevice into VFIOPCIDevice, Alex Williamson, 2014/12/22
- [Qemu-devel] [PULL 05/14] hw/vfio/pci: generalize mask/unmask to any IRQ index,
Alex Williamson <=
- [Qemu-devel] [PULL 06/14] hw/vfio/pci: introduce minimalist VFIODevice with fd, Alex Williamson, 2014/12/22
- [Qemu-devel] [PULL 07/14] hw/vfio/pci: add type, name and group fields in VFIODevice, Alex Williamson, 2014/12/22
- [Qemu-devel] [PULL 08/14] hw/vfio/pci: handle reset at VFIODevice, Alex Williamson, 2014/12/22
- [Qemu-devel] [PULL 09/14] hw/vfio/pci: Introduce VFIORegion, Alex Williamson, 2014/12/22
- [Qemu-devel] [PULL 10/14] hw/vfio/pci: split vfio_get_device, Alex Williamson, 2014/12/22
- [Qemu-devel] [PULL 11/14] hw/vfio/pci: rename group_list into vfio_group_list, Alex Williamson, 2014/12/22
- [Qemu-devel] [PULL 12/14] hw/vfio/pci: use name field in format strings, Alex Williamson, 2014/12/22
- [Qemu-devel] [PULL 13/14] hw/vfio: create common module, Alex Williamson, 2014/12/22
- [Qemu-devel] [PULL 14/14] vfio: Cleanup error_report()s, Alex Williamson, 2014/12/22
- [Qemu-devel] [PULL 03/14] vfio: move hw/misc/vfio.c to hw/vfio/pci.c Move vfio.h into include/hw/vfio, Alex Williamson, 2014/12/22