From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54526) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wmlp4-00007H-UU for qemu-devel@nongnu.org; Tue, 20 May 2014 11:19:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wmlow-00010i-1l for qemu-devel@nongnu.org; Tue, 20 May 2014 11:19:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:23158) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wmlov-00010N-Pi for qemu-devel@nongnu.org; Tue, 20 May 2014 11:19:13 -0400 From: Igor Mammedov Date: Tue, 20 May 2014 17:15:14 +0200 Message-Id: <1400598934-31921-12-git-send-email-imammedo@redhat.com> In-Reply-To: <1400598934-31921-1-git-send-email-imammedo@redhat.com> References: <1400598934-31921-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH v2 11/31] dimm: do not allow to set already used memdev List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, alex@alex.org.uk, mst@redhat.com, aik@ozlabs.ru, hutao@cn.fujitsu.com, mjt@tls.msk.ru, tangchen@cn.fujitsu.com, kraxel@redhat.com, pasteka@kabsi.at, s.priebe@profihost.ag, agarcia@igalia.com, armbru@redhat.com, aliguori@amazon.com, david@gibson.dropbear.id.au, lersek@redhat.com, ehabkost@redhat.com, marcel.a@redhat.com, stefanha@redhat.com, cornelia.huck@de.ibm.com, rth@twiddle.net, agraf@suse.de, andrey@xdel.ru, vasilis.liaskovitis@profitbricks.com, pbonzini@redhat.com, afaerber@suse.de, aurelien@aurel32.net 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 --- hw/mem/dimm.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/hw/mem/dimm.c b/hw/mem/dimm.c index bb81679..713ded5 100644 --- a/hw/mem/dimm.c +++ b/hw/mem/dimm.c @@ -42,6 +42,21 @@ static void dimm_get_size(Object *obj, Visitor *v, void *opaque, visit_type_int(v, &value, name, errp); } +static void 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 dimm_initfn(Object *obj) { DimmDevice *dimm = DIMM(obj); @@ -50,7 +65,7 @@ static void dimm_initfn(Object *obj) NULL, NULL, NULL, &error_abort); object_property_add_link(obj, DIMM_MEMDEV_PROP, TYPE_MEMORY_BACKEND, (Object **)&dimm->hostmem, - qdev_prop_allow_set_link_before_realize, + dimm_check_memdev_is_busy, OBJ_PROP_LINK_UNREF_ON_RELEASE, &error_abort); } -- 1.7.1