mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vfio/pci: Rename INTx functions for easier tracing

Browse Source 
Rename functions and tracing callbacks so that we can trace vfio_intx*
to see all the INTx related activities.

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
This commit is contained in:
Alex Williamson 2015-09-23 13:04:43 -06:00
parent b5bd049fa9
commit 870cb6f104
2 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
hw/vfio/pci.c
View File

@ -247,7 +247,7 @@ static void vfio_intx_interrupt(void *opaque)
} }
} }
static void vfio_eoi(VFIODevice *vbasedev) static void vfio_intx_eoi(VFIODevice *vbasedev)
{ {
VFIOPCIDevice *vdev = container_of(vbasedev, VFIOPCIDevice, vbasedev); VFIOPCIDevice *vdev = container_of(vbasedev, VFIOPCIDevice, vbasedev);
@ -255,14 +255,14 @@ static void vfio_eoi(VFIODevice *vbasedev)
return; return;
} }
trace_vfio_eoi(vbasedev->name); trace_vfio_intx_eoi(vbasedev->name);
vdev->intx.pending = false; vdev->intx.pending = false;
pci_irq_deassert(&vdev->pdev); pci_irq_deassert(&vdev->pdev);
vfio_unmask_single_irqindex(vbasedev, VFIO_PCI_INTX_IRQ_INDEX); vfio_unmask_single_irqindex(vbasedev, VFIO_PCI_INTX_IRQ_INDEX);
} }
static void vfio_enable_intx_kvm(VFIOPCIDevice *vdev) static void vfio_intx_enable_kvm(VFIOPCIDevice *vdev)
{ {
#ifdef CONFIG_KVM #ifdef CONFIG_KVM
struct kvm_irqfd irqfd = { struct kvm_irqfd irqfd = {
@ -324,7 +324,7 @@ static void vfio_enable_intx_kvm(VFIOPCIDevice *vdev)
vdev->intx.kvm_accel = true; vdev->intx.kvm_accel = true;
trace_vfio_enable_intx_kvm(vdev->vbasedev.name); trace_vfio_intx_enable_kvm(vdev->vbasedev.name);
return; return;
@ -339,7 +339,7 @@ fail:
#endif #endif
} }
static void vfio_disable_intx_kvm(VFIOPCIDevice *vdev) static void vfio_intx_disable_kvm(VFIOPCIDevice *vdev)
{ {
#ifdef CONFIG_KVM #ifdef CONFIG_KVM
struct kvm_irqfd irqfd = { struct kvm_irqfd irqfd = {
@ -376,11 +376,11 @@ static void vfio_disable_intx_kvm(VFIOPCIDevice *vdev)
/* If we've missed an event, let it re-fire through QEMU */ /* If we've missed an event, let it re-fire through QEMU */
vfio_unmask_single_irqindex(&vdev->vbasedev, VFIO_PCI_INTX_IRQ_INDEX); vfio_unmask_single_irqindex(&vdev->vbasedev, VFIO_PCI_INTX_IRQ_INDEX);
trace_vfio_disable_intx_kvm(vdev->vbasedev.name); trace_vfio_intx_disable_kvm(vdev->vbasedev.name);
#endif #endif
} }
static void vfio_update_irq(PCIDevice *pdev) static void vfio_intx_update(PCIDevice *pdev)
{ {
VFIOPCIDevice *vdev = DO_UPCAST(VFIOPCIDevice, pdev, pdev); VFIOPCIDevice *vdev = DO_UPCAST(VFIOPCIDevice, pdev, pdev);
PCIINTxRoute route; PCIINTxRoute route;
@ -395,10 +395,10 @@ static void vfio_update_irq(PCIDevice *pdev)
return; /* Nothing changed */ return; /* Nothing changed */
} }
trace_vfio_update_irq(vdev->vbasedev.name, trace_vfio_intx_update(vdev->vbasedev.name,
vdev->intx.route.irq, route.irq); vdev->intx.route.irq, route.irq);
vfio_disable_intx_kvm(vdev); vfio_intx_disable_kvm(vdev);
vdev->intx.route = route; vdev->intx.route = route;
@ -406,13 +406,13 @@ static void vfio_update_irq(PCIDevice *pdev)
return; return;
} }
vfio_enable_intx_kvm(vdev); vfio_intx_enable_kvm(vdev);
/* Re-enable the interrupt in cased we missed an EOI */ /* Re-enable the interrupt in cased we missed an EOI */
vfio_eoi(&vdev->vbasedev); vfio_intx_eoi(&vdev->vbasedev);
} }
static int vfio_enable_intx(VFIOPCIDevice *vdev) static int vfio_intx_enable(VFIOPCIDevice *vdev)
{ {
uint8_t pin = vfio_pci_read_config(&vdev->pdev, PCI_INTERRUPT_PIN, 1); uint8_t pin = vfio_pci_read_config(&vdev->pdev, PCI_INTERRUPT_PIN, 1);
int ret, argsz; int ret, argsz;
@ -467,21 +467,21 @@ static int vfio_enable_intx(VFIOPCIDevice *vdev)
return -errno; return -errno;
} }
vfio_enable_intx_kvm(vdev); vfio_intx_enable_kvm(vdev);
vdev->interrupt = VFIO_INT_INTx; vdev->interrupt = VFIO_INT_INTx;
trace_vfio_enable_intx(vdev->vbasedev.name); trace_vfio_intx_enable(vdev->vbasedev.name);
return 0; return 0;
} }
static void vfio_disable_intx(VFIOPCIDevice *vdev) static void vfio_intx_disable(VFIOPCIDevice *vdev)
{ {
int fd; int fd;
timer_del(vdev->intx.mmap_timer); timer_del(vdev->intx.mmap_timer);
vfio_disable_intx_kvm(vdev); vfio_intx_disable_kvm(vdev);
vfio_disable_irqindex(&vdev->vbasedev, VFIO_PCI_INTX_IRQ_INDEX); vfio_disable_irqindex(&vdev->vbasedev, VFIO_PCI_INTX_IRQ_INDEX);
vdev->intx.pending = false; vdev->intx.pending = false;
pci_irq_deassert(&vdev->pdev); pci_irq_deassert(&vdev->pdev);
@ -493,7 +493,7 @@ static void vfio_disable_intx(VFIOPCIDevice *vdev)
vdev->interrupt = VFIO_INT_NONE; vdev->interrupt = VFIO_INT_NONE;
trace_vfio_disable_intx(vdev->vbasedev.name); trace_vfio_intx_disable(vdev->vbasedev.name);
} }
/* /*
@ -876,7 +876,7 @@ static void vfio_disable_msi_common(VFIOPCIDevice *vdev)
vdev->nr_vectors = 0; vdev->nr_vectors = 0;
vdev->interrupt = VFIO_INT_NONE; vdev->interrupt = VFIO_INT_NONE;
vfio_enable_intx(vdev); vfio_intx_enable(vdev);
} }
static void vfio_disable_msix(VFIOPCIDevice *vdev) static void vfio_disable_msix(VFIOPCIDevice *vdev)
@ -2154,7 +2154,7 @@ static void vfio_disable_interrupts(VFIOPCIDevice *vdev)
} }
if (vdev->interrupt == VFIO_INT_INTx) { if (vdev->interrupt == VFIO_INT_INTx) {
vfio_disable_intx(vdev); vfio_intx_disable(vdev);
} }
} }
@ -2777,7 +2777,7 @@ static void vfio_pci_pre_reset(VFIOPCIDevice *vdev)
static void vfio_pci_post_reset(VFIOPCIDevice *vdev) static void vfio_pci_post_reset(VFIOPCIDevice *vdev)
{ {
vfio_enable_intx(vdev); vfio_intx_enable(vdev);
} }
static bool vfio_pci_host_match(PCIHostDeviceAddress *host1, static bool vfio_pci_host_match(PCIHostDeviceAddress *host1,
@ -3001,7 +3001,7 @@ static void vfio_pci_compute_needs_reset(VFIODevice *vbasedev)
static VFIODeviceOps vfio_pci_ops = { static VFIODeviceOps vfio_pci_ops = {
.vfio_compute_needs_reset = vfio_pci_compute_needs_reset, .vfio_compute_needs_reset = vfio_pci_compute_needs_reset,
.vfio_hot_reset_multi = vfio_pci_hot_reset_multi, .vfio_hot_reset_multi = vfio_pci_hot_reset_multi,
.vfio_eoi = vfio_eoi, .vfio_eoi = vfio_intx_eoi,
}; };
static int vfio_populate_device(VFIOPCIDevice *vdev) static int vfio_populate_device(VFIOPCIDevice *vdev)
@ -3631,8 +3631,8 @@ static int vfio_initfn(PCIDevice *pdev)
if (vfio_pci_read_config(&vdev->pdev, PCI_INTERRUPT_PIN, 1)) { if (vfio_pci_read_config(&vdev->pdev, PCI_INTERRUPT_PIN, 1)) {
vdev->intx.mmap_timer = timer_new_ms(QEMU_CLOCK_VIRTUAL, vdev->intx.mmap_timer = timer_new_ms(QEMU_CLOCK_VIRTUAL,
vfio_intx_mmap_enable, vdev); vfio_intx_mmap_enable, vdev);
pci_device_set_intx_routing_notifier(&vdev->pdev, vfio_update_irq); pci_device_set_intx_routing_notifier(&vdev->pdev, vfio_intx_update);
ret = vfio_enable_intx(vdev); ret = vfio_intx_enable(vdev);
if (ret) { if (ret) {
goto out_teardown; goto out_teardown;
} }

14
trace-events
View File

@ -1522,14 +1522,14 @@ xen_pv_mmio_write(uint64_t addr) "WARNING: write to Xen PV Device MMIO space (ad
pci_cfg_read(const char *dev, unsigned devid, unsigned fnid, unsigned offs, unsigned val) "%s %02u:%u @0x%x -> 0x%x" pci_cfg_read(const char *dev, unsigned devid, unsigned fnid, unsigned offs, unsigned val) "%s %02u:%u @0x%x -> 0x%x"
pci_cfg_write(const char *dev, unsigned devid, unsigned fnid, unsigned offs, unsigned val) "%s %02u:%u @0x%x <- 0x%x" pci_cfg_write(const char *dev, unsigned devid, unsigned fnid, unsigned offs, unsigned val) "%s %02u:%u @0x%x <- 0x%x"
# hw/vfio/vfio-pci.c # hw/vfio/pci.c
vfio_intx_interrupt(const char *name, char line) " (%s) Pin %c" vfio_intx_interrupt(const char *name, char line) " (%s) Pin %c"
vfio_eoi(const char *name) " (%s) EOI" vfio_intx_eoi(const char *name) " (%s) EOI"
vfio_enable_intx_kvm(const char *name) " (%s) KVM INTx accel enabled" vfio_intx_enable_kvm(const char *name) " (%s) KVM INTx accel enabled"
vfio_disable_intx_kvm(const char *name) " (%s) KVM INTx accel disabled" vfio_intx_disable_kvm(const char *name) " (%s) KVM INTx accel disabled"
vfio_update_irq(const char *name, int new_irq, int target_irq) " (%s) IRQ moved %d -> %d" vfio_intx_update(const char *name, int new_irq, int target_irq) " (%s) IRQ moved %d -> %d"
vfio_enable_intx(const char *name) " (%s)" vfio_intx_enable(const char *name) " (%s)"
vfio_disable_intx(const char *name) " (%s)" vfio_intx_disable(const char *name) " (%s)"
vfio_msi_interrupt(const char *name, int index, uint64_t addr, int data) " (%s) vector %d 0x%"PRIx64"/0x%x" vfio_msi_interrupt(const char *name, int index, uint64_t addr, int data) " (%s) vector %d 0x%"PRIx64"/0x%x"
vfio_msix_vector_do_use(const char *name, int index) " (%s) vector %d used" vfio_msix_vector_do_use(const char *name, int index) " (%s) vector %d used"
vfio_msix_vector_release(const char *name, int index) " (%s) vector %d released" vfio_msix_vector_release(const char *name, int index) " (%s) vector %d released"