From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MNRJG-0006KJ-Ge for qemu-devel@nongnu.org; Sun, 05 Jul 2009 08:59:10 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MNRJB-0006IM-Pv for qemu-devel@nongnu.org; Sun, 05 Jul 2009 08:59:10 -0400 Received: from [199.232.76.173] (port=57733 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MNRJB-0006IE-JE for qemu-devel@nongnu.org; Sun, 05 Jul 2009 08:59:05 -0400 Received: from mx2.redhat.com ([66.187.237.31]:37541) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MNRJB-0004v2-1C for qemu-devel@nongnu.org; Sun, 05 Jul 2009 08:59:05 -0400 Date: Sun, 5 Jul 2009 15:58:23 +0300 From: "Michael S. Tsirkin" Message-ID: <20090705125823.GB5417@redhat.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Subject: [Qemu-devel] [PATCHv5 1/5] qemu/msi: fix segfault in msix_save List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, avi@redhat.com, kvm@vger.kernel.org, aliguori@us.ibm.com, kwolf@redhat.com, glommer@redhat.com, blauwirbel@gmail.com This fixes segfault reported by Kevin Wolf, and simplifies the code in msix_save. Reported-by: Kevin Wolf Signed-off-by: Michael S. Tsirkin --- hw/msix.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/hw/msix.c b/hw/msix.c index 4ab6da6..d0f9695 100644 --- a/hw/msix.c +++ b/hw/msix.c @@ -284,11 +284,13 @@ int msix_uninit(PCIDevice *dev) void msix_save(PCIDevice *dev, QEMUFile *f) { - unsigned nentries = (pci_get_word(dev->config + PCI_MSIX_FLAGS) & - PCI_MSIX_FLAGS_QSIZE) + 1; - qemu_put_buffer(f, dev->msix_table_page, nentries * MSIX_ENTRY_SIZE); - qemu_put_buffer(f, dev->msix_table_page + MSIX_PAGE_PENDING, - (nentries + 7) / 8); + unsigned n = dev->msix_entries_nr; + + if (!(dev->cap_present & QEMU_PCI_CAP_MSIX)) { + return; + } + qemu_put_buffer(f, dev->msix_table_page, n * MSIX_ENTRY_SIZE); + qemu_put_buffer(f, dev->msix_table_page + MSIX_PAGE_PENDING, (n + 7) / 8); } /* Should be called after restoring the config space. */ -- 1.6.2.2