From: Igor Mammedov <imammedo@redhat.com>
Date: Tue, 6 Oct 2015 08:37:29 +0000 (+0200)
Subject: vhost: fail backend intialization early
X-Git-Tag: v2.5.0-rc0~57^2~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aebf81680bf49c5953d7ae9ebb7b98c0f4dad8f3;p=thirdparty%2Fqemu.git

vhost: fail backend intialization early

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>
---

diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index a3b4f9e8ea1..f14a5c51335 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);