From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45246) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtAPd-0001Dv-OB for qemu-devel@nongnu.org; Mon, 02 Nov 2015 03:24:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZtAPY-0001H4-SU for qemu-devel@nongnu.org; Mon, 02 Nov 2015 03:24:21 -0500 Received: from mail-wm0-x22d.google.com ([2a00:1450:400c:c09::22d]:33273) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtAPY-0001Gw-MH for qemu-devel@nongnu.org; Mon, 02 Nov 2015 03:24:16 -0500 Received: by wmeg8 with SMTP id g8so52246019wme.0 for ; Mon, 02 Nov 2015 00:24:16 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 2 Nov 2015 09:24:11 +0100 Message-Id: <1446452651-18147-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH] 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 Cc: Peter Maydell , pkern@debian.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. Reported-by: Philipp Kern Cc: Peter Maydell Fixes: 0a1c71cec63e95f9b8d0dc96d049d2daa00c5210 Signed-off-by: Paolo Bonzini --- memory.c | 9 +++++++++ 1 file changed, 9 insertions(+) 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); } -- 2.5.0