From patchwork Mon Nov 2 08:24:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 538882 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id D7E2A140D7A for ; Mon, 2 Nov 2015 19:24:39 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=G/zHdPiv; dkim-atps=neutral Received: from localhost ([::1]:40597 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtAPt-0001VI-Dr for incoming@patchwork.ozlabs.org; Mon, 02 Nov 2015 03:24:37 -0500 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=NeQskv/9UWhjTO9QQ2Ob4uH1YfRyNws0WyMWSt88rjw=; b=G/zHdPivrhyeWnvaM0hfWtMfGnEq3PdZ3I/uy+JsrxlbEtIrZ9jWBz8/7CnG6axkzT T+OdC+o6hLlgBjaMiCal0tDYTXR3ESyV6Xhm58cKrTaod9ylB6/SDuH4P8VOAGYrd7C2 j8l1zAnHUKGOR83oCajfCZaH+zlqyi/UweNFBSiaSvKV4U9F6tk6AZBXlBy3toF/u535 HbncRnN7O8ByLdcd3NGiOarpR7ysMkI3uVrhpCmYEAS6vDAm1LGfeB0ODZ4/wyfXT0fo ZBp1+MKsQWBUp1NJa7N5RLQPNjF0b5pt7eXhqmW2i1IsCASSrMpv+BwBy8j89ufesjPa 6DSA== X-Received: by 10.28.88.205 with SMTP id m196mr12548659wmb.7.1446452656039; Mon, 02 Nov 2015 00:24:16 -0800 (PST) Received: from donizetti.lan. (94-39-161-165.adsl-ull.clienti.tiscali.it. [94.39.161.165]) by smtp.gmail.com with ESMTPSA id ju5sm20985811wjc.1.2015.11.02.00.24.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Nov 2015 00:24:14 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 2 Nov 2015 09:24:11 +0100 Message-Id: <1446452651-18147-1-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 2.5.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c09::22d Cc: Peter Maydell , pkern@debian.org Subject: [Qemu-devel] [PATCH] memory: call begin, log_start and commit when registering a new listener X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@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. Reported-by: Philipp Kern Cc: Peter Maydell Fixes: 0a1c71cec63e95f9b8d0dc96d049d2daa00c5210 Signed-off-by: Paolo Bonzini Reviewed-by: Peter Maydell --- 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); }