From: "Michael S. Tsirkin" <mst@redhat.com> 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 Subject: [PATCHv4 1/5] qemu/msi: fix segfault in msix_save Date: Sun, 5 Jul 2009 14:40:31 +0300 [thread overview] Message-ID: <20090705114031.GB4798@redhat.com> (raw) In-Reply-To: <cover.1246793893.git.mst@redhat.com> This fixes segfault reported by Kevin Wolf, and simplifies the code in msix_save. Reported-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> --- Fixed brace usage reported by Blue Swirl. hw/msix.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/hw/msix.c b/hw/msix.c index 4ab6da6..b67ea39 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
WARNING: multiple messages have this Message-ID (diff)
From: "Michael S. Tsirkin" <mst@redhat.com> 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 Subject: [Qemu-devel] [PATCHv4 1/5] qemu/msi: fix segfault in msix_save Date: Sun, 5 Jul 2009 14:40:31 +0300 [thread overview] Message-ID: <20090705114031.GB4798@redhat.com> (raw) In-Reply-To: <cover.1246793893.git.mst@redhat.com> This fixes segfault reported by Kevin Wolf, and simplifies the code in msix_save. Reported-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> --- Fixed brace usage reported by Blue Swirl. hw/msix.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/hw/msix.c b/hw/msix.c index 4ab6da6..b67ea39 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
next parent reply other threads:[~2009-07-05 11:41 UTC|newest] Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <cover.1246793893.git.mst@redhat.com> 2009-07-05 11:40 ` Michael S. Tsirkin [this message] 2009-07-05 11:40 ` [Qemu-devel] [PATCHv4 1/5] qemu/msi: fix segfault in msix_save Michael S. Tsirkin 2009-07-05 11:40 ` [PATCHv4 2/5] qemu/virtio: remove control vector save Michael S. Tsirkin 2009-07-05 11:40 ` [Qemu-devel] " Michael S. Tsirkin 2009-07-05 11:40 ` [PATCHv4 3/5] qemu/msi: clean used vectors state on load Michael S. Tsirkin 2009-07-05 11:40 ` [Qemu-devel] " Michael S. Tsirkin 2009-07-05 11:40 ` [PATCHv4 4/5] qemu/msi: missing braces Michael S. Tsirkin 2009-07-05 11:40 ` [Qemu-devel] " Michael S. Tsirkin 2009-07-05 11:48 ` Blue Swirl 2009-07-05 11:48 ` [Qemu-devel] " Blue Swirl 2009-07-05 11:56 ` Michael S. Tsirkin 2009-07-05 11:56 ` [Qemu-devel] " Michael S. Tsirkin 2009-07-05 12:03 ` Blue Swirl 2009-07-05 12:03 ` [Qemu-devel] " Blue Swirl 2009-07-05 12:07 ` Avi Kivity 2009-07-05 12:07 ` [Qemu-devel] " Avi Kivity 2009-07-05 13:18 ` Michael S. Tsirkin 2009-07-05 13:18 ` [Qemu-devel] " Michael S. Tsirkin 2009-07-05 11:41 ` [PATCHv4 5/5] qemu/virtio: mark msi vectors used on load Michael S. Tsirkin 2009-07-05 11:41 ` [Qemu-devel] " 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=20090705114031.GB4798@redhat.com \ --to=mst@redhat.com \ --cc=aliguori@us.ibm.com \ --cc=avi@redhat.com \ --cc=blauwirbel@gmail.com \ --cc=glommer@redhat.com \ --cc=kvm@vger.kernel.org \ --cc=kwolf@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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.