From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:54876) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SfEbP-0007GK-Jh for qemu-devel@nongnu.org; Thu, 14 Jun 2012 14:17:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SfEbN-0007rW-Mm for qemu-devel@nongnu.org; Thu, 14 Jun 2012 14:17:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1025) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SfEbN-0007rH-D1 for qemu-devel@nongnu.org; Thu, 14 Jun 2012 14:17:01 -0400 From: Alex Williamson Date: Thu, 14 Jun 2012 12:16:57 -0600 Message-ID: <20120614181656.23440.43744.stgit@bling.home> In-Reply-To: <20120614181104.23440.62204.stgit@bling.home> References: <20120614181104.23440.62204.stgit@bling.home> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH v3 8/8] msix: Switch msix_uninit to return void List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: mst@redhat.com Cc: jan.kiszka@siemens.com, qemu-devel@nongnu.org It can't fail. Signed-off-by: Alex Williamson --- hw/msix.c | 6 +++--- hw/msix.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/msix.c b/hw/msix.c index 15f8d7d..fd9ea95 100644 --- a/hw/msix.c +++ b/hw/msix.c @@ -328,10 +328,10 @@ static void msix_free_irq_entries(PCIDevice *dev) } /* Clean up resources for the device. */ -int msix_uninit(PCIDevice *dev, MemoryRegion *table_bar, MemoryRegion *pba_bar) +void msix_uninit(PCIDevice *dev, MemoryRegion *table_bar, MemoryRegion *pba_bar) { if (!msix_present(dev)) { - return 0; + return; } pci_del_capability(dev, PCI_CAP_ID_MSIX, MSIX_CAP_LENGTH); dev->msix_cap = 0; @@ -348,7 +348,7 @@ int msix_uninit(PCIDevice *dev, MemoryRegion *table_bar, MemoryRegion *pba_bar) g_free(dev->msix_entry_used); dev->msix_entry_used = NULL; dev->cap_present &= ~QEMU_PCI_CAP_MSIX; - return 0; + return; } void msix_uninit_exclusive_bar(PCIDevice *dev) diff --git a/hw/msix.h b/hw/msix.h index f637797..1786e27 100644 --- a/hw/msix.h +++ b/hw/msix.h @@ -13,8 +13,8 @@ int msix_init_exclusive_bar(PCIDevice *dev, unsigned short nentries, void msix_write_config(PCIDevice *dev, uint32_t address, uint32_t val, int len); -int msix_uninit(PCIDevice *dev, MemoryRegion *table_bar, - MemoryRegion *pba_bar); +void msix_uninit(PCIDevice *dev, MemoryRegion *table_bar, + MemoryRegion *pba_bar); void msix_uninit_exclusive_bar(PCIDevice *dev); unsigned int msix_nr_vectors_allocated(const PCIDevice *dev);