From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-ID: <1389368751.3209.294.camel@bling.home> Subject: Re: [PATCH v3 5/7] vfio: Use new interfaces for MSI/MSI-X enablement From: Alex Williamson To: Alexander Gordeev Cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org, linux-pci@vger.kernel.org Date: Fri, 10 Jan 2014 08:45:51 -0700 In-Reply-To: <20140110074247.GA4883@dhcp-26-207.brq.redhat.com> References: <1c2ab7cdd9f18f98ee86c73b182f4ee0697f7495.1389103215.git.agordeev@redhat.com> <1389119653.3209.124.camel@bling.home> <20140108074224.GA20157@dhcp-26-207.brq.redhat.com> <20140108075757.GB20157@dhcp-26-207.brq.redhat.com> <1389188753.3209.156.camel@bling.home> <20140110074247.GA4883@dhcp-26-207.brq.redhat.com> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: On Fri, 2014-01-10 at 08:42 +0100, Alexander Gordeev wrote: > Signed-off-by: Alexander Gordeev Thanks for the changes. Acked-by: Alex Williamson > --- > drivers/vfio/pci/vfio_pci_intrs.c | 12 ++++++++---- > 1 files changed, 8 insertions(+), 4 deletions(-) > > diff --git a/drivers/vfio/pci/vfio_pci_intrs.c b/drivers/vfio/pci/vfio_pci_intrs.c > index 641bc87..4a9db1d 100644 > --- a/drivers/vfio/pci/vfio_pci_intrs.c > +++ b/drivers/vfio/pci/vfio_pci_intrs.c > @@ -482,15 +482,19 @@ static int vfio_msi_enable(struct vfio_pci_device *vdev, int nvec, bool msix) > for (i = 0; i < nvec; i++) > vdev->msix[i].entry = i; > > - ret = pci_enable_msix(pdev, vdev->msix, nvec); > - if (ret) { > + ret = pci_enable_msix_range(pdev, vdev->msix, 1, nvec); > + if (ret < nvec) { > + if (ret > 0) > + pci_disable_msix(pdev); > kfree(vdev->msix); > kfree(vdev->ctx); > return ret; > } > } else { > - ret = pci_enable_msi_block(pdev, nvec); > - if (ret) { > + ret = pci_enable_msi_range(pdev, 1, nvec); > + if (ret < nvec) { > + if (ret > 0) > + pci_disable_msi(pdev); > kfree(vdev->ctx); > return ret; > } > -- > 1.7.7.6 >