summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Williamson2012-06-14 20:16:57 +0200
committerMichael S. Tsirkin2012-06-18 09:21:12 +0200
commit572992eefa74bfb92c24a28bd268de91a9311b0f (patch)
tree0869bd5d6c39bdf1005e6dcf67c02bd5b6f7d765
parentmsix: Allow full specification of MSIX layout (diff)
downloadqemu-572992eefa74bfb92c24a28bd268de91a9311b0f.tar.gz
qemu-572992eefa74bfb92c24a28bd268de91a9311b0f.tar.xz
qemu-572992eefa74bfb92c24a28bd268de91a9311b0f.zip
msix: Switch msix_uninit to return void
It can't fail. Signed-off-by: Alex Williamson <alex.williamson@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-rw-r--r--hw/msix.c6
-rw-r--r--hw/msix.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/hw/msix.c b/hw/msix.c
index 15f8d7dfa7..fd9ea95da1 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 f637797b8f..1786e2766b 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);