From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39874) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zu0lt-0003x5-IJ for qemu-devel@nongnu.org; Wed, 04 Nov 2015 11:18:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zu0lq-0002O5-7b for qemu-devel@nongnu.org; Wed, 04 Nov 2015 11:18:49 -0500 Received: from mail-wi0-x234.google.com ([2a00:1450:400c:c05::234]:34319) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zu0lq-0002Nw-25 for qemu-devel@nongnu.org; Wed, 04 Nov 2015 11:18:46 -0500 Received: by wikq8 with SMTP id q8so95513922wik.1 for ; Wed, 04 Nov 2015 08:18:45 -0800 (PST) Received: from 640k.lan (94-39-161-165.adsl-ull.clienti.tiscali.it. [94.39.161.165]) by smtp.gmail.com with ESMTPSA id kd8sm2318236wjc.27.2015.11.04.08.18.44 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Nov 2015 08:18:45 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 4 Nov 2015 17:18:27 +0100 Message-Id: <1446653912-116150-10-git-send-email-pbonzini@redhat.com> In-Reply-To: <1446653912-116150-1-git-send-email-pbonzini@redhat.com> References: <1446653912-116150-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 09/14] memory: call begin, log_start and commit when registering a new listener List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org This ensures that cpu_reload_memory_map() is called as soon as tcg_cpu_address_space_init() is called, and before cpu->memory_dispatch is used. qemu-system-s390x never changes the address spaces after tcg_cpu_address_space_init() is called, and thus tcg_commit() is never called. This causes a SIGSEGV. Because memory_map_init() will now call mem_commit(), we have to initialize io_mem_* before address_space_memory and friends. Reported-by: Philipp Kern Reviewed-by: Peter Maydell Fixes: 0a1c71cec63e95f9b8d0dc96d049d2daa00c5210 Signed-off-by: Paolo Bonzini --- exec.c | 2 +- memory.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/exec.c b/exec.c index 7431f2f..819ecc3 100644 --- a/exec.c +++ b/exec.c @@ -2694,8 +2694,8 @@ void cpu_register_map_client(QEMUBH *bh) void cpu_exec_init_all(void) { qemu_mutex_init(&ram_list.mutex); - memory_map_init(); io_mem_init(); + memory_map_init(); qemu_mutex_init(&map_client_list_lock); } diff --git a/memory.c b/memory.c index 2eb1597..c435c88 100644 --- a/memory.c +++ b/memory.c @@ -2036,6 +2036,9 @@ static void listener_add_address_space(MemoryListener *listener, return; } + if (listener->begin) { + listener->begin(listener); + } if (global_dirty_log) { if (listener->log_global_start) { listener->log_global_start(listener); @@ -2052,10 +2055,16 @@ static void listener_add_address_space(MemoryListener *listener, .offset_within_address_space = int128_get64(fr->addr.start), .readonly = fr->readonly, }; + if (fr->dirty_log_mask && listener->log_start) { + listener->log_start(listener, §ion, 0, fr->dirty_log_mask); + } if (listener->region_add) { listener->region_add(listener, §ion); } } + if (listener->commit) { + listener->commit(listener); + } flatview_unref(view); } -- 1.8.3.1