From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56767) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VVkMJ-0004Ef-3A for qemu-devel@nongnu.org; Mon, 14 Oct 2013 11:47:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VVkMD-0003sd-3a for qemu-devel@nongnu.org; Mon, 14 Oct 2013 11:47:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40442) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VVkMC-0003sX-RP for qemu-devel@nongnu.org; Mon, 14 Oct 2013 11:46:57 -0400 Message-ID: <1381765604.2796.134.camel@ul30vt.home> From: Alex Williamson Date: Mon, 14 Oct 2013 09:46:44 -0600 In-Reply-To: <1381762577-12526-9-git-send-email-mst@redhat.com> References: <1381762577-12526-1-git-send-email-mst@redhat.com> <1381762577-12526-9-git-send-email-mst@redhat.com> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PULL 08/43] hw/vfio: set interrupts using pci irq wrappers List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Michael S. Tsirkin" Cc: peter.maydell@linaro.org, marcel.a@redhat.com, qemu-devel@nongnu.org, kraxel@redhat.com, Anthony Liguori , imammedo@redhat.com On Mon, 2013-10-14 at 17:58 +0300, Michael S. Tsirkin wrote: > From: Marcel Apfelbaum > > pci_set_irq and the other pci irq wrappers use > PCI_INTERRUPT_PIN config register to compute device > INTx pin to assert/deassert. > > save INTX pin into the config register before calling > pci_set_irq > > Signed-off-by: Marcel Apfelbaum > Signed-off-by: Michael S. Tsirkin I realize this is a pull request, but for the record Acked-by: Alex Williamson > --- > hw/misc/vfio.c | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) > > diff --git a/hw/misc/vfio.c b/hw/misc/vfio.c > index a1c08fb..9d02e49 100644 > --- a/hw/misc/vfio.c > +++ b/hw/misc/vfio.c > @@ -297,7 +297,7 @@ static void vfio_intx_interrupt(void *opaque) > 'A' + vdev->intx.pin); > > vdev->intx.pending = true; > - qemu_set_irq(vdev->pdev.irq[vdev->intx.pin], 1); > + pci_irq_assert(&vdev->pdev); > vfio_mmap_set_enabled(vdev, false); > if (vdev->intx.mmap_timeout) { > timer_mod(vdev->intx.mmap_timer, > @@ -315,7 +315,7 @@ static void vfio_eoi(VFIODevice *vdev) > vdev->host.bus, vdev->host.slot, vdev->host.function); > > vdev->intx.pending = false; > - qemu_set_irq(vdev->pdev.irq[vdev->intx.pin], 0); > + pci_irq_deassert(&vdev->pdev); > vfio_unmask_intx(vdev); > } > > @@ -341,7 +341,7 @@ static void vfio_enable_intx_kvm(VFIODevice *vdev) > qemu_set_fd_handler(irqfd.fd, NULL, NULL, vdev); > vfio_mask_intx(vdev); > vdev->intx.pending = false; > - qemu_set_irq(vdev->pdev.irq[vdev->intx.pin], 0); > + pci_irq_deassert(&vdev->pdev); > > /* Get an eventfd for resample/unmask */ > if (event_notifier_init(&vdev->intx.unmask, 0)) { > @@ -417,7 +417,7 @@ static void vfio_disable_intx_kvm(VFIODevice *vdev) > */ > vfio_mask_intx(vdev); > vdev->intx.pending = false; > - qemu_set_irq(vdev->pdev.irq[vdev->intx.pin], 0); > + pci_irq_deassert(&vdev->pdev); > > /* Tell KVM to stop listening for an INTx irqfd */ > if (kvm_vm_ioctl(kvm_state, KVM_IRQFD, &irqfd)) { > @@ -488,6 +488,7 @@ static int vfio_enable_intx(VFIODevice *vdev) > vfio_disable_interrupts(vdev); > > vdev->intx.pin = pin - 1; /* Pin A (1) -> irq[0] */ > + pci_config_set_interrupt_pin(vdev->pdev.config, pin); > > #ifdef CONFIG_KVM > /* > @@ -547,7 +548,7 @@ static void vfio_disable_intx(VFIODevice *vdev) > vfio_disable_intx_kvm(vdev); > vfio_disable_irqindex(vdev, VFIO_PCI_INTX_IRQ_INDEX); > vdev->intx.pending = false; > - qemu_set_irq(vdev->pdev.irq[vdev->intx.pin], 0); > + pci_irq_deassert(&vdev->pdev); > vfio_mmap_set_enabled(vdev, true); > > fd = event_notifier_get_fd(&vdev->intx.interrupt);