From nobody Sun Apr 12 06:05:56 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1771321937; cv=none; d=zohomail.com; s=zohoarc; b=OLi44NYmHaI8/oiMD9JUyLg36tBshKr4Ft5lcD1QEP8qKJRP94BVzJae7JJScDqSbTyU5QBgbwglcvfwROqSAMX4C8jTcKkDfH3n6udgLUeyRcN4FpWPfpna3FIKPPmDyscuB+xdCzJnpuEnm9Ul7XiG68kJyLXl4yxbUB9MZ9M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771321937; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=lH0dnvNM5971XYrImykDmi/zsT4QBP8YuEiiUlIsVhQ=; b=nNtNHQoTWxrTamBgiOaLAd28kzXSMJmfk/ABb8ANrotIVcDheN8u5HciOryoX3AU3i6Tr3uxcpuqev7vH3cLWJK5/UC8OBHaH1lZnPPzwpdyFUF5MFBDM/ozNXfE9SicGpJwFRbdqB1Wgv05xLoXZtYLleO7yvFeCiNlBI9LPCg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1771321937202567.677379984885; Tue, 17 Feb 2026 01:52:17 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vsHkS-0002f2-LT; Tue, 17 Feb 2026 04:52:04 -0500 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 1vsHk8-0002Ov-5F for qemu-devel@nongnu.org; Tue, 17 Feb 2026 04:51:47 -0500 Received: from mail-pg1-x531.google.com ([2607:f8b0:4864:20::531]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vsHk3-0006B2-Qr for qemu-devel@nongnu.org; Tue, 17 Feb 2026 04:51:43 -0500 Received: by mail-pg1-x531.google.com with SMTP id 41be03b00d2f7-c6e191c4b8fso1354505a12.0 for ; Tue, 17 Feb 2026 01:51:27 -0800 (PST) Received: from localhost.localdomain (2403-580b-742d-0-10a2-dce1-aa4a-dd32.ip6.aussiebb.net. [2403:580b:742d:0:10a2:dce1:aa4a:dd32]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ad1a6fa33esm99108675ad.13.2026.02.17.01.51.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Feb 2026 01:51:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771321886; x=1771926686; 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=lH0dnvNM5971XYrImykDmi/zsT4QBP8YuEiiUlIsVhQ=; b=Ram+1Hl7of07iGuREUc+nsukug8UaCFxUDAYso7vG+W+1O7pOdCW+D3RO2bwnzFs8m b3lZKaOoHP19TABQx8pCtyL77lFdxn0cjSFgsouczDAWr8P/P6mqNM9a3vsbn0XMsnPV xv+D+WuQbfTJgMOEgBwdDpB/fD4MVSiuNoctwJqmOuSqKfXirFLz7xISaR8Heb3iEoLS 81KrUb3E0oVjna8g6gtgFm/w3jOpy8cxtEtkXKYCYxsn5E/IhMlvHs2ygEp5VgXoFSiU bgNiA+3JUVpmoRc9/HRXWOWlkEjs9m3Ra15Nro4oS5mgbMWubbpKMB9qxr/4mh2/oP6M MXCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771321886; x=1771926686; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=lH0dnvNM5971XYrImykDmi/zsT4QBP8YuEiiUlIsVhQ=; b=LEWgh/3/b2a9KMHwKihiJbDytcx6/ErTAc3ROQximnTPTT0chLq5qDAiuYRxwC+Hll 4335vPGK0NQDDxwKxn3u8LjuIcfPqW9lNZtY53qxjE7Wt+GQbu0xR0tMzoOHoKPze5ig SjIsMV/psSbLDZiPM2+MqEh1jn/12eHYu9DzlIelBU2x+xyLIf3lKM+kjrSJghCw9C2C EzQp3QkHKzp0Cunyn8WBgaNpgxpdwJ3N8EQIdYkKErbbYecqNHnRxj3OrdtXn16VpGQ7 ddMWZ52N7+ZZ7RSnsGGR8BSqmdvGf52q3Xg8CuV2LGei36Jtkt6EO+eJOxjlWe5Iaqiq saxQ== X-Gm-Message-State: AOJu0YzL8VnkuW70zrExnJ/Xd2/BmVtLPutOkcqG8x+hd7Ti08m1B4qG egvo3c02MO/nohnWJBf5f6lPZzn4TFX/PeaktrjiQOxg4C+zaLQg0SKrGHtqkP4M6yHxRM2qF2t E/rPg1kw= X-Gm-Gg: AZuq6aIcBMZWLgg0q7JVtV++3Q5MXB0pgqGocMUJwK0s2KqfE5xIaYB0bOPx/eYXtjQ bHuBrjqL2nhUNUfRLCWRfI5kNU0lUbkZ1WniNJE9cfmUDHZr7ybKnyrRWcb0nOWqu5hByw/sWZU P1qCUYWLn+xZ5jWFb4QjmE4CqW7d59Bg3fc9/+BKK8gqIvMckicI00ZC1YhXkZ08N5wmvaKG5U6 ybZn4km2rTwko6JJi0N7XYn1cgnTK/IEjUvPOgzVeUuGR+fNhnda3ivTuBppeb3I0Gv5gMMD0ti lI3xXdc06U5vBb1vFYn834XNt/ZOvNzFcatyuyLNSicn65e2FWnSvFZAIfKc064zHZVyFlbepqX HB0D7IBGnPT6xc1AM1PDPqlkd5srIJ6X6dPsEzt0o3jiYfJDwn80cGldGQrDXi+7fJ39wSI5wjv ZjaTVX+Chjn8kIEhJLuJirbtLFVaw5R1Q3tqYKaqKjJ6xfqMkx/rnjs12yJiMBOarbIbz9nu11c FN0tcbC0D+1M+CkCMFzTzbu9qsVUDfi44Jbqbw= X-Received: by 2002:a17:903:2a90:b0:2a8:ff32:5f96 with SMTP id d9443c01a7336-2ad17430becmr94246895ad.13.1771321886297; Tue, 17 Feb 2026 01:51:26 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: philmd@linaro.org Subject: [PATCH v2 6/7] page-vary: Build migration_legacy_page_bits as common code Date: Tue, 17 Feb 2026 19:51:05 +1000 Message-ID: <20260217095106.598486-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260217095106.598486-1-richard.henderson@linaro.org> References: <20260217095106.598486-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::531; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x531.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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1771321939311158500 Content-Type: text/plain; charset="utf-8" Use target_info->page_bits_init to implement migration_legacy_page_bits. Because this is the last function within the file, rename page-vary-target.c to page-vary-system.c and build once for system mode. Signed-off-by: Richard Henderson --- page-vary-target.c =3D> page-vary-system.c | 19 ++++++------------- meson.build | 2 +- 2 files changed, 7 insertions(+), 14 deletions(-) rename page-vary-target.c =3D> page-vary-system.c (74%) diff --git a/page-vary-target.c b/page-vary-system.c similarity index 74% rename from page-vary-target.c rename to page-vary-system.c index bc4d8931b6..6c49c10e23 100644 --- a/page-vary-target.c +++ b/page-vary-system.c @@ -1,5 +1,5 @@ /* - * Variable page size handling -- target specific part. + * Variable page size handling -- system specific part. * * Copyright (c) 2003 Fabrice Bellard * @@ -17,24 +17,17 @@ * License along with this library; if not, see . */ =20 -#define IN_PAGE_VARY 1 - #include "qemu/osdep.h" #include "exec/page-vary.h" -#include "exec/target_page.h" - -#ifndef CONFIG_USER_ONLY #include "exec/tlb-flags.h" +#include "qemu/target-info-impl.h" =20 QEMU_BUILD_BUG_ON(TLB_FLAGS_MASK & ((1u < TARGET_PAGE_BITS_MIN) - 1)); =20 int migration_legacy_page_bits(void) { -#ifdef TARGET_PAGE_BITS_VARY - QEMU_BUILD_BUG_ON(TARGET_PAGE_BITS_LEGACY < TARGET_PAGE_BITS_MIN); - return TARGET_PAGE_BITS_LEGACY; -#else - return TARGET_PAGE_BITS; -#endif + const TargetInfo *ti =3D target_info(); + + assert(ti->page_bits_init >=3D TARGET_PAGE_BITS_MIN); + return ti->page_bits_init; } -#endif diff --git a/meson.build b/meson.build index 4af32c3e1f..1dc10f144b 100644 --- a/meson.build +++ b/meson.build @@ -3835,7 +3835,7 @@ if get_option('b_lto') pagevary =3D declare_dependency(link_with: pagevary) endif common_ss.add(pagevary) -specific_ss.add(files('page-vary-target.c')) +system_ss.add(files('page-vary-system.c')) =20 common_ss.add(files('target-info.c')) system_ss.add(files('target-info-qom.c')) --=20 2.43.0