From: Alex Williamson <alex.williamson@redhat.com>
To: mst@redhat.com
Cc: jan.kiszka@siemens.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH v3 8/8] msix: Switch msix_uninit to return void
Date: Thu, 14 Jun 2012 12:16:57 -0600 [thread overview]
Message-ID: <20120614181656.23440.43744.stgit@bling.home> (raw)
In-Reply-To: <20120614181104.23440.62204.stgit@bling.home>
It can't fail.
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
---
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);
next prev parent reply other threads:[~2012-06-14 18:17 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-14 18:15 [Qemu-devel] [PATCH v3 0/8] msix: Support specifying offsets, BARs, and capability location Alex Williamson
2012-06-14 18:15 ` [Qemu-devel] [PATCH v3 1/8] msix: Add simple BAR allocation MSIX setup functions Alex Williamson
2012-06-14 18:16 ` [Qemu-devel] [PATCH v3 2/8] ivshmem: Convert to msix_init_exclusive_bar() interface Alex Williamson
2012-06-14 18:16 ` [Qemu-devel] [PATCH v3 3/8] virtio: " Alex Williamson
2012-06-14 18:16 ` [Qemu-devel] [PATCH v3 4/8] msix: Move msix_mmio_read Alex Williamson
2012-06-14 18:16 ` [Qemu-devel] [PATCH v3 5/8] msix: Note endian TODO item Alex Williamson
2012-06-14 18:16 ` [Qemu-devel] [PATCH v3 6/8] msix: Split PBA into it's own MemoryRegion Alex Williamson
2012-06-14 18:16 ` [Qemu-devel] [PATCH v3 7/8] msix: Allow full specification of MSIX layout Alex Williamson
2012-06-14 18:16 ` Alex Williamson [this message]
2012-06-14 21:31 ` [Qemu-devel] [PATCH v3 0/8] msix: Support specifying offsets, BARs, and capability location Michael S. Tsirkin
2012-06-18 7:06 ` Jan Kiszka
2012-06-18 7:19 ` Michael S. Tsirkin
2012-06-18 9:23 ` Jan Kiszka
2012-06-18 9:57 ` Michael S. Tsirkin
2012-06-18 10:36 ` Jan Kiszka
2012-06-18 22:37 ` Jan Kiszka
2012-06-18 22:40 ` Michael S. Tsirkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120614181656.23440.43744.stgit@bling.home \
--to=alex.williamson@redhat.com \
--cc=jan.kiszka@siemens.com \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).