qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
	Richard Henderson <rth@twiddle.net>
Subject: [Qemu-devel] [PULL 08/15] virtio: Notice when the system doesn't support MSIx at all
Date: Fri, 2 Oct 2015 16:45:33 +0300	[thread overview]
Message-ID: <1443793405-15190-9-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1443793405-15190-1-git-send-email-mst@redhat.com>

From: Richard Henderson <rth@twiddle.net>

And do not issue an error_report in that case.

Signed-off-by: Richard Henderson <rth@twiddle.net>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 hw/virtio/virtio-pci.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index eda8205..6703806 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -1491,12 +1491,17 @@ static void virtio_pci_device_plugged(DeviceState *d, Error **errp)
         pci_set_long(cfg_mask->pci_cfg_data, ~0x0);
     }
 
-    if (proxy->nvectors &&
-        msix_init_exclusive_bar(&proxy->pci_dev, proxy->nvectors,
-                                proxy->msix_bar)) {
-        error_report("unable to init msix vectors to %" PRIu32,
-                     proxy->nvectors);
-        proxy->nvectors = 0;
+    if (proxy->nvectors) {
+        int err = msix_init_exclusive_bar(&proxy->pci_dev, proxy->nvectors,
+                                          proxy->msix_bar);
+        if (err) {
+            /* Notice when a system that supports MSIx can't initialize it.  */
+            if (err != -ENOTSUP) {
+                error_report("unable to init msix vectors to %" PRIu32,
+                             proxy->nvectors);
+            }
+            proxy->nvectors = 0;
+        }
     }
 
     proxy->pci_dev.config_write = virtio_write_config;
-- 
MST

  parent reply	other threads:[~2015-10-02 13:45 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-02 13:44 [Qemu-devel] [PULL 00/15] virtio,pc features, fixes Michael S. Tsirkin
2015-10-02 13:45 ` [Qemu-devel] [PULL 01/15] virtio: introduce virtqueue_unmap_sg() Michael S. Tsirkin
2015-10-02 13:45 ` [Qemu-devel] [PULL 02/15] virtio: introduce virtqueue_discard() Michael S. Tsirkin
2015-10-02 13:45 ` [Qemu-devel] [PULL 03/15] virtio-net: correctly drop truncated packets Michael S. Tsirkin
2015-10-02 13:45 ` [Qemu-devel] [PULL 04/15] oslib: rework anonimous RAM allocation Michael S. Tsirkin
2015-10-02 14:18   ` Eric Blake
2015-10-02 13:45 ` [Qemu-devel] [PULL 05/15] oslib: allocate PROT_NONE pages on top of RAM Michael S. Tsirkin
2015-10-02 13:45 ` [Qemu-devel] [PULL 06/15] exec: " Michael S. Tsirkin
2015-10-02 13:45 ` [Qemu-devel] [PULL 07/15] pc: Add a comment explaining why pc_compat_2_4() doesn't exist Michael S. Tsirkin
2015-10-02 13:45 ` Michael S. Tsirkin [this message]
2015-10-02 13:45 ` [Qemu-devel] [PULL 09/15] virtio-9p: migrate virtio subsections Michael S. Tsirkin
2015-10-02 14:05   ` Michael S. Tsirkin
2015-10-02 13:45 ` [Qemu-devel] [PULL 10/15] vhost-user-test: do not reinvent glib-compat.h Michael S. Tsirkin
2015-10-02 13:45 ` [Qemu-devel] [PULL 11/15] vhost-user: unit test for new messages Michael S. Tsirkin
2015-10-02 13:45 ` [Qemu-devel] [PULL 12/15] memhp: extend address auto assignment to support gaps Michael S. Tsirkin
2015-10-02 13:45 ` [Qemu-devel] [PULL 13/15] pc: memhp: force gaps between DIMM's GPA Michael S. Tsirkin
2015-10-02 13:45 ` [Qemu-devel] [PULL 14/15] vhost-user-test: use tmpfs by default Michael S. Tsirkin
2015-10-05 22:39   ` Peter Maydell
2015-10-05 23:04     ` Michael S. Tsirkin
2015-10-05 23:17     ` Michael S. Tsirkin
2015-10-06  8:41       ` Peter Maydell
2015-10-06 11:07         ` Peter Maydell
2015-10-14 14:01       ` Marc-André Lureau
2015-10-02 13:46 ` [Qemu-devel] [PULL 15/15] vhost-user-test: fix predictable filename on tmpfs Michael S. Tsirkin
2015-10-02 14:06 ` [Qemu-devel] [PULL 00/15] virtio,pc features, fixes Michael S. Tsirkin
2015-10-02 16:06   ` Eric Blake
2015-10-02 16:27   ` Peter Maydell

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=1443793405-15190-9-git-send-email-mst@redhat.com \
    --to=mst@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=rth@twiddle.net \
    /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).