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>,
	Igor Mammedov <imammedo@redhat.com>
Subject: [Qemu-devel] [PULL 7/7] vhost: fail backend intialization early
Date: Fri, 16 Oct 2015 11:49:43 +0300	[thread overview]
Message-ID: <1444985258-6605-8-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1444985258-6605-1-git-send-email-mst@redhat.com>

From: Igor Mammedov <imammedo@redhat.com>

Don't initialize vhost backend if memslots number exceeds the supported
limit. This prevents failures down the road when backend
is actually started.

[MST: rewrite commit log]

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 hw/virtio/vhost.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index a3b4f9e..f14a5c5 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -933,6 +933,12 @@ int vhost_dev_init(struct vhost_dev *hdev, void *opaque,
         return -errno;
     }
 
+    if (used_memslots > hdev->vhost_ops->vhost_backend_memslots_limit(hdev)) {
+        fprintf(stderr, "vhost backend memory slots limit is less"
+                " than current number of present memory slots\n");
+        close((uintptr_t)opaque);
+        return -1;
+    }
     QLIST_INSERT_HEAD(&vhost_devices, hdev, entry);
 
     r = hdev->vhost_ops->vhost_call(hdev, VHOST_SET_OWNER, NULL);
-- 
MST

  parent reply	other threads:[~2015-10-16  8:49 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-16  8:49 [Qemu-devel] [PULL 0/7] vhost, pc features, fixes Michael S. Tsirkin
2015-10-16  8:49 ` [Qemu-devel] [PULL 1/7] intel_iommu: Add support for translation for devices behind bridges Michael S. Tsirkin
2015-10-16  8:49 ` [Qemu-devel] [PULL 2/7] exec: factor out duplicate mmap code Michael S. Tsirkin
2015-10-25 15:04   ` Paolo Bonzini
2015-10-16  8:49 ` [Qemu-devel] [PULL 3/7] net: don't set native endianness Michael S. Tsirkin
2015-10-16  8:49 ` [Qemu-devel] [PULL 4/7] tests: re-enable vhost-user-test Michael S. Tsirkin
2015-10-16  8:49 ` [Qemu-devel] [PULL 5/7] vhost: add vhost_has_free_slot() interface Michael S. Tsirkin
2015-10-16  8:49 ` [Qemu-devel] [PULL 6/7] pc-dimm: add vhost slots limit check before commiting to hotplug Michael S. Tsirkin
2015-10-16  8:49 ` Michael S. Tsirkin [this message]
2015-10-16 18:11 ` [Qemu-devel] [PULL 0/7] vhost, pc features, fixes 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=1444985258-6605-8-git-send-email-mst@redhat.com \
    --to=mst@redhat.com \
    --cc=imammedo@redhat.com \
    --cc=peter.maydell@linaro.org \
    --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).