From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:57387) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SbYfM-0004zG-Fr for qemu-devel@nongnu.org; Mon, 04 Jun 2012 10:54:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SbYfI-0001xr-Bn for qemu-devel@nongnu.org; Mon, 04 Jun 2012 10:53:56 -0400 Received: from david.siemens.de ([192.35.17.14]:24553) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SbYfI-0001wh-1m for qemu-devel@nongnu.org; Mon, 04 Jun 2012 10:53:52 -0400 Message-ID: <4FCCCBFC.5080303@siemens.com> Date: Mon, 04 Jun 2012 16:53:48 +0200 From: Jan Kiszka MIME-Version: 1.0 References: <20120604144837.GA30538@redhat.com> In-Reply-To: <20120604144837.GA30538@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH v4 8/8] msi: Use msi/msix_present more consistently List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Michael S. Tsirkin" Cc: qemu-devel On 2012-06-04 16:48, Michael S. Tsirkin wrote: > On Fri, May 11, 2012 at 11:42:41AM -0300, Jan Kiszka wrote: >> Replace some open-coded msi/msix_present checks. >> >> Signed-off-by: Jan Kiszka > > This last one doesn't apply but I don't expect this blocks > anything. Applied 1-7 for now. Hmm, might have rebased here but forgot to send: ---8<---- Replace some open-coded msi/msix_present checks. Signed-off-by: Jan Kiszka --- hw/msi.c | 2 +- hw/msix.c | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/hw/msi.c b/hw/msi.c index 556c7c4..5233204 100644 --- a/hw/msi.c +++ b/hw/msi.c @@ -175,7 +175,7 @@ void msi_uninit(struct PCIDevice *dev) uint16_t flags; uint8_t cap_size; - if (!(dev->cap_present & QEMU_PCI_CAP_MSI)) { + if (!msi_present(dev)) { return; } flags = pci_get_word(dev->config + msi_flags_off(dev)); diff --git a/hw/msix.c b/hw/msix.c index 339e652..ded3c55 100644 --- a/hw/msix.c +++ b/hw/msix.c @@ -319,8 +319,9 @@ static void msix_free_irq_entries(PCIDevice *dev) /* Clean up resources for the device. */ int msix_uninit(PCIDevice *dev, MemoryRegion *bar) { - if (!(dev->cap_present & QEMU_PCI_CAP_MSIX)) + if (!msix_present(dev)) { return 0; + } pci_del_capability(dev, PCI_CAP_ID_MSIX, MSIX_CAP_LENGTH); dev->msix_cap = 0; msix_free_irq_entries(dev); @@ -339,7 +340,7 @@ void msix_save(PCIDevice *dev, QEMUFile *f) { unsigned n = dev->msix_entries_nr; - if (!(dev->cap_present & QEMU_PCI_CAP_MSIX)) { + if (!msix_present(dev)) { return; } @@ -353,7 +354,7 @@ void msix_load(PCIDevice *dev, QEMUFile *f) unsigned n = dev->msix_entries_nr; unsigned int vector; - if (!(dev->cap_present & QEMU_PCI_CAP_MSIX)) { + if (!msix_present(dev)) { return; } @@ -407,8 +408,9 @@ void msix_notify(PCIDevice *dev, unsigned vector) void msix_reset(PCIDevice *dev) { - if (!(dev->cap_present & QEMU_PCI_CAP_MSIX)) + if (!msix_present(dev)) { return; + } msix_free_irq_entries(dev); dev->config[dev->msix_cap + MSIX_CONTROL_OFFSET] &= ~dev->wmask[dev->msix_cap + MSIX_CONTROL_OFFSET]; @@ -447,8 +449,9 @@ void msix_vector_unuse(PCIDevice *dev, unsigned vector) void msix_unuse_all_vectors(PCIDevice *dev) { - if (!(dev->cap_present & QEMU_PCI_CAP_MSIX)) + if (!msix_present(dev)) { return; + } msix_free_irq_entries(dev); } -- 1.7.3.4