From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40574) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjNlt-0005w5-RX for qemu-devel@nongnu.org; Tue, 06 Oct 2015 04:38:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZjNlo-0007bG-Rc for qemu-devel@nongnu.org; Tue, 06 Oct 2015 04:38:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52687) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjNkc-0006wH-OH for qemu-devel@nongnu.org; Tue, 06 Oct 2015 04:37:34 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 742DC2DD2FC for ; Tue, 6 Oct 2015 08:37:34 +0000 (UTC) From: Igor Mammedov Date: Tue, 6 Oct 2015 10:37:28 +0200 Message-Id: <1444120649-197078-3-git-send-email-imammedo@redhat.com> In-Reply-To: <1444120649-197078-1-git-send-email-imammedo@redhat.com> References: <1444120649-197078-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH v4 2/3] pc-dimm: add vhost slots limit check before commiting to hotplug List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: marcel@redhat.com, mst@redhat.com it allows safely cancel memory hotplug if vhost backend doesn't support necessary amount of memory slots and prevents QEMU crashing in vhost due to hitting vhost limit on amount of supported memory ranges. Signed-off-by: Igor Mammedov --- hw/mem/pc-dimm.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index 6cc6ac3..dbf1b3a 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -25,6 +25,7 @@ #include "sysemu/numa.h" #include "sysemu/kvm.h" #include "trace.h" +#include "hw/virtio/vhost.h" typedef struct pc_dimms_capacity { uint64_t size; @@ -96,6 +97,12 @@ void pc_dimm_memory_plug(DeviceState *dev, MemoryHotplugState *hpms, goto out; } + if (!vhost_has_free_slot()) { + error_setg(&local_err, "a used vhost backend has no free" + " memory slots left"); + goto out; + } + memory_region_add_subregion(&hpms->mr, addr - hpms->base, mr); vmstate_register_ram(mr, dev); numa_set_mem_node_id(addr, memory_region_size(mr), dimm->node); -- 1.8.3.1