From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42462) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1agqUK-0004JJ-VV for qemu-devel@nongnu.org; Fri, 18 Mar 2016 05:14:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1agqUJ-00043M-TR for qemu-devel@nongnu.org; Fri, 18 Mar 2016 05:14:32 -0400 Received: from mail-wm0-x235.google.com ([2a00:1450:400c:c09::235]:36093) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1agqUJ-000434-MP for qemu-devel@nongnu.org; Fri, 18 Mar 2016 05:14:31 -0400 Received: by mail-wm0-x235.google.com with SMTP id l124so22978571wmf.1 for ; Fri, 18 Mar 2016 02:14:31 -0700 (PDT) From: Baptiste Reynal Date: Fri, 18 Mar 2016 10:13:58 +0100 Message-Id: <1458292438-13909-7-git-send-email-b.reynal@virtualopensystems.com> In-Reply-To: <1458292438-13909-1-git-send-email-b.reynal@virtualopensystems.com> References: <1458292438-13909-1-git-send-email-b.reynal@virtualopensystems.com> Subject: [Qemu-devel] [RFC v2 6/6] qemu: numa List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: b.reynal@virtualopensystems.com, Jani.Kokkonen@huawei.com, tech@virtualopensystems.com, Claudio.Fontana@huawei.com, Christian Pinto From: Christian Pinto This patch modifies the behavior of memory_region_allocate_system_memory, when the new shared memory backend is used from a slave qemu instance. In such case there is not yet a valid pointer for the memory region pointed by the backend (it will be innitilized later when received from the master.) and vmstate_register would fail. The patch skips the call to vmstate_register in case of slave shared memory backend, that will be performed later after the actual memory pointer is available. Signed-off-by: Christian Pinto --- numa.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/numa.c b/numa.c index e9b18f5..b39a892 100644 --- a/numa.c +++ b/numa.c @@ -33,6 +33,7 @@ #include "qapi/dealloc-visitor.h" #include "hw/boards.h" #include "sysemu/hostmem.h" +#include "sysemu/hostmem-shared.h" #include "qmp-commands.h" #include "hw/mem/pc-dimm.h" #include "qemu/option.h" @@ -442,6 +443,7 @@ void memory_region_allocate_system_memory(MemoryRegion *mr, Object *owner, { uint64_t addr = 0; int i; + bool vmstate_register = true; if (nb_numa_nodes == 0 || !have_memdevs) { allocate_system_memory_nonnuma(mr, owner, name, ram_size); @@ -453,9 +455,18 @@ void memory_region_allocate_system_memory(MemoryRegion *mr, Object *owner, Error *local_err = NULL; uint64_t size = numa_info[i].node_mem; HostMemoryBackend *backend = numa_info[i].node_memdev; + if (!backend) { continue; } + + if (IS_MEMORY_BACKEND_SHARED(backend)) { + HostMemoryBackendShared *shm = MEMORY_BACKEND_SHARED(backend); + if (!shm->master) { + vmstate_register = false; + } + } + MemoryRegion *seg = host_memory_backend_get_memory(backend, &local_err); if (local_err) { error_report_err(local_err); @@ -471,7 +482,11 @@ void memory_region_allocate_system_memory(MemoryRegion *mr, Object *owner, } memory_region_add_subregion(mr, addr, seg); - vmstate_register_ram_global(seg); + + if (vmstate_register) { + vmstate_register_ram_global(seg); + } + addr += size; } } -- 2.7.3