From nobody Thu Oct 16 02:16:36 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=1753913211; cv=none; d=zohomail.com; s=zohoarc; b=iZyOFvGOvaIS341fMdqB2oGr7gYitHkNIs/U8a0ktcqeppYkME0Mo6XTMTWYAwg5yHZziozyOFReKtyIPnz6+BVMyQ7X6xVrP/a4xsWoWmPvQoVqAb2ruVPo0yD9UAJuf9YUZqtQplh+8how7dzc9S5Aj3BCL8OC8WXsu10HhzY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1753913211; 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=ESNH6tmDlZQKXvIEUDfACzeOwl9XVsRpSNf/MFEy7Vk=; b=mgG1RD/leJURUUmaysvZFysnGhh9rfugdNzPYT1j9IUsuXeNk9SiOEW39q0LEQizZueRoyo3ZYvaVr5nWLzMVX6d+Q0Q9ci9Vs5oDbk515yvPi9XkVffAdVYSf3Rrw2mbdNlwqex0DdVpHgfTJIoIOZYBLQIXGsdHlJ1BgTOVu4= 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 1753913211327122.7175951751276; Wed, 30 Jul 2025 15:06:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uhEvs-0008PO-BR; Wed, 30 Jul 2025 18:05:56 -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 1uhEvS-0007wP-3z for qemu-devel@nongnu.org; Wed, 30 Jul 2025 18:05:30 -0400 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uhEvQ-0002I4-2P for qemu-devel@nongnu.org; Wed, 30 Jul 2025 18:05:29 -0400 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-24009eeb2a7so2989735ad.0 for ; Wed, 30 Jul 2025 15:05:27 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-241afb7037asm1266325ad.0.2025.07.30.15.05.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Jul 2025 15:05:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1753913126; x=1754517926; 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=ESNH6tmDlZQKXvIEUDfACzeOwl9XVsRpSNf/MFEy7Vk=; b=Y3GLZlOH84bS1YYGGR0WmSxJcN/VCzuMDY0VEHk3XWxYhEg1Mw6S63f7F6ZM7qomrt 1ONkzduKpZ4qUcJeathXk4pSBeraWs9WE8nI/38GCJ2AxVrQDXasTcRVY75hZUbmIt84 gpRDX2OCTD3a+NfX88UUwEpc2C4Gi8n5ZIbPhBIvkSNf6JN77+uJJrWFYlz7/2T37V9c 8+B1sQhZpehIbbCqyLLQbg7UzcC9UPPwJ5t+MnVfU+ZhFXZZRxKYhpGKEqjJOB7QUx/c Cmfk2BtF4V+gcnWSmSbn7578qI7nOrKVgMeqzH+JefwnlG+VULDIB1kNciRaF8jzEykC v/bQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753913126; x=1754517926; 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=ESNH6tmDlZQKXvIEUDfACzeOwl9XVsRpSNf/MFEy7Vk=; b=LsivaGNmvGhfiaZ7df6bT+WnlGclSrd2p/s2nYBKmHAZGOrbGBsJuWg/kYPq4qO3P8 Y0hQP9uJAZkeQMqwns1nUeCvj9ZJu+orbNKrytuo7grE6yooKXxWn2ZnqFnEqZzC0MXG yucyxc6/1vvsbWzOk7oSyTL53bYwJDPK/uyvUGPW6a7edi6LlkxGbffqBpWMzs2bQ4a9 SOwjH/VNtvsCqOdPdICjR5iahQmxCk0MSlBaX6RsmbBEHaghoZ0Wb6P7lW6K0fzQHblo qfFkwE7sHysVSzS5++Ty5Vciq9C8zg5BiC789cSa0Iz4cky5dzPFX38Ya3pxNyCv76jd FHZw== X-Gm-Message-State: AOJu0Yw1YkAejRJcVtzU2ydEGBNl8l2FMeRlkcQE12l6M6VL9qqUPkH1 gQi7NR9quCFB5QpAB+c4gKqpVjwHbZdYsFwVOqSUCSYecM8zj1CgY/OkAm6H5WaFXkIrwaxxOkh ol1xx X-Gm-Gg: ASbGncuXn8JxBCUv3soXCyF4/1v5Yl7Tnjb4c7BfQhmZzQkbG6aaMoij9OGu3YEHMl8 H6hUj3hl7KqamCVwkjI6nRJGNcPWZhweabdMQQiPU9MOM69DH7UdxI+fGdxRDivjHEi4pM6TIHr CswxocelxieriZ7HBgb/O6aCD4GLWzBj9REYWIGBKpN9pz+a6MFMvIqZJssxfihKbmfTgg/a9Kr mFVKFbRu5FWOEr785ZbesGthBwxnW0/VlfYBtsaFXQH0QsoYWnvWR9KGvqbjCm2bhdKJnnap4Rg tMFi5qJ7/HgIIMOB59GVekrJRbsTPKTnpX0QVZu7vnz080MUkCNaPgI3a53EYOpQRcA0ytyGpi7 6TL16bd1RNRVwrnsNAwl33/m6qMZi1Pe3 X-Google-Smtp-Source: AGHT+IENLnl7toIwOFRS4iMQ8FbhV3WtKZb/Axrn6nfG+1o3qfmgV0pPHd3Kx0Ku6h58uhHnzIgi1g== X-Received: by 2002:a17:903:11c4:b0:23f:cd6e:8d0f with SMTP id d9443c01a7336-24096a66231mr69425055ad.13.1753913126256; Wed, 30 Jul 2025 15:05:26 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 1/3] cpu-target: build compilation unit once for user/system Date: Wed, 30 Jul 2025 15:05:17 -0700 Message-ID: <20250730220519.1140447-2-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250730220519.1140447-1-pierrick.bouvier@linaro.org> References: <20250730220519.1140447-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::62d; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x62d.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: 1753913212093116600 Content-Type: text/plain; charset="utf-8" Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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 e53cd5b4138..218a9ad203e 100644 --- a/meson.build +++ b/meson.build @@ -3874,7 +3874,8 @@ if have_block endif =20 common_ss.add(files('cpu-common.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:36 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=1753913251; cv=none; d=zohomail.com; s=zohoarc; b=J7D0Qz1Q+xqlHh+Vwi767bINbuupK1ASD7/At2WgTBLEmOEGC42hhZKRkQqJpCkXBdySR9eL+2ZDWUlvSUIUiwJee5XQhTRVY6bWKr54ai/XYGqNSd/3Te25LbD2AjvfpgLAw1261VM6VvmYR/XQcVwYGOVZf0BStXxn1bjG3Xo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1753913251; 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=JWqG/ZCcf+A9z9lr74PPjPnFPBKLGhXlaBBrGS/ZEnE=; b=D8aboxU+GmGF/l+DnLaS242yp6+PEYM34vdiskOkGzU9rEYUX/xf+QODH02hHZ5Udcrpo5KmjrStfAUzfuziqqiP4NzAZXQQcy+rW3k/kJBMei3s6mGPZnzGU1TSKgnBs8V36m5UFWPeMTqUUvzK/L4lObyilXP1w5ufm+TMqnE= 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 1753913251601671.6977693551698; Wed, 30 Jul 2025 15:07:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uhEwd-0001aj-7d; Wed, 30 Jul 2025 18:06: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 1uhEvT-0007xS-RD for qemu-devel@nongnu.org; Wed, 30 Jul 2025 18:05:32 -0400 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 1uhEvQ-0002IJ-Qx for qemu-devel@nongnu.org; Wed, 30 Jul 2025 18:05:31 -0400 Received: by mail-pg1-x531.google.com with SMTP id 41be03b00d2f7-b3f741a77f7so237944a12.1 for ; Wed, 30 Jul 2025 15:05:28 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-241afb7037asm1266325ad.0.2025.07.30.15.05.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Jul 2025 15:05:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1753913127; x=1754517927; 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=JWqG/ZCcf+A9z9lr74PPjPnFPBKLGhXlaBBrGS/ZEnE=; b=LzUTpOhr25saEJDQXAt2IExKwS+fn8FbEm7XbQ4l+3xx2pEN7ZT2LHVarzf5oT7JI0 cELEwT3uQjp07ZK/A40/eUji0KXnUiHtXOZHJYQN80hnvCyZm7w9g+SJTEFzs33WNenb Sc711owlrfFGa93IBOOGSPI/26XNRp6aCKvIzMCGsZ5yp200qbBeYcQm+C6CQNYhDyv5 I3FnkTQwohGufs+qQ79cB5bJLEfgh5gZHKpOJ1N4xqwVRHdsfHhsQnfz1rmo9QxdIH1V JkhsFEghXZfllMpUN9MxWi2yVmGolsF0gmhP4nKlBIdXts6cCOBmAc4/f4d6dKVaAmJs QKAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753913127; x=1754517927; 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=JWqG/ZCcf+A9z9lr74PPjPnFPBKLGhXlaBBrGS/ZEnE=; b=MspDOi6OK9e21y37gp/Jc2ZZhOi1qG2amA5OBld94BEXifTKRkmv9ltrebsgI+Uyk1 L4Pl3RTOLh0cl9owdWmVxUtTL6ZNcSB5kE7mi6/jCMKHEfwdrjWHJwyt/9QgcjJT6AUW jmYtPz1dqZzu8wzmvwT4TfbWW6cD/X2DBa3bnBc+CXdbKfBWS6QWXLyt0lPZbX9XVPC3 Rjg/H74IPOQ7pVhK8KorGEXT6AXrn7hGXdaYuz1gUPEXdEmQK9bJUzEFJaVJU+UoNYzY p1NsuOGjHMY6a2Y+k09/YHbaOq0iaHG+Dl8HsOZh2/audDF7ooPf8mkyc1PrHQisBQ/m lnvw== X-Gm-Message-State: AOJu0Yydxb+foj61Jj9u4ztOQIbjkerONRmoM/x5wJl9Q0QfV166nZQ8 gduIn56npK6EjUT9yZRR6Mw8KK8q7XVlRBwRzrvkEhq5Q/rIjwILUhUw+NBDqU9EOSvpXEpVR3C t5/WA X-Gm-Gg: ASbGncuc5tdMvN5kOu1RexidnZMgsDDZvKx7kD6ltOlOnF3nnj0+Vc3hZGKfQ/X20YI imydxrjvzq/6BFDcJTUDWwcUrhokB2Az8BqWnPw46HzGseXkC17FOY8hDanX4rN0OrwvnxYjeSG bF7VHC4h/02XU80chCXur+b8wJJNv1SbeezFPSY3jaYe4/hBOJoDxZ2JHNODgattU7PpX4u+x4n mRG0pqK6Wq71I9l/HP991IPLOQ7ETOY2uoargCCkXj5a+bYkDn40lLJdDEPjlYBF0NEYrByl/bV kjS5N4u+WxZ/qPs3GIcghuqQ0ApvK9lahBJoJFvCeMeZxyQfoXh1OvCURWW9G1wF3qSD6Mpex7i j7KZzEOraO/2xd1GAWj1wiA== X-Google-Smtp-Source: AGHT+IHFCbOYutiwPbJ/qhYuPA4tEA/EauJphSu2WmJPD+wVIvjyHTGTUXlu2WtN9DGyOUGnW3sWQw== X-Received: by 2002:a17:903:32cb:b0:234:c549:da0e with SMTP id d9443c01a7336-24096b587cemr84370605ad.47.1753913127176; Wed, 30 Jul 2025 15:05:27 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 2/3] include/exec/target_page.h: move page-target.c to header Date: Wed, 30 Jul 2025 15:05:18 -0700 Message-ID: <20250730220519.1140447-3-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250730220519.1140447-1-pierrick.bouvier@linaro.org> References: <20250730220519.1140447-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::531; envelope-from=pierrick.bouvier@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: 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: 1753913252633116600 Content-Type: text/plain; charset="utf-8" Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- meson.build | 2 +- include/exec/target_page.h | 11 ++++++++++- page-target.c | 21 --------------------- 3 files changed, 11 insertions(+), 23 deletions(-) delete mode 100644 page-target.c diff --git a/meson.build b/meson.build index 218a9ad203e..f94209bb301 100644 --- a/meson.build +++ b/meson.build @@ -3897,7 +3897,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 deleted file mode 100644 index 8fcd5443b52..00000000000 --- a/page-target.c +++ /dev/null @@ -1,21 +0,0 @@ -/* - * QEMU page values getters (target independent) - * - * Copyright (c) 2003 Fabrice Bellard - * - * SPDX-License-Identifier: LGPL-2.1-or-later - */ - -#include "qemu/osdep.h" -#include "exec/target_page.h" - -/* 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:36 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=1753913184; cv=none; d=zohomail.com; s=zohoarc; b=cVms8s+zb7JdfOoTVjI8fh87Qi7YmxIGFSiJQe4LGvxkcPR+zR+b0QLsiOiFXd/Br623XOo4ZIEHQBiUiUzOn9kXyFHHzSt5+RTNY8JMLam/dClmF5Tnl4tGWBabD7w+k1Nu6M+6nX8Hvu9le36rjovxHLZY8VuUoUp556T+tQE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1753913184; 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=98pntvYuQznppxjRtjI3xXWWjmHlHvMSZIbn9K3Czdw=; b=CWrmwgZaYpc5iBSLvuMuTj7IbfqBCHw80pG5ltDdNEBWifAFOd0ZFDQHpkjQxrxYzk7ZU4M9h/6INkL+F9mDz8iJKGlkkNbtmu4swqqOA7zDEO8+YuRM+1Osl+fbBEXkHS2FEJuu6CqESXxUQzZoRC5Io4JVXM/Ywokvz39gqQ8= 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 1753913184486887.638787109763; Wed, 30 Jul 2025 15:06:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uhEvo-0008Ki-AL; Wed, 30 Jul 2025 18:05:52 -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 1uhEvT-0007xT-Qy for qemu-devel@nongnu.org; Wed, 30 Jul 2025 18:05:32 -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 1uhEvR-0002Ih-IO for qemu-devel@nongnu.org; Wed, 30 Jul 2025 18:05:31 -0400 Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-74b27c1481bso187521b3a.2 for ; Wed, 30 Jul 2025 15:05:29 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-241afb7037asm1266325ad.0.2025.07.30.15.05.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Jul 2025 15:05:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1753913128; x=1754517928; 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=98pntvYuQznppxjRtjI3xXWWjmHlHvMSZIbn9K3Czdw=; b=dKxzOo6NVWOCh3/ONqLf+3Dgr8w6YFpLA36NuggQp6Ms32lmpP5zi3KPGJBvz4A8Lh JpGUA7XdHcxTXrurw8Sm6c11IvU59MrvvdMdOPklM+AIhLEGTD+iFw57QLW4vteG2vB9 69z7lLKwwkUpPyoisjoht2CjDz6XLnyFfAbgOnwevNlwXZqp8CMp8eXMU4x4/IPTu72B eF8Ud/Wrwu9ZjZmiqBsvmJKnxwYlkZoCzinoc0LXnYHOZdXAHguWW/vBjDcFZmqo3OZg cfiufVyHN/WgulPUydLSDkO9i3Uz7FydfyC+4D35YKSrZGDM0p6XbBFT8BsEjDKM36TK LD9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753913128; x=1754517928; 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=98pntvYuQznppxjRtjI3xXWWjmHlHvMSZIbn9K3Czdw=; b=Dybh33VyjfYW9HX3YwWCvmo6C8HBopKtGlJZ4MDiOorsP8m9IXQIeCFns58NCbUtk+ aBuhSoFFsXa0f+ifKRc8xQf1qeXaai6+uvD/HTVZ/LWqfKHJwE98K6/U+1CJ/G9kWc4b whWr76sbA1BrPsfm46lPQ6bzjojx6JgvKwWTdtoD+55hsWHO6wvbXttCo8H4OoykWXst v1x1KhHZ3wwD5awCilwOUOg6BV4xwNEzH8MawZLzpSOFjZ/2j4OXMOCr3tXTdGARM9kB gpiXdeGKB9gzwZEUCTe1scxJVyHZxAm1MLVHrgkW9E/gqjSCFEwMEZE9JyXp9Psu9/Hf Xn9A== X-Gm-Message-State: AOJu0YxNGPobJaIDnpz9cEdpKVtKjq3ytU7ZKTkiSpyGNFm3/97B6oEh 0RyjmNgD2mgVeiHFvP1b0SE7v7pORZ6Y+YNZfSY0xqOqoB7uZNckOPVv2Kwdo4WFRthuz25Xzau 7NKHX X-Gm-Gg: ASbGncus3Rvjj9pWfIwAq5VXeTI1aiZjrDATP3mM7J1PwcmLZEyUNkD0wDixjHNGcgz r2nlSHLRmDCjHQm4Gs140+CYSpae2IEb88axbSJBnydbHZwo/aknyB2rUJoi507ZlWGbg8EPGCd avmi5PpUOobV3V+CAxo/lHXXxZuoIsO3Cwk1ytuwMQbNVca7aduPMoB0t81V8nicTLLTBNKu8yG s+Mqy+dCDDtqdZPARxdJW0ZDThht27pZc5K9NLT6V5/6+lpwmtv4MC+j8lAwVsxqM3xK6blqOGN 5e0iqIxnDjhtgJL99GhegYriMoY+pHCDZd+HapZCw6fJGPuX6w2db/w5cKdIacX0Y40Jnx5uPvu fCNTI5AEJ6Q5qcHZXVwBloQ== X-Google-Smtp-Source: AGHT+IEU5eNwFJHvBra+T4boIIjhmLHVcGF5DxzrDkOD9WuLEeCdxyUpyheVaSZ0fQCTAF5o8QWaGA== X-Received: by 2002:a17:902:ce05:b0:237:e696:3d56 with SMTP id d9443c01a7336-24096ae52cdmr72371225ad.32.1753913128014; Wed, 30 Jul 2025 15:05:28 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 3/3] system/main.c: compile only once Date: Wed, 30 Jul 2025 15:05:19 -0700 Message-ID: <20250730220519.1140447-4-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250730220519.1140447-1-pierrick.bouvier@linaro.org> References: <20250730220519.1140447-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: 1753913186046116600 Content-Type: text/plain; charset="utf-8" Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- meson.build | 4 ++-- system/meson.build | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index f94209bb301..b72d4ce8618 100644 --- a/meson.build +++ b/meson.build @@ -4420,14 +4420,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 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