diff options
| author | Igor Mammedov <imammedo@redhat.com> | 2015-10-06 10:37:28 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2015-10-22 14:34:48 +0300 |
| commit | 3fad87881e55aaff659408dcf25fa204f89a7896 (patch) | |
| tree | 680288ecc2b6f16f16515f5af9822f8ecb3ddc37 /hw/mem | |
| parent | 2ce68e4cf5be9b5176a3c3c372948d6340724d2d (diff) | |
| download | qemu-3fad87881e55aaff659408dcf25fa204f89a7896.zip qemu-3fad87881e55aaff659408dcf25fa204f89a7896.tar.gz qemu-3fad87881e55aaff659408dcf25fa204f89a7896.tar.bz2 | |
pc-dimm: add vhost slots limit check before commiting to hotplug
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 <imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/mem')
| -rw-r--r-- | hw/mem/pc-dimm.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index 506fe0d..2bae994 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); |