From nobody Thu Oct 16 02:16:35 2025 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=1753475188; cv=none; d=zohomail.com; s=zohoarc; b=WI7gd7W5sbzEY1tKWhqCfVe8KDNVjoqkvL5p6uuIOy7hQKZkRjiLtIop2sy8p+FpAaGiF+xuQxPxom1nhr+nlKCYvlxVMSE4PWqcmEXwRQri9guToVpm2eoxaFemB7zhbu+eLPCBIPzsTZXAUpiFdHBQMQXdfrtmrFTlR1XJzj0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1753475188; 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=Uein3BAt/0r6KhDw4Uu8oyUNGF88ULTG7TVz9l6UE94=; b=aL57qI71zsny/qhtNZaKiV9gIz2Ugoo85R+8fE2dZ576yiZqnvhM3nOWp0zviQdH1fAEJ1pezxuMmTJNi+CcI4ACfpZ9plfLmu5eZjrZjudOF3BoER+Jfznl8IrYm//bLp0f9sTC/+HDNHecHC9q0oim3A7zOjLJJXDih7HnwL0= 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 1753475188655435.1718588660516; Fri, 25 Jul 2025 13:26:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufOz4-0005iX-Tt; Fri, 25 Jul 2025 16:25:38 -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 1ufOu2-0007dM-Nv for qemu-devel@nongnu.org; Fri, 25 Jul 2025 16:20:26 -0400 Received: from mail-pf1-x429.google.com ([2607:f8b0:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ufOu0-0001EI-Ac for qemu-devel@nongnu.org; Fri, 25 Jul 2025 16:20:26 -0400 Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-748e378ba4fso3307888b3a.1 for ; Fri, 25 Jul 2025 13:20:23 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7640882071dsm360925b3a.16.2025.07.25.13.20.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Jul 2025 13:20:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1753474823; x=1754079623; 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=Uein3BAt/0r6KhDw4Uu8oyUNGF88ULTG7TVz9l6UE94=; b=khRbfvQTWswY64Q1GqkrRXu9fc+8JS2x1nNeJUX91nJMNSljlnW0JfGDaz2xxIH9+6 fcqILY2otHTeKffcMGvSKTKkA2+jImHhq0IpQZ+O5NaJt0/mlG+rDmQ5p1aWIMxO8oVL QT8WnDw+B7z9XIDJz8QyvhcfXt3pv8NtqcTGmvAA7OFGK1mK3ZSt2CT+MJnAcI8zmjwu OuOZDcUcgje8O0nazBg9oocSZqsO1LjWpJ68hRz+WvXK2UuuxHQ8V8JYc4JRYzfjeNRW UTKLUHLZFgkGIkb3ECfbY8DHWLuakXdVxvzth7qWDfQJIykwIK6+4jWAIsvQ2nSY5DRA Q6PA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753474823; x=1754079623; 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=Uein3BAt/0r6KhDw4Uu8oyUNGF88ULTG7TVz9l6UE94=; b=cYSHglctu7+sDrbeGwgHRA9MHYW8hltzstaQhlRa8dL87dzlbUmWYH9CsV8SfPWTJY Edh1g6p/GrcXF6OqXeyxwujvZpMVYwCTsG3BqpPg+6jbJ3RIbctstR1/JWpq1ZX1wlsn pYEneq6bPN6f66T2GgVrgtiPIRbCxthTOAPZo3rYykj0oiy2gGlAbE001m+xfszRYQIL 6UJfeOEIvrC1dECvzg9h6UGUuTnrm7qsWDnzvd3DHw6+TTD8WeL0i6QgDo/wQp1Pvued InMeB9WGOjMUWfqgZujBG7qai9pmx9s4pPch7c9WB3q80xo/lY9T+vjwHTI/HaabZixg UqhQ== X-Gm-Message-State: AOJu0YwTW9/eEsV3oZZmmFtWETwdZ31/xlGXKPIOf5XZwxCgT8FENV9e RZWookMAXkWjqa784vA0EaFbpVTxIhfE5Qqo+4DHrgHl0NBvUv7oLsu4hnQpjs5DtJzPITRz3WW BE1bD X-Gm-Gg: ASbGncuL+QkDavxLqbyI+6n00ns99ajnupzMZiWDmtIY+XFpXAkZLMMU7EZybjW9oFt 4sPrm7bb0uEtJk3QQH4EWQacn7/RCkDgDhMmsMzjGyk0xFBqcdZSo4VQrfPo6Y/+T7DE3z5DcrL 7R4t1g+FJ5Y7vCGGhHd87B3LvMwOJKtr+UXD1XE+YwtWtPha7VjRKdm3pxhTzgAgDEJZ3bKnQSj 5lSH4f4BkyEBRZRWiXUtXwE9l6gz0KVNAja0/QTpgMwveD1mVZMz9tBlEa81WJA0heQx3D8aaPK 3zcTpsTIBzM+G1+m30b4YP/lsoCpmswpPHOIbreEpOMhw3RewFMe3d9P8z0w0EjZMDWJ+eK1M02 3+a77sV9rK/WjQnLRovbDareLGBuHKtuR X-Google-Smtp-Source: AGHT+IEMwUdL5WGM92wUBgg5/ZyJAC6gSIVz7/melNzVeiF1NvCX9/RxUFQBKckzw6LRUgGuta8MOQ== X-Received: by 2002:a05:6a00:1410:b0:748:34a4:ab13 with SMTP id d2e1a72fcca58-76332c46a56mr4910184b3a.6.1753474823028; Fri, 25 Jul 2025 13:20:23 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH 1/3] cpu-target: build compilation unit once for user/system Date: Fri, 25 Jul 2025 13:20:14 -0700 Message-ID: <20250725202016.21325-2-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250725202016.21325-1-pierrick.bouvier@linaro.org> References: <20250725202016.21325-1-pierrick.bouvier@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::429; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pf1-x429.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1753475189616116600 Content-Type: text/plain; charset="utf-8" Signed-off-by: Pierrick Bouvier Reviewed-by: Richard Henderson --- meson.build | 3 ++- cpu-target.c | 5 ----- target-info-stub.c | 4 ++++ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index 6a471a27dee..d0ae602c2ee 100644 --- a/meson.build +++ b/meson.build @@ -3887,7 +3887,8 @@ endif =20 common_ss.add(files('cpu-common.c')) common_ss.add(files('sanitizer.c')) -specific_ss.add(files('cpu-target.c')) +user_ss.add(files('cpu-target.c')) +system_ss.add(files('cpu-target.c')) =20 subdir('system') =20 diff --git a/cpu-target.c b/cpu-target.c index 772e35495b8..f030e2c642e 100644 --- a/cpu-target.c +++ b/cpu-target.c @@ -18,7 +18,6 @@ */ =20 #include "qemu/osdep.h" -#include "cpu.h" #include "accel/accel-cpu-ops.h" #include "system/cpus.h" #include "exec/cpu-common.h" @@ -27,10 +26,6 @@ #include "hw/core/cpu.h" #include "trace/trace-root.h" =20 -/* Validate correct placement of CPUArchState. */ -QEMU_BUILD_BUG_ON(offsetof(ArchCPU, parent_obj) !=3D 0); -QEMU_BUILD_BUG_ON(offsetof(ArchCPU, env) !=3D sizeof(CPUState)); - /* enable or disable single step mode. EXCP_DEBUG is returned by the CPU loop after each instruction */ void cpu_single_step(CPUState *cpu, int enabled) diff --git a/target-info-stub.c b/target-info-stub.c index ca0caa3686c..d96d8249c1d 100644 --- a/target-info-stub.c +++ b/target-info-stub.c @@ -12,6 +12,10 @@ #include "hw/boards.h" #include "cpu.h" =20 +/* Validate correct placement of CPUArchState. */ +QEMU_BUILD_BUG_ON(offsetof(ArchCPU, parent_obj) !=3D 0); +QEMU_BUILD_BUG_ON(offsetof(ArchCPU, env) !=3D sizeof(CPUState)); + static const TargetInfo target_info_stub =3D { .target_name =3D TARGET_NAME, .target_arch =3D SYS_EMU_TARGET__MAX, --=20 2.47.2 From nobody Thu Oct 16 02:16:35 2025 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=1753475173; cv=none; d=zohomail.com; s=zohoarc; b=hSg5h+kx6f9gvEnt3t1xOaFLK+VQAINLkIZDKhoFnJtYlwStbPIUEvRU33BZrzzyHoDOQsztwRT4QBY0ny0Xt8FJjmrNWiUutY6WNLxyeyMZyXYunWKdh+Bkj0iLm36F+Xc+KrbzmNP6Nvr9sAB5jsETMgq5ETGnVtHWWBNYxUo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1753475173; 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=aZA+eshzNfdTnar9wMQ/m2mWJrbR0690fXWrDb+QztY=; b=dlFo6aUb92X2sfdjQQX4z1ezq7JYEvH0HO+C7xU2q/i2j7DqOda0hx9FGt6KwIFSA21LGzQUbkieCcQEDmHFll9iSEJU0TYRtV13HbT/u/zbyKVzOtAnyYZSPiSSgOr9+9MT2rWyy3wyNb69gpdSPld+5cdZBcRFZuKgtK+Xf6g= 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 1753475173027900.064398686586; Fri, 25 Jul 2025 13:26:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufOz7-0005lT-JU; Fri, 25 Jul 2025 16:25:41 -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 1ufOu3-0007e5-5t for qemu-devel@nongnu.org; Fri, 25 Jul 2025 16:20:27 -0400 Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ufOu1-0001EM-7i for qemu-devel@nongnu.org; Fri, 25 Jul 2025 16:20:26 -0400 Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-7426c44e014so2190137b3a.3 for ; Fri, 25 Jul 2025 13:20:24 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7640882071dsm360925b3a.16.2025.07.25.13.20.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Jul 2025 13:20:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1753474824; x=1754079624; 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=aZA+eshzNfdTnar9wMQ/m2mWJrbR0690fXWrDb+QztY=; b=fAOsrfGtBr4EKpfvv2ZXeSl1kBL7Ta3B8+Lsg0BqNQoCbzA88TWoWgsHRPcmw/WVLG RQetd8FPgTplRil9u3hsz+d+ffXxWTR5j3nt76IELn04IVwGYLDrXz1KMuqcPmHWzFl4 XbE43iNYVtYP3TP6yYLgIxoNoWqMogVLpfpMTuce+HRLS3nrkqn4f+Y6l5REmgj1f77N dKpDVyu53SnRKpwuLYAv8I5uxkyaT+eE9AYB/lbZ6F0PqQWZLIFDU70p97ZZLfxSS4ZG aLeW1ZxqEERv21+2JIC7OAJEdhCxqe/taJG0DQreMPEQFNUAjSBmWV6W7fPH6ubVGPCr +6MA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753474824; x=1754079624; 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=aZA+eshzNfdTnar9wMQ/m2mWJrbR0690fXWrDb+QztY=; b=RYREcXVKhiATlEEzmaJwG8MiFnFFdsQH6C7dcA9NLcmLzFvmc2YJno0ZpXEa4/GxP3 9stLYg1I23BO5KGp/p+xkkKRNn+IYqz295Zx2ytJPMVCsKcaf1MjerNsKnsIb27LPi+R 4Gc0Cc1JHcqIHlgjKGmMTf544YsYkDCUGL1PttrM2M6FBaG7ILevJ9Irle0jtheWYRP+ leMZxyPOAwW4zSH/tStNvS4OIR7MtT2Cq2FDPIxHzCbmv/L9Yogb8HtuDZA0t0Q+5WeO lRsMbbgDd17JhshcFK3VLpWWsWhort0iNnh9uk7HsX+WrFT2F5WLoc4vtE1PAP0XlutX 3/1A== X-Gm-Message-State: AOJu0Yxqir2hn0L5CWBc1XdNkzyaxVXg6zvfsoIEnyquqD8BtNET7GFQ +nzg40Y3nuOu2bxX5CEUa2d04NqV05Le0z6js5LLb4W+P1ATnT7S/u9vbxRV2rwsQ9KyUR3GO6p hgq/b X-Gm-Gg: ASbGnct4KCdobKyWEP8GbIS8ZuZhnSZMJBkncyB/kiilAhztYA5OHWgbmS3izAx667o Cg7i5iis5Atvj/Kh2Bf0BSEczOwsXb+ku76xtzt6vVQYlpzwCpc/2vabeqzLgI5Iwq7i6OwkQcE OMjtuF6Xd1AkGEFZEC2ycFfiJIitlPLiNXdm4l+pulrgdw41sIFAGsOmiM1jZ0n5sUuP+HQGp9w hyVabTB7YV3CiNMY1LfKz3tFcH50/VDEwaJiD+jirjvvIkP8j184PasI9keGkUZXNaAxIpK/Eh8 UoJp2KOOxRIGulWZDVL8QRK7gTqbNRufBQWF7cv6ZpGixZkJK/iWC7L5gidLQ22r60Ac+8bsjjh 9VB5V4dAi81K5MEExS3HAhQ== X-Google-Smtp-Source: AGHT+IEhVZ0eMbnHWvlrlCsnt4SOiSnV7Bq59sUJtgi9+ChiOpaCVUoyVk4c8m86n5/nKozqpvA++g== X-Received: by 2002:a05:6a00:a85:b0:740:b394:3ebd with SMTP id d2e1a72fcca58-7633276c2b6mr5135968b3a.7.1753474823844; Fri, 25 Jul 2025 13:20:23 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH 2/3] include/exec/target_page.h: move page-target.c to header Date: Fri, 25 Jul 2025 13:20:15 -0700 Message-ID: <20250725202016.21325-3-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250725202016.21325-1-pierrick.bouvier@linaro.org> References: <20250725202016.21325-1-pierrick.bouvier@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::431; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pf1-x431.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1753475175435116600 Content-Type: text/plain; charset="utf-8" Signed-off-by: Pierrick Bouvier Reviewed-by: Richard Henderson --- meson.build | 2 +- include/exec/target_page.h | 11 ++++++++++- page-target.c | 10 ---------- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/meson.build b/meson.build index d0ae602c2ee..71c253ba135 100644 --- a/meson.build +++ b/meson.build @@ -3910,7 +3910,7 @@ if get_option('b_lto') pagevary =3D declare_dependency(link_with: pagevary) endif common_ss.add(pagevary) -specific_ss.add(files('page-target.c', 'page-vary-target.c')) +specific_ss.add(files('page-vary-target.c')) =20 common_ss.add(files('target-info.c')) specific_ss.add(files('target-info-stub.c')) diff --git a/include/exec/target_page.h b/include/exec/target_page.h index ca0ebbc8bbd..813591c9b51 100644 --- a/include/exec/target_page.h +++ b/include/exec/target_page.h @@ -62,6 +62,15 @@ static inline int qemu_target_page_bits(void) return TARGET_PAGE_BITS; } =20 -size_t qemu_target_pages_to_MiB(size_t pages); +/* Convert target pages to MiB (2**20). */ +static inline size_t qemu_target_pages_to_MiB(size_t pages) +{ + int page_bits =3D TARGET_PAGE_BITS; + + /* So far, the largest (non-huge) page size is 64k, i.e. 16 bits. */ + g_assert(page_bits < 20); + + return pages >> (20 - page_bits); +} =20 #endif diff --git a/page-target.c b/page-target.c index 8fcd5443b52..66f03c61cd4 100644 --- a/page-target.c +++ b/page-target.c @@ -9,13 +9,3 @@ #include "qemu/osdep.h" #include "exec/target_page.h" =20 -/* Convert target pages to MiB (2**20). */ -size_t qemu_target_pages_to_MiB(size_t pages) -{ - int page_bits =3D TARGET_PAGE_BITS; - - /* So far, the largest (non-huge) page size is 64k, i.e. 16 bits. */ - g_assert(page_bits < 20); - - return pages >> (20 - page_bits); -} --=20 2.47.2 From nobody Thu Oct 16 02:16:35 2025 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=1753475097; cv=none; d=zohomail.com; s=zohoarc; b=JqI+t5R27D1mSWRoN81eOI4z7eeGB6HJA/GsO68t2shw7d+enuOo5RTjdD+S7H+5aK+gjMee7+bOMcnIKJLC+xwmstPfEim5GMQQyYiy5FncjNv6PxDqh5KybJsGHR1uO65kfmW5h9YowCigehSTSssxF0jD+qAD4kpMoz1nzVY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1753475097; 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=c48HtYt5SZHZ65RgJpJ7TFDt711IMXEInKjXtQ8WpUs=; b=PsUWIgRgpZon3YOKrJW2+q5Qav+ICZRkIk4B7P/Wv63DGxi4SywVxwag4XtoufEpq9tjbjUY0/dvf79kfyqIFv8Lqsaz06kxAdhX+E97uHHlUp6/2cn8l4sPxL7YTLVXzxc4QhdxTc7rX/lfNNhgXJS67nlDHfx2FaNJLdvWL+8= 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 1753475097136891.7556136534474; Fri, 25 Jul 2025 13:24:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufOyB-0003oA-IP; Fri, 25 Jul 2025 16:24:43 -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 1ufOu3-0007eR-Q9 for qemu-devel@nongnu.org; Fri, 25 Jul 2025 16:20:28 -0400 Received: from mail-pf1-x433.google.com ([2607:f8b0: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 1ufOu2-0001EZ-5e for qemu-devel@nongnu.org; Fri, 25 Jul 2025 16:20:27 -0400 Received: by mail-pf1-x433.google.com with SMTP id d2e1a72fcca58-74ce477af25so1830054b3a.3 for ; Fri, 25 Jul 2025 13:20:25 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7640882071dsm360925b3a.16.2025.07.25.13.20.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Jul 2025 13:20:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1753474825; x=1754079625; 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=c48HtYt5SZHZ65RgJpJ7TFDt711IMXEInKjXtQ8WpUs=; b=PTWDY5ns3o/GmRs3Rre/lfm54opJx7XV8xb9fxiComHL1DjpMGU9RQRm0NIWXQjZw7 QV9bUTkhwKl3MXRG7Q3tVUHepMufS3a7nKLfaJEWg0u4n73+7LVDKCsUt4CglJ8AhC4S r84YQfE7ICCdN2TKGXS2S06PeGWu1xc1u9ZzF7FQahDRPg62plKlV1deFL1zygrAvQlZ 1oFk9qZNa4AIMqFZaYtiKpV7zZOFtAZdJzpopEcDH3Rn2McN9eZfcGhGFlx2B5fh6+/E qHfud2j7pcWCoRRDMFBSObgyJxaDqzWoS56eevEgo2pgHHqOj+DLEgFDDj3SqLKmakNL 8IBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753474825; x=1754079625; 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=c48HtYt5SZHZ65RgJpJ7TFDt711IMXEInKjXtQ8WpUs=; b=IMHRZdEx+k3COmXkt8EUmiIDQVTtF3osYotJ8t4vGFmsV+hS01mIgFsAquv3LzIsIB nFSfBc9fFLJ9uT3tZ60Wvys3hecCcXxtQYHhtpN9IwoJgekun2gYEjZG2h2zDeu9f7Io r3fJipQao6T57nDUIy4DtJlwx9DP4Wvz0J9ZW0wAO4aQr+qA50P1GOhsccmh9sE6CxIP fQMzy/z6VZP/uXu81nUZANyTX+lFw21WYWeUk5Iq1qCbZ4vQyUYXAYqkCGd3Jc74PW69 ge4q8M5kzN5tUzzQhDegl0OvFDLQIfQGNki9Mjm2IDdV6iJb67wIuR8YOY8KOtvrSfG0 f1ew== X-Gm-Message-State: AOJu0YxF7lo/ajPAj9hw6jcPoa65Qulrmd1sGRE+KVxNMptRBGQe2Cte vrW4GEI/yVDBagUxkoEGdutgcQEhGjq0aJBkqN0xJmykYOdUg3IYwMQfgTH7kuuR5nFfHqQ2M3s iCcFt X-Gm-Gg: ASbGncs3MIEu6Gvshxv60MhDbukUhCzTLa7L2prl3Gul3OUdAzsS5t45RKTflq8pujV u9SwRwh4ReCkE6vrplCIHPf7XZjofox3jCC5tHJ9Y6U20n3lcLFyl3FVnqWHCsBCh2EcHvcjqwu ekvFXjfdjG1e3ZjOjyprKQF2g2nPzuMf3glhtY6d7VpLmsTwtGsQaLm9NA6Gfl3x6JeAtDuf7xF XJfSZfrh4PWO5RLh3fcmKnYcAXW22gxfr3bpkqI0Tb9YqBDRzQLZyi7xMvvGizwouFdepsh47lz tPPeAYIS4tQI6HDFtHpqL8nWFkmPqybYr4RTsEW2pM7JYspD0wQDS2b8uEPUPrJA4TYLn64yHYb jnlxJcpzvog0qXrJjQJi2v8tKj/UNtAFj X-Google-Smtp-Source: AGHT+IG6LgCHPmqslxZONZpgYLY2+4Ri9+zUaDAJt4X/R89/24ZLv/iZbQrWCj6Eg8Mx8L4vfUJscg== X-Received: by 2002:a05:6a20:7486:b0:23d:4777:49ca with SMTP id adf61e73a8af0-23d70191082mr4906128637.34.1753474824662; Fri, 25 Jul 2025 13:20:24 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH 3/3] system/main.c: compile only once Date: Fri, 25 Jul 2025 13:20:16 -0700 Message-ID: <20250725202016.21325-4-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250725202016.21325-1-pierrick.bouvier@linaro.org> References: <20250725202016.21325-1-pierrick.bouvier@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::433; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pf1-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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1753475098658116600 Content-Type: text/plain; charset="utf-8" Signed-off-by: Pierrick Bouvier Reviewed-by: Richard Henderson --- meson.build | 5 ++--- system/meson.build | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 71c253ba135..7718983951e 100644 --- a/meson.build +++ b/meson.build @@ -4437,14 +4437,14 @@ foreach target : target_dirs execs =3D [{ 'name': 'qemu-system-' + target_name, 'win_subsystem': 'console', - 'sources': files('system/main.c'), + 'sources': [], 'dependencies': [sdl] }] if host_os =3D=3D 'windows' and (sdl.found() or gtk.found()) execs +=3D [{ 'name': 'qemu-system-' + target_name + 'w', 'win_subsystem': 'windows', - 'sources': files('system/main.c'), + 'sources': [], 'dependencies': [sdl] }] endif @@ -4519,7 +4519,6 @@ foreach lib: single_binary_libs single_binary_objects +=3D lib.extract_all_objects(recursive: true) endforeach executable('qemu-system', - sources: files('system/main.c'), objects: single_binary_objects, dependencies: single_binary_deps, link_depends: [block_syms, qemu_syms], diff --git a/system/meson.build b/system/meson.build index 6d21ff9faa7..f358c2c446d 100644 --- a/system/meson.build +++ b/system/meson.build @@ -18,6 +18,7 @@ system_ss.add(files( 'globals.c', 'ioport.c', 'ram-block-attributes.c', + 'main.c', 'memory_mapping.c', 'memory.c', 'physmem.c', --=20 2.47.2