From patchwork Sun Jul 14 11:12:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 168968 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp3117905ilk; Sun, 14 Jul 2019 04:13:46 -0700 (PDT) X-Google-Smtp-Source: APXvYqxrDg7tz29ZzmgMIhsS1wBp+kzbb1i+7893CKRPTpiXoXcxhdnM36EIok9db1O/9PnkVscR X-Received: by 2002:a50:9999:: with SMTP id m25mr18108961edb.183.1563102826651; Sun, 14 Jul 2019 04:13:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563102826; cv=none; d=google.com; s=arc-20160816; b=KoiRinQFdLv8UFDMJSpKquXFbo/e39G+1QF+KugXFmXPJdD98Ek7jKbFlXsJwSk06t myL95GGQUtEF1g9fdT7tO62Zn/M7V4LUa6L+56M4GT7VoCT8H/auD8HnUAWlLHqw8Qgq DNqsUJc4aaTH2Bfah/45tLB1ExSvpLmbb5zkqqFNj+FthFaTDq1gk00LlsteKmo8ed1o UIX0MjAFSfI0x+G4ASVUQKx03ezLiAIZoRhsK0dOWd0yQniwGalF//eqyq0FnMxVFDWG g0WsDKfuOVX2OMTdnrbI1IzIsDwtxHPwA3A9RzpTUF/a+J3OcgvyBXqiN8hfDMvi0SJf Idkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=sH3HXM90i35Znfmo2ZGAwhUVyrLtmUH4wH93sEFL2IQ=; b=FWmFW/Ycxco/6ANKxy1k/u0VDo5pU5d/GLBlarcbWC4GpxvKqHUJwYuu0lZSNUXiVE erS4em6luv1neG8xW2AL6PW0JQB4YhKivEp2FjzA2KX4XzgfkG2H5+RMcTOZSsZGooax bjgmqCHaiGPIb57MKujGX4hf6Dx7GWR6Jf5zcMmhU3qU7wTI6NEQOOGpIkoD8ERGNDWZ grZ6IEt6w8dbl9dBU/KDuhR2+z7mdI98r7pFOQGZ+1vhZqLZ0O4WI9d8BGqXtLea/LlO 0We/0Uy1SB5WlxZTOsjN8yalryME8GcKNqQE0AvS2nbHHRCDLSkg0cYd8+SiKk6K91Uc BoSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=FNjk2n86; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d36si8452575eda.396.2019.07.14.04.13.46 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 14 Jul 2019 04:13:46 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=FNjk2n86; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:59750 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hmcRt-0000Gq-1x for patch@linaro.org; Sun, 14 Jul 2019 07:13:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60370) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hmcR9-0005nQ-U2 for qemu-devel@nongnu.org; Sun, 14 Jul 2019 07:13:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hmcR8-0006OY-T2 for qemu-devel@nongnu.org; Sun, 14 Jul 2019 07:12:59 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:45923) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hmcR8-0006OC-N6 for qemu-devel@nongnu.org; Sun, 14 Jul 2019 07:12:58 -0400 Received: by mail-wr1-x42c.google.com with SMTP id f9so14098213wre.12 for ; Sun, 14 Jul 2019 04:12:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sH3HXM90i35Znfmo2ZGAwhUVyrLtmUH4wH93sEFL2IQ=; b=FNjk2n86XqOV+bcaFG3i2ym7stY8kbk3QuTSCTKFYAGFtzJ9OOCK6xJluyGrcmz3dp 8z8Pjo9NY9M5JVT5CDvtA5DnyuTm43b/4Ru6FBLGt+62jFbsmuFyCn1tvyF08Hy6py7W k+HuWlUuuFiXVbTn6InvKQfBb4schKihRliARlYCbNE3Sd4GRZDnBwuvhmd/eKf5C1dr OGHTjHOmlbMGtaA6101E/uateFO5i0bCfHfvAOBlwwvY4bPitqDVdlZTBm7r9iotyAGx SQQyki+zoSmiWaaW7wf9sVJ8QBWkLJHbvPtjrLg+bQzRoJkXkp/YphPpGW2ku3OkNC+V toeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sH3HXM90i35Znfmo2ZGAwhUVyrLtmUH4wH93sEFL2IQ=; b=dNr/3Uf1tx9E/JQpXfzQ0Y8sIdQ2nJdLBwAKcKFCW8JjwYbALprSvhUSFuop8asNEz XKKDcrRMyqTienDOffgDv69fm9vgQ7elATTXD79VOfYzYe+zYoj2yOgZIDTQ+Tk58Nmf h+hHVPUiSlfoNsiQImSd0sMumZwLwiTUXxlEUFrhN5PPS9OYFBqeXGK0ilwBg3PDX0x1 aZjc3QA2gK5tdLZJ1oMazLyJyDZf5OdAzhKfNLtJJKs1Fmyj4XWr0tZnqj9lmhb4Cc2P 67aLEnMyv80q/P5nbXTn4ngUrzV4d3ck9IxQZtyL1PfpATZqj6z0BfiX6g+Iu5WLye2s xwYw== X-Gm-Message-State: APjAAAUumxIZ9kBhK9WRYFKFVmg4XlPMfZkIMvB68vKJVteNDkdRX8Yb nUjKAlaTU79xNUn6ZXFxzCFEGAMqPLrMlw== X-Received: by 2002:adf:e602:: with SMTP id p2mr16142780wrm.306.1563102777433; Sun, 14 Jul 2019 04:12:57 -0700 (PDT) Received: from localhost.localdomain ([194.144.248.241]) by smtp.gmail.com with ESMTPSA id f17sm12675795wmf.27.2019.07.14.04.12.56 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sun, 14 Jul 2019 04:12:56 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 14 Jul 2019 11:12:48 +0000 Message-Id: <20190714111249.13859-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190714111249.13859-1-richard.henderson@linaro.org> References: <20190714111249.13859-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42c Subject: [Qemu-devel] [PULL for-4.1 6/7] tcg: Remove duplicate #if !defined(CODE_ACCESS) X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This code block is already surrounded by #ifndef CODE_ACCESS. Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson --- include/exec/cpu_ldst_useronly_template.h | 2 -- 1 file changed, 2 deletions(-) -- 2.17.1 diff --git a/include/exec/cpu_ldst_useronly_template.h b/include/exec/cpu_ldst_useronly_template.h index 8c7a2c6cd7..d663826ac2 100644 --- a/include/exec/cpu_ldst_useronly_template.h +++ b/include/exec/cpu_ldst_useronly_template.h @@ -118,11 +118,9 @@ static inline void glue(glue(cpu_st, SUFFIX), MEMSUFFIX)(CPUArchState *env, abi_ptr ptr, RES_TYPE v) { -#if !defined(CODE_ACCESS) trace_guest_mem_before_exec( env_cpu(env), ptr, trace_mem_build_info(SHIFT, false, MO_TE, true)); -#endif glue(glue(st, SUFFIX), _p)(g2h(ptr), v); }