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 6/7] pc-dimm: add vhost slots limit check before commiting to hotplug
Date: Fri, 16 Oct 2015 11:49:39 +0300 [thread overview]
Message-ID: <1444985258-6605-7-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>
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>
---
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 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);
--
MST
next prev 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 ` Michael S. Tsirkin [this message]
2015-10-16 8:49 ` [Qemu-devel] [PULL 7/7] vhost: fail backend intialization early Michael S. Tsirkin
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-7-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).