From patchwork Mon May 6 12:37:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 794996 Delivered-To: patch@linaro.org Received: by 2002:adf:a453:0:b0:34e:ceec:bfcd with SMTP id e19csp901171wra; Mon, 6 May 2024 05:38:51 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUbXzKUt/xSvykevvECT4n4zi/sqFEGbk2Zib66Ym5/V5UNtR3NxPItiRF/g/1oA+n/+3G3FPAHC+ZWdwgDM7Wv X-Google-Smtp-Source: AGHT+IHFAh1QUqAUMMrh5DTRXQMl2csYYlwJwe0CQsntWe5zN6IrYgaj9m6RN4hhvxpnsj1RBy78 X-Received: by 2002:a05:6870:c0d1:b0:229:8216:6972 with SMTP id e17-20020a056870c0d100b0022982166972mr12223135oad.33.1714999130723; Mon, 06 May 2024 05:38:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714999130; cv=none; d=google.com; s=arc-20160816; b=blj8l/wCaC5qyfT7RM1OP6fR4HT1wxsx8Hf90SGyUTcdLiBXGQF2kSTtQRTvJMmewa JcaAdiuIAwYFhLmfsET4/0JnxNCQOlj1AQALYJiNdYH0skdkPrt2/x6oEDmPCmZoWsgh nwB73fdBRR64BQRa3bor2f8tr9HwNFMJtsi2zR/ON3AZ2iLGvnVs4nQQx8+9oX6lYHkT s33PdaHMQLtU/1/FC6xiqGxNyTGVPgWsKg8F0Reg1A9/Pe1zLDBkdblvNXNrAL4DRLJg IPzJSFDG+4HF6kQ647tvM/T5eLnwKJk19cBc6BRcYV/wHa+sO04tntsLTChePakwyQcm MLTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=15MBw/M3WTCtNRZ5kPDhx5DhGKWOE30iPpFmTieH1zg=; fh=qtn8prgQtzf5IzCNvLChUZDElvNECP6ej9YfjQeBz3I=; b=gE5aO3cU+bgmDFOy7orfeWbYwjTOIz6k/DNy4Vxha48iSD5cyVuK9adghkUbcwKQYE fO0IHVoRwmxQdh9J8xTqrbg1pthTNv9xfIxuxgzs5r6OIEPrUCQhG9z4gboieyoLEsog F5MaKscSxpyZ7b1QjonAOn7ltgQOct5ygjIx8YNyI1/3jxqi7Bs6oEgDfPPqyiNmalk6 boXT1vPA/4neftzhQ6MAzRTnlit4PYkfcF4CHbin3JustCaX67RncC8TcN2aJeEEAjdK KK+2Hw2hQtqKFcYItK3AWKbMA2Cdz4wQaz0xC030B607K2l27mjOxWISIOfHtTRVdj0h Pcsw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ulfr9+hF; 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=pass (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 x14-20020a05620a448e00b007929602e42esi2862024qkp.463.2024.05.06.05.38.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 06 May 2024 05:38:50 -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=pass header.i=@linaro.org header.s=google header.b=Ulfr9+hF; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3xby-0001Ji-2a; Mon, 06 May 2024 08:38:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s3xbj-0001FU-DM for qemu-devel@nongnu.org; Mon, 06 May 2024 08:38:20 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s3xbg-0001y9-2G for qemu-devel@nongnu.org; Mon, 06 May 2024 08:38:14 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-34db6a29998so1157035f8f.0 for ; Mon, 06 May 2024 05:38:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1714999089; x=1715603889; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=15MBw/M3WTCtNRZ5kPDhx5DhGKWOE30iPpFmTieH1zg=; b=Ulfr9+hFM/7FKHO2u5IALgiIcuO1dRGPCS71WP8dKlw5//nbCSCUMHC1EQwgHSgYNz AZqSxq9SEfEc9EavOq/1xS5D4rusMbGXCot6HmKftLvj6irrxJDQ42mDhYctIGkRksY/ Ox5+AWTWVtSHvGSnvcwbi8odl+a36hDungH/I/iEcqPf3YLJU7fXeff2GPiR2LZ9LntT j53vjb00RCZVsTmlu+xSMNHySHCI0D9tN/Zv0zolbJuLJ2TwNcUmAbDgc5dohhLt3v2r 0BvqMl95PJqjSN3D1B+KRNnUopupo8Jm/M4vzCGE78reMxCH5wY8wTV325JtxaKtb012 zqHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714999089; x=1715603889; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=15MBw/M3WTCtNRZ5kPDhx5DhGKWOE30iPpFmTieH1zg=; b=PEUSvwM4vHDOp43q4BvlL9BQhIU9Lmvid61ycuTj65AEmRFuuxhKniwHoGyDY9/OWI e3hiBGPS+NDvubYAau5ISklAPrCMPxUoX0glqVm9JP8uj8q06p0JNffXchmj4j9B1fnf qK6NUO0EJHQDNMfH9qjF02neog8MoKlkjOQEFcmE8UrJ+gNUb6VDBQrHZtyKOrJeaKqD xGQVHtIjkmSuBlsewGPiEvzmO0aw+PJr+ZLH51Zy9DP+ZyxEdBtyD6e01rcQbBCMKlE1 ku9GTYcUS8jb8Xip9vy5ZCqflMcQYitTvHCsLB5XiEtXl4C/1zCCRSo3DBijx8FfifwF AgEQ== X-Gm-Message-State: AOJu0Yxjo8ixPE8ZJbR1jIEKofJ1eu0qJxESQjxLEQ+6zwKRq5rm/bMA eD+AFnSp8CWPbfmcRsS6VXlgqTi1EwWYKzOCKGoHZhE5x4iSFAPaevdnDumQcewOgseFviFeLYZ Q X-Received: by 2002:adf:a18f:0:b0:34c:b31e:18de with SMTP id u15-20020adfa18f000000b0034cb31e18demr6845895wru.35.1714999089417; Mon, 06 May 2024 05:38:09 -0700 (PDT) Received: from m1x-phil.lan ([176.187.211.4]) by smtp.gmail.com with ESMTPSA id k3-20020adff5c3000000b00349a5b8eba6sm10555499wrp.34.2024.05.06.05.38.06 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 06 May 2024 05:38:09 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PULL 04/28] exec/cpu: Remove duplicated PAGE_PASSTHROUGH definition Date: Mon, 6 May 2024 14:37:04 +0200 Message-ID: <20240506123728.65278-5-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240506123728.65278-1-philmd@linaro.org> References: <20240506123728.65278-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=philmd@linaro.org; helo=mail-wr1-x433.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Missed in commit 58771921af ("include/exec: Move PAGE_* macros to common header"), PAGE_PASSTHROUGH ended being defined twice. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20240427155714.53669-8-philmd@linaro.org> --- include/exec/cpu-all.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index 104c5dd2da..c4dada5b44 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -157,12 +157,6 @@ extern const TargetPageBits target_page; #define TARGET_PAGE_ALIGN(addr) ROUND_UP((addr), TARGET_PAGE_SIZE) -/* - * For linux-user, indicates that the page is mapped with the same semantics - * in both guest and host. - */ -#define PAGE_PASSTHROUGH 0x0800 - #if defined(CONFIG_USER_ONLY) void page_dump(FILE *f);