From nobody Mon Apr 29 00:26:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 15296842630558.289307176834654; Fri, 22 Jun 2018 09:17:43 -0700 (PDT) Received: from localhost ([::1]:35167 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fWOkf-0007lc-Vh for importer@patchew.org; Fri, 22 Jun 2018 12:17:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41368) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fWOjd-0007Ny-N6 for qemu-devel@nongnu.org; Fri, 22 Jun 2018 12:16:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fWOja-0005ns-Gg for qemu-devel@nongnu.org; Fri, 22 Jun 2018 12:16:29 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:48147) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fWOja-0005nT-8u for qemu-devel@nongnu.org; Fri, 22 Jun 2018 12:16:26 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 9493420E0E; Fri, 22 Jun 2018 12:16:24 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Fri, 22 Jun 2018 12:16:24 -0400 Received: from localhost (flamenco.cs.columbia.edu [128.59.20.216]) by mail.messagingengine.com (Postfix) with ESMTPA id 35FD51025D; Fri, 22 Jun 2018 12:16:24 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=braap.org; h=cc :date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=mesmtp; bh=PCV1HO1Rr34Fq6 g1UTfLHHXVg+m/LtWGUvN4BXvqXyQ=; b=Yv5uKjbj/u72Yg5nIagg9yT+QjpWMZ bw36rM0mgFecPcok8C3ikOpU4PPTenOis2zSemddIcJ4xXO0+bvemdtx1naTqP89 p7ZFQPG012KVTDPhoB6HQk5VWHxNOiaqoHViLxjtoclas3/3F8Jq2CSKIZQnkkpc ChR/J4VOarIrg= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=PCV1HO1Rr34Fq6g1UTfLHHXVg+m/LtWGUvN4BXvqXyQ=; b=RrEnFBMr 5lmCRfBLRfjey04aj2Y/8YyevZ30e5H4+a39uXMs7DenA6v1SesP30VQEAVHh0XI hXB/nWQ521tkuY8RVgic7RzaSKQMXbHT4PYdG2xMHBTPMrM1xQZvmNYgHXo4zIHA 89GH8IuVoHTvAcd1d8lurPB1x+s4ugH6chypHqYRM2LkbntKi/ToV2+rl0Kq9VYq lX++13qC1hayHh49lt5XyEHRMBpsjoVk4HL4OdDbFZsRyoN+/I3JpvcvNJxhpkGx LyHKSHuJ7a9lO6SG8f7HkE4D0r/2EOps0uvvGKGkI41xDWMxQoD76o5muNCe+3DY TlXKJb7pv0l8Zg== X-ME-Proxy: X-ME-Sender: From: "Emilio G. Cota" To: qemu-devel@nongnu.org Date: Fri, 22 Jun 2018 12:16:23 -0400 Message-Id: <1529684183-17385-1-git-send-email-cota@braap.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.111.4.26 Subject: [Qemu-devel] [PATCH] tcg: fix --disable-tcg build breakage introduced by tb_lock removal X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Tested to build x86_64-softmmu and i386-softmmu targets. Reported-by: Peter Maydell Signed-off-by: Emilio G. Cota --- accel/stubs/tcg-stub.c | 4 ---- exec.c | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/accel/stubs/tcg-stub.c b/accel/stubs/tcg-stub.c index ee575a8..76ae461 100644 --- a/accel/stubs/tcg-stub.c +++ b/accel/stubs/tcg-stub.c @@ -21,10 +21,6 @@ void tb_flush(CPUState *cpu) { } =20 -void tb_unlock(void) -{ -} - void tlb_set_dirty(CPUState *cpu, target_ulong vaddr) { } diff --git a/exec.c b/exec.c index 28f9bdc..3baa3dc 100644 --- a/exec.c +++ b/exec.c @@ -2645,18 +2645,22 @@ void memory_notdirty_write_prepare(NotDirtyInfo *nd= i, ndi->pages =3D NULL; =20 assert(tcg_enabled()); +#ifdef CONFIG_TCG if (!cpu_physical_memory_get_dirty_flag(ram_addr, DIRTY_MEMORY_CODE)) { ndi->pages =3D page_collection_lock(ram_addr, ram_addr + size); tb_invalidate_phys_page_fast(ndi->pages, ram_addr, size); } +#endif } =20 /* Called within RCU critical section. */ void memory_notdirty_write_complete(NotDirtyInfo *ndi) { if (ndi->pages) { +#ifdef CONFIG_TCG page_collection_unlock(ndi->pages); ndi->pages =3D NULL; +#endif } =20 /* Set both VGA and migration bits for simplicity and to remove --=20 2.7.4