From patchwork Sat Apr 27 15:57:07 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: 792678 Delivered-To: patch@linaro.org Received: by 2002:adf:cc13:0:b0:346:15ad:a2a with SMTP id x19csp973816wrh; Sat, 27 Apr 2024 08:59:38 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU5K9ZBjCzj43POXCTNkWryOpq483wCOM8+/6SXt3/NTl5w3/EO17QfKxeD3Sq/r2kkbhlHDDF3c6PWIX/RWTnN X-Google-Smtp-Source: AGHT+IFl7N6ylSqrlDVYan2iQSrmqOzEVYSWZBCH9ew3wbQWrpJmo/pZJ45dSqEbsU1DeUIU3u5M X-Received: by 2002:a05:6214:2aab:b0:6a0:6e42:601b with SMTP id js11-20020a0562142aab00b006a06e42601bmr9321726qvb.8.1714233578146; Sat, 27 Apr 2024 08:59:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714233578; cv=none; d=google.com; s=arc-20160816; b=YQX8ynQosPJgBxEknIWSFJiRYVOrKUirR5y5eBCDy6FChfquUzW8JyicHesw47205n mvA3EVgkhRpjZ05sBezrZg+ojUN8nXIwZqeAiKIrZC/gJAo6sluYRMwsQQXznJnyTxIE sF8vUDUylLtCzIQK85R/hKXEd7sifRi8X0iVSsBQuDE1b7CW6ouOFHyrlHit2tuYrhyN QhgUZHvXhhjf3JUUUEg81aHRIha9+pQ6z0gJjub9hYdyIsdStSNnyrYLDy7T5pIB+iPf yHpYqKNmCVOkvLtitG0HqH+notkRgwoJbu6nfl0yIjLQ7vUVtKLmvInVccBHJMTHhP23 eEVQ== 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=msn7De0lOW3avspGXlkpWl0wQtZAqMJHMMhEd4fx2HQ=; fh=ZXDWg7hKG7Hj19AbRuutTLw+Zvn/B9RsGUUw/YagpFI=; b=bdCxI9A9LHmLU4imPUJUxBqyxVGtnTS8p8ddBv1w+/IkRhnfL+HN4Wrq8IT1fkL6za XuD7N8XpRHCXmLNSPOp4lJ2VdGrNahRrGsj94EZID+rA+Pf4kgHTdJ13qYpDF+vHACmE tCk/8WQxfKX4xzlWOH4/l/bMQbeeH8bpPC5L63d3peine2WJqD2TtX39hR/PB802/DpK EqfXIW2yfAg2pqe2F8Zxb4bA86in3wV3vT1i4z77njL3whS+7YifQZvAObcAgzcFpxs4 3uy/h3Db4EcRKx18pNvp+VP1RvUhRJ3ZjhM0en+XGJdewOnCmQU98/H4Tp3Ieq+hjY5e bEAw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PXiNsoUg; 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 r17-20020a056214125100b0069949b82546si23305654qvv.79.2024.04.27.08.59.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 27 Apr 2024 08:59:38 -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=PXiNsoUg; 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 1s0kRC-00033s-3g; Sat, 27 Apr 2024 11:58:06 -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 1s0kR8-0002zB-HW for qemu-devel@nongnu.org; Sat, 27 Apr 2024 11:58:03 -0400 Received: from mail-lj1-x234.google.com ([2a00:1450:4864:20::234]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s0kR6-0005SL-TX for qemu-devel@nongnu.org; Sat, 27 Apr 2024 11:58:02 -0400 Received: by mail-lj1-x234.google.com with SMTP id 38308e7fff4ca-2d8a2cbe1baso42994871fa.0 for ; Sat, 27 Apr 2024 08:57:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1714233477; x=1714838277; 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=msn7De0lOW3avspGXlkpWl0wQtZAqMJHMMhEd4fx2HQ=; b=PXiNsoUgSfCCr4aKbxMJ5qVjP+W7Sg1CaUh6FLRuZFQ6sZ0qjpeqkmySfEiLlCC6c2 tFcSOUwjHLeWsc18aH1xd9KojgmO0IYpyqGr65JqWb3c9vgFhX5K0yBPpUn2+4mA4+B0 viNAIQJh1TGbbaqFnWIeoqZSTCmV7/g3j2exk4BDFlFCF2kcQu/Wnqxl4OwcvuuD1Zdt NYRB4A8q3qgqtSEupvfFe/a1Aa0Vdr3PNTWNefg7aA3q79rysF/kYyXdvChRsVHWL3jZ CKS6yKmiFMYZRG2i3w2g33RzndCWoC3PDftQrsZ+UC6iMqtUnAe9zYoEog7/pO5AJQbk ih0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714233477; x=1714838277; 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=msn7De0lOW3avspGXlkpWl0wQtZAqMJHMMhEd4fx2HQ=; b=YMtZAqXEQDO5zgwvK3Sin6ySFj8iL9nPGi2xJzOwNQC59z2rAitqJiMvJmP3s2AUH3 8Wq0eOAbR07bJ8XPSZC57SYNouDj4eLpNimvrevAfWVrhyBYo9hS6TsGdnmRhKgec92S ZiMBenbEMeEujWBGJzlsZ49tKkPNV8elpqh0TcDepjXLRdgADmkAkOuAE8VpycbTGpej 0F0A7atSaasYxibXuRMN2Og1fAcvQazH44zdIdc5Y+WopOlj5ZL1sJyt1wNWWJsTrptn Q8+OqymdVTeTmBORaN4xpyJmwiu5iE23o/rWY6mcKULhiqmmr0r6cy84hEpTuev4hZcm xZ3A== X-Gm-Message-State: AOJu0YzlfBPBQ1dL5bv6lhOEZI9WiH3Lykp+ZN8bdqGQpH80hYnYPUtS zPJ1FAnv55S44syTXRuSNG/oQdgIsWGAU2KR/bzO53cLIPtskkvb+GtIyz30KoC68BY9YLQnHyt jTHg= X-Received: by 2002:a05:651c:10ab:b0:2d9:fde0:86e2 with SMTP id k11-20020a05651c10ab00b002d9fde086e2mr4569731ljn.15.1714233476849; Sat, 27 Apr 2024 08:57:56 -0700 (PDT) Received: from m1x-phil.lan ([176.187.209.2]) by smtp.gmail.com with ESMTPSA id q13-20020a05600c46cd00b0041c02589a7csm377463wmo.40.2024.04.27.08.57.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 27 Apr 2024 08:57:56 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= Subject: [PATCH 07/14] exec/cpu: Remove duplicated PAGE_PASSTHROUGH definition Date: Sat, 27 Apr 2024 17:57:07 +0200 Message-ID: <20240427155714.53669-8-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240427155714.53669-1-philmd@linaro.org> References: <20240427155714.53669-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::234; envelope-from=philmd@linaro.org; helo=mail-lj1-x234.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 --- 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 5ea8c4d3ef..8c3ad7153d 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);