[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 011/103] pc-dimm: do not allow to set already used me
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 011/103] pc-dimm: do not allow to set already used memdev |
Date: |
Tue, 17 Jun 2014 20:36:57 +0300 |
From: Igor Mammedov <address@hidden>
using the same memdev backend more than once will cause
assersion at MemoryRegion mapping time becase it's already
mapped. Prevent it by checking that associated MemoryRegion
is not mapped.
Signed-off-by: Igor Mammedov <address@hidden>
Acked-by: Peter Crosthwaite <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/mem/pc-dimm.c | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c
index b4937fe..3cced63 100644
--- a/hw/mem/pc-dimm.c
+++ b/hw/mem/pc-dimm.c
@@ -43,6 +43,21 @@ static void pc_dimm_get_size(Object *obj, Visitor *v, void
*opaque,
visit_type_int(v, &value, name, errp);
}
+static void pc_dimm_check_memdev_is_busy(Object *obj, const char *name,
+ Object *val, Error **errp)
+{
+ MemoryRegion *mr;
+
+ mr = host_memory_backend_get_memory(MEMORY_BACKEND(val), errp);
+ if (memory_region_is_mapped(mr)) {
+ char *path = object_get_canonical_path_component(val);
+ error_setg(errp, "can't use already busy memdev: %s", path);
+ g_free(path);
+ } else {
+ qdev_prop_allow_set_link_before_realize(obj, name, val, errp);
+ }
+}
+
static void pc_dimm_init(Object *obj)
{
PCDIMMDevice *dimm = PC_DIMM(obj);
@@ -51,7 +66,7 @@ static void pc_dimm_init(Object *obj)
NULL, NULL, NULL, &error_abort);
object_property_add_link(obj, PC_DIMM_MEMDEV_PROP, TYPE_MEMORY_BACKEND,
(Object **)&dimm->hostmem,
- qdev_prop_allow_set_link_before_realize,
+ pc_dimm_check_memdev_is_busy,
OBJ_PROP_LINK_UNREF_ON_RELEASE,
&error_abort);
}
--
MST
- [Qemu-devel] [PULL 000/103] pc, pci, virtio, hotplug fixes, enhancements for 2.1, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 001/103] pc: create custom generic PC machine type, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 003/103] object_add: allow completion handler to get canonical path, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 004/103] vl.c: daemonize before guest memory allocation, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 005/103] add memdev backend infrastructure, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 006/103] vl.c: extend -m option to support options for memory hotplug, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 007/103] qdev: hotplug for buss-less devices, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 002/103] pc: ACPI BIOS: use enum for defining memory affinity flags, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 008/103] qdev: expose DeviceState.hotplugged field as a property, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 011/103] pc-dimm: do not allow to set already used memdev,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 010/103] memory: add memory_region_is_mapped() API, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 009/103] pc: implement pc-dimm device abstraction, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 014/103] pc: add 'etc/reserved-memory-end' fw_cfg interface for SeaBIOS, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 015/103] pc: exit QEMU if compat machine doesn't support memory hotlpug, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 013/103] pc: exit QEMU if number of slots more than supported 256, Michael S. Tsirkin, 2014/06/17