From patchwork Wed Mar 5 15:39:11 2025 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: 870555 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp848982wrg; Wed, 5 Mar 2025 07:40:20 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVLzZWxQ7oh7GxXzBZtpPlXrxKZ2l0O79dQtK6z8MxNCBR7U759mtnDFhaOALyhOVdz9rYXHg==@linaro.org X-Google-Smtp-Source: AGHT+IET9GqAPh6AcRwzVevMw8SJsKnwWEyamX/XhbU/JMcCk+hCPl8SIvMSkhHZkp04kI6wAG3l X-Received: by 2002:a05:620a:6002:b0:7ac:bc66:5efb with SMTP id af79cd13be357-7c3cc37aaf2mr1078494885a.27.1741189220392; Wed, 05 Mar 2025 07:40:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741189220; cv=none; d=google.com; s=arc-20240605; b=B18blQz95WnvQj8+dR4xUPYeq7kSQxM+xZ7e8G71FnSqjzBBwvc7cufAmtLxCsGTKa qJJQy8F+bwCRzxFhehgNs3qBaJrPXv2+3sBXlsydd4aRQl4l2y18J4CVPKtm/2zqk5T4 5PcWj3EuW2lrgh2AZobwITmOfLTAHcQjNbTfwUPeIKHtFJr7txs9uH5LwRbvxnmAIX8Z +eIkwcGR8FHcE1JeVK8A0/dV7663VGtwt7p00cqyiOWuEpW9ApRF56CeapQYP+lMO/Bl rj8zvg0l26mzjoXU7srUpUVyhq7ixKLwPiMOldinsDPFzYOj8Xor9+5pglZuUdmtV2QW 497w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=A2FkBxorOu2f4P3hJ5OavZpNo+Kja/eoTDhM7V1YPN0=; fh=iYS+U9AiAK/hVpJiag4U+eV/XPHIFc9y9I+tcL8yyYE=; b=j388sSCjlMpofto/jyeNIN/i2tvV/Ml8/S9zFqOCL8E8UUiLiiIYgFndAIUR21tfpH dPJ1viDu01uax5kABLVmChLJs75/zqARqtCkgOc+aXzEjZNMuKu0z9LDkBNKVqJjeoFg xyPIjrGMVseAXw4Xns+9YG+JAIWMIgn2lyN5qT6SwSwUGeU2b09oFsTnUJ1zeXiF5Qlt AkWp97x/XQVmT25phzNbv7ySTBM2L6WUYG+bUa/odVOKKCkEZ9/GSgycehQFuyNdKkTm cuvdQ/vlXv8ExnuGKc2a0xoyfVQPv8JtNpu65K9LGWELXRd916NbDyyHw7pc9kcyTImT S7kw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dzaVYMjZ; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-474dc3c3b42si69964491cf.248.2025.03.05.07.40.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 05 Mar 2025 07:40:20 -0800 (PST) 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=dzaVYMjZ; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpqqZ-0008GU-4Q; Wed, 05 Mar 2025 10:39:47 -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 1tpqqR-0008FF-N6 for qemu-devel@nongnu.org; Wed, 05 Mar 2025 10:39:40 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpqqQ-0002EQ-0H for qemu-devel@nongnu.org; Wed, 05 Mar 2025 10:39:39 -0500 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-390eb7c1024so4143874f8f.0 for ; Wed, 05 Mar 2025 07:39:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741189176; x=1741793976; 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=A2FkBxorOu2f4P3hJ5OavZpNo+Kja/eoTDhM7V1YPN0=; b=dzaVYMjZVcmhbx1F6DAq42eQbo5WWmlHf5qeP+CPfEgTl/ihKST4d0C8eqbEoCLu19 rAihHIxu7K1NoVrAVs0GnGMyjOxByvqi8rSOjrxg1e8cxW+RrcvWMCtJvd9+OL/HoHLQ oMPQUCFKCEFdGyzuAuHWWAtnNEjYHoMQqT4h5xYZXUB2SHlsOdTfF+ZfFIviMy3qZc/p sBLE6vAoGVnyhqU+M1DwBAO7iACl6Vjfi+Yz75XDR1m8H3QOJ3ceZWErw6mpXQpPq9Lx /ewtha/+Bfv/yGe0XZTxwsvKCNBaigGMrWcVuyOzBx5W+BaOX59EWlYdHwa//AKcSoDN cnww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741189176; x=1741793976; 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=A2FkBxorOu2f4P3hJ5OavZpNo+Kja/eoTDhM7V1YPN0=; b=Wg0xu3AYd0M+7rudV5r/N6yD7u5Tt8eZkcLcCMsfU9jrEsHRltEOACZ9hMG/lbXYCu Uc2LgpiZCusE/Yoh3GOdAMhVEptyfRWPpTAw8NVr4UsNzoaYkATkYGR6b9Z1LOtCyWhg FjPsZPimeaeeFOUg8VoCzab9d1a+is2D86d0FAzHjMKCDmxabykPdZ+f7KVR+/A9fixH eQnb7nyJb3YobQGLThM4aykd9aiyES/kYTI+Ngdp2pb4nQXjeIcL44NeB5oVyn/QSpxv VlSNLT1FJsthvxDJLJ5imaRsZc0anjWuaskn9Sdrl1XR4Y2TqE7m+UQC6E499PyhJWel Uc4g== X-Gm-Message-State: AOJu0YyltUX3AtH8l5VAi/1h+m8aP0/A0KrCqozZFAZi3vq9GoQrNgnu g+XHOgbwl3mSoIZyHs+HtQnUubBFGvEbdXVpnYP9KngqGtQ1Fs2/QtW6LyiWP8Rg1k9HKF9dsgr fi4Q= X-Gm-Gg: ASbGncuehPRg1R5cc0UYpe1vsjrbvbvuRANx61xGi03dsGXwVEs2EH3N9dSPe+ex/vH mJgxmsz81PVhetHcxo61GDzdldZ9ZfBv30yNxjgEr0v2/g1pVMsWgvXLRxQs7dhaeQFXpZuZJV4 e/HpPOUvBrsmN1rDt18/ARhldQbwa2cRtlW8uGhQ2mXwUckdtINeBM7IY94fKRjh1ER2wRXit5Y wEGWFE4vQybk3OsF4UQSX2Ms3LYptnJVu5PJUA+3XF4nVslvVSPqr07DGTnUab6YVIv04dA/vpB ETYN4GeWYYgN+zpoLlYv3kVPLzWfPnuzwcwyfp3bNew+IxxopvpRdZnGVpHN5UgwQn63obMpKh2 F/CieQAPAAfr/oT/rEIs= X-Received: by 2002:a05:6000:1aca:b0:390:d954:5e7c with SMTP id ffacd0b85a97d-3911f7c3d08mr3750964f8f.38.1741189175736; Wed, 05 Mar 2025 07:39:35 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43bd42c81c2sm20834945e9.24.2025.03.05.07.39.34 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 05 Mar 2025 07:39:35 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Paolo Bonzini , Richard Henderson , Pierrick Bouvier , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= Subject: [RFC PATCH 01/18] hw/xen/hvm: Fix Aarch64 typo Date: Wed, 5 Mar 2025 16:39:11 +0100 Message-ID: <20250305153929.43687-2-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250305153929.43687-1-philmd@linaro.org> References: <20250305153929.43687-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=philmd@linaro.org; helo=mail-wr1-x42b.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 There is no TARGET_ARM_64 definition. Luckily enough, when TARGET_AARCH64 is defined, TARGET_ARM also is. Fixes: 733766cd373 ("hw/arm: introduce xenpvh machine") Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson --- include/hw/xen/arch_hvm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/hw/xen/arch_hvm.h b/include/hw/xen/arch_hvm.h index c7c515220d2..df39c819c8f 100644 --- a/include/hw/xen/arch_hvm.h +++ b/include/hw/xen/arch_hvm.h @@ -1,5 +1,5 @@ #if defined(TARGET_I386) || defined(TARGET_X86_64) #include "hw/i386/xen_arch_hvm.h" -#elif defined(TARGET_ARM) || defined(TARGET_ARM_64) +#elif defined(TARGET_ARM) || defined(TARGET_AARCH64) #include "hw/arm/xen_arch_hvm.h" #endif From patchwork Wed Mar 5 15:39:12 2025 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: 870569 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp850242wrg; Wed, 5 Mar 2025 07:43:08 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUmiydq/3icUY/IN/5J4e5ScGm3btYwmplB9uliGUvxD7Qb1zVsh1GS4vde/YFNM6FOMTz7zw==@linaro.org X-Google-Smtp-Source: AGHT+IG3RyUQDOpN6+Qw/NpwGkkRJzhj7sYK3JMR4zcZkkuEXTIynUYa2CHhITpI56xU/AR4Z087 X-Received: by 2002:a05:620a:4882:b0:7c0:b2ab:2693 with SMTP id af79cd13be357-7c3d8ef889amr674341585a.49.1741189388657; Wed, 05 Mar 2025 07:43:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741189388; cv=none; d=google.com; s=arc-20240605; b=H4Gz5ZpJhQm6zN3WwB24wqlOnKvjGa+hAIzGKqF/rs3C4bwAx6FHbCn39/T6bnvPLR rHGI8p+EFw8HyuDca2ijfkoz/Kp1WPdyYMudD6z5eG+ytI9x9FDVQld37zqRIcUjq36u LXZ8OueiZ5UCLBCmKOdvfLgVuGNsdPYww+uAx7+7XsO2G43UQytrUgahYNxlXanISUyx oeQ88fiWKEAFN/46QglPN2XlmNVOu2vArWZTirGZYzYX0eKhThKUjsPx05fdyOMinJsb 1d2tzXY/iverkSnmAvuSKPHOAW9qz7JsnQ99OEn2Lpf8QfmdLdnnD+m7ZIfgnbOe9T8j IsiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=wRaiRNOXt2Tm6E+k8ENfXrbiXjiTCdfFjZ148djIZfg=; fh=iYS+U9AiAK/hVpJiag4U+eV/XPHIFc9y9I+tcL8yyYE=; b=V2w494kzwLQYR3OV8TwSuRUq1PvJNzud0p6JRiv4nmpC46BszE8Jip9ztJut/KHGYj pIROkMlPmE6BZFx3VDCizehgCuUYjj2M+DyIPGRYYPRSQDSl4IpoA1wDdq1KuehToO0q ZnDGwUzKdkPMXOFVcVFLo72KjiS6gj+LceZsdlxvDidIAw5A87xSGT3wDxWsyZFV3hxB HBy35Ukg44OE3CcOzOtU0rs5/R98On3mkXgSljGGdI9bCC9OASHjqwxKoBo/HfwxO2/q RUbW01iBCws9bTzMJCjD/iBjKUDUJJM7ghkC8QelE276dmoXpKD0IujqTbviPrwwwJIi qj1w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xDHfivwD; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c3b7d806casi669789085a.154.2025.03.05.07.43.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 05 Mar 2025 07:43:08 -0800 (PST) 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=xDHfivwD; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpqqa-0008H3-Ru; Wed, 05 Mar 2025 10:39:49 -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 1tpqqX-0008G7-BO for qemu-devel@nongnu.org; Wed, 05 Mar 2025 10:39:45 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpqqU-0002F7-Jl for qemu-devel@nongnu.org; Wed, 05 Mar 2025 10:39:44 -0500 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-43948f77f1aso45790905e9.0 for ; Wed, 05 Mar 2025 07:39:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741189180; x=1741793980; 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=wRaiRNOXt2Tm6E+k8ENfXrbiXjiTCdfFjZ148djIZfg=; b=xDHfivwDDiwiO7FJUWQqnp11QOdM9Ax6iO2AkT7Y2RQg3dOKa+IT1rKL0xoO2vUAaT c1ko9wzU1WurVmE+mSBt0GgPV93d2XO9AptizlktU6FPdRmO5KQpvMdcoEqdty+vAHUU bDEHXtiX4ICQSNYAwb7n1oGyXTiyLI9fmN0rSncFVw5eofxkvgqgSOuUhMN/Vf+6uyPa o8kUrbRs6F15MFY+SgEyyfKvum5RNlMxM8PrZwkjNsJMLGIGm5GEgaBqL/xZifFxOFxM kciwKZJCLRr8KM++Wl1d1vCr69NmKIavAO4LPx7bwZ4b8H8GbJ55iRFyNpf+7/GskNpx hPtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741189180; x=1741793980; 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=wRaiRNOXt2Tm6E+k8ENfXrbiXjiTCdfFjZ148djIZfg=; b=n7XFJVlPBcqWagQlSJljYHVWEkdvyAce+o0xWa/Aei7XCIbKM75FRR96hVJo2FW5ug 4t00GLlt6HGoRZ/fom1IPnfAqYgRm31cckDKKbsrOLXeJWgFZa5q7DE/OBd+K8MzMAXD MSQDEXW0Oxjfk81dxn2OKCkCAAYfBnQV7mkTFcr7nd03ii4Pf1bX3sH7aBx9Y7kIlVQD zvNAWIyS2Gz4tHp3XNz6vV34xhaWvOQi3I7rCnNlPTOQ62y+qjOzW+0tMdWOjoothBfH S7jRj6TnVIOycl4wBr/OfjpVQIadE7/W+QPwBGNfJG8HjvbyMO1pg3xyP3MNuxGRKxl2 x9eg== X-Gm-Message-State: AOJu0YyJeoJpxF05G32m1XqSeG9k8m1Y63UIQ6IUfqm1RD/Y9fCuiL/5 WOk4fxp0s4Yseba8ar9tsi2atuUKtZuZjE8LPsOk0EVKpUmwbL32iTjT7hwvACDC4JI5hIHTxCB buxQ= X-Gm-Gg: ASbGnctC+aiV7zGGBjlmXhECsHphPR6kRvaeA8BO7tRDP86wHypDVTbpDA2x7vGhoCq fk88/4EiOVJp6mfLdEruXCnFhLv0tumXlx8cbs2TVJA6F8mOF8zAbKRL02/ZBrj5udjPcbj+7u0 dUrJxoxGApTr6SlthWZAy7Zyv/23v02XDSL7SgDFGMJoo4gBGEDkOzsNMdAyXdYB+hcXdl+jYx7 +18lbqT8QlU7draS4aq5dX2mHlCAVMIwC531uPTD7kNVdwaLiPQbVF2U9EX5FCXDhdW7i/jG05V zflb1lOld2bFT0DE6o52PxX/VFgHndXOvOT2XfFXDjqRPz3nVaaQso8D4Q1wClsZFB1MJ+nhIqs 58RUB+jwt5apwyrmTbWs= X-Received: by 2002:a5d:6487:0:b0:38f:3b9b:6f91 with SMTP id ffacd0b85a97d-3911f74009fmr2711509f8f.12.1741189180465; Wed, 05 Mar 2025 07:39:40 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-391269f30f2sm1056060f8f.34.2025.03.05.07.39.39 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 05 Mar 2025 07:39:40 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Paolo Bonzini , Richard Henderson , Pierrick Bouvier , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= Subject: [RFC PATCH 02/18] hw/vfio/common: Get target page size using runtime helpers Date: Wed, 5 Mar 2025 16:39:12 +0100 Message-ID: <20250305153929.43687-3-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250305153929.43687-1-philmd@linaro.org> References: <20250305153929.43687-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.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 Prefer runtime helpers to get target page size. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- hw/vfio/common.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/hw/vfio/common.c b/hw/vfio/common.c index 7a4010ef4ee..d4c9e59173d 100644 --- a/hw/vfio/common.c +++ b/hw/vfio/common.c @@ -30,6 +30,7 @@ #include "exec/address-spaces.h" #include "exec/memory.h" #include "exec/ram_addr.h" +#include "exec/target_page.h" #include "hw/hw.h" #include "qemu/error-report.h" #include "qemu/main-loop.h" @@ -395,10 +396,12 @@ static void vfio_register_ram_discard_listener(VFIOContainerBase *bcontainer, VFIORamDiscardListener *vrdl; /* Ignore some corner cases not relevant in practice. */ - g_assert(QEMU_IS_ALIGNED(section->offset_within_region, TARGET_PAGE_SIZE)); + g_assert(QEMU_IS_ALIGNED(section->offset_within_region, + qemu_target_page_size())); g_assert(QEMU_IS_ALIGNED(section->offset_within_address_space, - TARGET_PAGE_SIZE)); - g_assert(QEMU_IS_ALIGNED(int128_get64(section->size), TARGET_PAGE_SIZE)); + qemu_target_page_size())); + g_assert(QEMU_IS_ALIGNED(int128_get64(section->size), + qemu_target_page_size())); vrdl = g_new0(VFIORamDiscardListener, 1); vrdl->bcontainer = bcontainer; From patchwork Wed Mar 5 15:39:13 2025 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: 870558 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp849163wrg; Wed, 5 Mar 2025 07:40:44 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCX+HQ6uYZg1sUO1jofMH1SMcle+9e7m8dURtzqjlkxQhJIdaxTV916oyIuYy2/GKossYstO8A==@linaro.org X-Google-Smtp-Source: AGHT+IH7ocRlYmlckO7VxKgESezWV4W3CL2Qj2G4aDRaJO+agdYao8CnqQYj2PkR9RPZEH3fM180 X-Received: by 2002:a05:620a:640f:b0:7c0:b3b4:9e73 with SMTP id af79cd13be357-7c3d91d606emr472538685a.20.1741189244019; Wed, 05 Mar 2025 07:40:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741189244; cv=none; d=google.com; s=arc-20240605; b=WSqr3GjCGk0LAaRQ0mnPkdMCPBppKASOZyYdKURNGc3rlVzozeYSsNyTaWR3PRsUUU tNvNQ8nmXMPwgdZhr/vLYzLkcMqKx0R4fPjvvUkyAxmFtKLRAclMzW4iDMO5SZwphQmQ ivLAfiCXi8v0Rg12uItedDkaGghDNsTdf6Dr8MCST9asrZqZlnpwHBhE0+ZFeLXRtRbS 8Myl6OlcFWNpxidThKSrwm9qJX9ph+V2aw4AbQk7izAdx12ayD16fED9MgrWi5X6eNco QlXsgP3SIjZjjvtAq327yxCdDL/4dXlRAQv2mZDwFOPC3Iki8Wbi8Lidjbhd5u6i24ni fQqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=xdtas5HdXydL2NOaru6Yo7c9eAGwqywYol70/Ag2vxo=; fh=iYS+U9AiAK/hVpJiag4U+eV/XPHIFc9y9I+tcL8yyYE=; b=X0DtrSFxkhHAkSZn5HZW2+y79wsJbxdJ3WZhcQHW86QlWiWwWvZ61M0ozLQ+Pz855M 29TGRB1G8PDDhJBZCFXnbVn9FwMDqDJW3y/UYsqM3n4XO9+mad4le6oa8o9z6NJNvuIT hSUPLRKpu2LXOZjlzgEM5MjrJTtBYMSiyEXCTBBdR/EvbnKmGpmam0uvHkRD80hH2GQH u6z4yiiiyhB+RAKVnBvUQ25qPTRGzVDS5WkplC84x933Z6DCu4Id87TjetbsoCjXjWrQ 6UTwGHG3EHVcG1zj/UZBuL7y3vB73D2ONVxtFdf4zXbPZLbgCxd9RlYWUeGT3tY97Ncf flJw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HmwqVeeG; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c3c52b88e7si495831785a.382.2025.03.05.07.40.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 05 Mar 2025 07:40:43 -0800 (PST) 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=HmwqVeeG; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpqqe-0008HZ-Bh; Wed, 05 Mar 2025 10:39:52 -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 1tpqqa-0008H9-Va for qemu-devel@nongnu.org; Wed, 05 Mar 2025 10:39:49 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpqqZ-0002II-4j for qemu-devel@nongnu.org; Wed, 05 Mar 2025 10:39:48 -0500 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-43995b907cfso45221935e9.3 for ; Wed, 05 Mar 2025 07:39:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741189185; x=1741793985; 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=xdtas5HdXydL2NOaru6Yo7c9eAGwqywYol70/Ag2vxo=; b=HmwqVeeGNaoOvljc14e+kLmVhOR+pSufNLgF2rs/2aG2ixx2IpodkuRdtKb9fdrEcg kzGiMt9TIYBE8TiOgPAgBkuJLV3PI8hipAm6NTJrjilYlcle1LYpARSonx8n2HUpG+7V 3RUJYQbMqcQUeD9Dk2EKWMCJ3yLslLbVkA3kCHqTVUCxFdKOLt3eHTe8D8EiajRSsz1Q gWU0Ag4YrHRACvAbrS4NeC3abfkBPfj+pMIQ/vf+Kp+yi/AJr3nj4uZ+OVOcGaEcQ99B lyKO9WT6w6Do9FVyNgO0aEG+0A0zHS5Kcm2Md/g1RqYXAm3fjsCCf8q0TWYHt+Owj3e3 bmSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741189185; x=1741793985; 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=xdtas5HdXydL2NOaru6Yo7c9eAGwqywYol70/Ag2vxo=; b=WaWdCXIX4d2hCHelYgilSPtomu0A6k4MOiAjB+dLPMg6GJoElMYdObhmeAydmsHJaV BV1lbL+w6ThdxFp4wJlJEfEDMzIhFi9Q5l6Irv5Xy5QxwdsRX/t1paI5tLnw4IMycUGe LdLmu6RC/SUe9hEEdPM0xkK2KnZU2epejd2lv6dSGumS8t41AK/7SY3pDyQcPgABIuON y/DiLu4Uz8Pq1xUtgHnVDSjDxEREn+T+hvcyf/DFqfVBNuLrYRvsYT8FWdRB91qZPm6/ f/vKWKbHi4nvIE1KWChEiyHx/dho6gNPwyBVqJgyZmFzsMI4uRelBK9VaKyRDmQaOHZ8 9d+A== X-Gm-Message-State: AOJu0YyP6Bq44AGTwUZb5Bg5gUD9+KFCOMaghxz/OFulEVsF0cYSV+vz jMGHXk+mO92UDYavLpTne5B+VLu1WzRrj3a20B7kygnrxjt7+Q15WQsFfQNsC6KasQbnAM+QkM7 aNnw= X-Gm-Gg: ASbGncscUd/Z8mRQ4fL/pf0THyp86nsBONge75I76n6Nl90eJcTzjCQOzIlJembB4xX Ic1ZlnEzDOxlW+qhwR3F3SLO/O8AmugaYhZASL9F4Rk8lwvpd+VlvQ1T5TmKUYgwjtAPxTAetRi bonncwXCY0jpiEuwD19bKGu1ZzpVJOCoYudLCJzYyXZhX+d+GKfLygmvDATZoNyYJflwFYjTd2/ bjeZ2lEFgIFpkuvayZJm1U1P1J5G4c32C/bbcuijWH4mordM2cSPeyFmaf6tzMSGg2YyDQWJfJZ 35CZe0lRT0rO4LqxjpAjONOZbi2N7zwnk0HmyukQXjccJfmugMmzvpDeG/adGbvRW5LCrcx3pRX vGRKgeYUo3opNlf8Se3I= X-Received: by 2002:a05:600c:5112:b0:439:a1ad:6851 with SMTP id 5b1f17b1804b1-43bd2ae1663mr24257265e9.23.1741189185145; Wed, 05 Mar 2025 07:39:45 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43bd42b7478sm20663345e9.17.2025.03.05.07.39.44 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 05 Mar 2025 07:39:44 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Paolo Bonzini , Richard Henderson , Pierrick Bouvier , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= Subject: [RFC PATCH 03/18] include: Poison TARGET_PHYS_ADDR_SPACE_BITS definition Date: Wed, 5 Mar 2025 16:39:13 +0100 Message-ID: <20250305153929.43687-4-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250305153929.43687-1-philmd@linaro.org> References: <20250305153929.43687-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.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 Ensure common code never use this target specific definition. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- include/exec/poison.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/exec/poison.h b/include/exec/poison.h index 0c4ad04eb97..0ab7f0da1c7 100644 --- a/include/exec/poison.h +++ b/include/exec/poison.h @@ -47,6 +47,7 @@ #pragma GCC poison TARGET_PAGE_MASK #pragma GCC poison TARGET_PAGE_BITS #pragma GCC poison TARGET_PAGE_ALIGN +#pragma GCC poison TARGET_PHYS_ADDR_SPACE_BITS #pragma GCC poison CPU_INTERRUPT_HARD #pragma GCC poison CPU_INTERRUPT_EXITTB From patchwork Wed Mar 5 15:39:14 2025 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: 870565 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp850002wrg; Wed, 5 Mar 2025 07:42:39 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUGyBi0oM12ELtZ1ZsIOVhEcCJLzvfHuuiDYWylmhNQFD54M8z8kxfPtWf2kYMv9T0ae8UIZw==@linaro.org X-Google-Smtp-Source: AGHT+IG7OlGDq5zeI/dhj5CuFglBHWv2BV9jfucZEjO+Wc9ed3brjVoJ0v5D7ROoBQrRZZOfiXru X-Received: by 2002:a05:620a:4899:b0:7c3:ac33:af9e with SMTP id af79cd13be357-7c3d8bcff56mr495950785a.3.1741189359545; Wed, 05 Mar 2025 07:42:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741189359; cv=none; d=google.com; s=arc-20240605; b=AtRK5yMbeUjuuM9WJhvBongIpusEfsAUxkKOsDpDqjCAejpUBBpkLWdNkrVHlTV0tP UumZ28SyeR7GHKO2khONh7EWnFU+v0g6U6ljV2EXkQ8VzTXf4cS8mUz82mvU79EfT7jn tPDZ2ftLpOXVRDoZA0KqBO8XTejzNP64rer9iJbYg2/m+Z/kxGUvyBbdW3ZJ9ByLcqi2 uoYuY0zRnk6G20+v+VOTW+uR0KPvResINpDjQcs2vvlqHgckk3Y1QTGcRL73ayAN4VPf 46q6kJ0oKC+cRP7LuixQO4zYQYMRzBJDYahX6+xx4Be5+IzxD16ztsrKdJhFVcXslIhU ga+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=yO8rIUYsmfpiPaEUeyghGtqZEEwY/40aLvzN2/tuA48=; fh=iYS+U9AiAK/hVpJiag4U+eV/XPHIFc9y9I+tcL8yyYE=; b=HVBd6eTnhPrWUcUeAtQ3yXBA4gIpy7viMpizpBuXMkDBAT1smBGks8mnCg5cmnqFEd 4wl9VK9O4lyeg2URbMYyZsODW2d+gD8QEavDZ8HRSHteOlvL5KS2AIuVicCCqnr4ckYT IQnOmSeTwHDXj97PEPnxbTj/b1xz0VOcDMxHXjLiX1M4hWfzbxvQgQ6bKDAt6NlP/3MQ tvsFAaNT4EcZNjLjCLXhVXvmE2x9wMwXEFmy9dDNUcXUj4o6+2Ot3Joa/tQ5N8t4OeCh 1rgd3trCqVwUSb4wD1J+HNeyklQNLMbJgiw2EerjcaVG0PiTjwCiFEOMkGhwwxRTF/pt aIjA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nAj2LVcs; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c3b8a0d593si682911985a.515.2025.03.05.07.42.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 05 Mar 2025 07:42:39 -0800 (PST) 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=nAj2LVcs; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpqqh-0008IG-0L; Wed, 05 Mar 2025 10:39:55 -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 1tpqqf-0008Hx-LQ for qemu-devel@nongnu.org; Wed, 05 Mar 2025 10:39:53 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450: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 1tpqqd-0002IX-PW for qemu-devel@nongnu.org; Wed, 05 Mar 2025 10:39:53 -0500 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-390eb7c1024so4144023f8f.0 for ; Wed, 05 Mar 2025 07:39:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741189190; x=1741793990; 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=yO8rIUYsmfpiPaEUeyghGtqZEEwY/40aLvzN2/tuA48=; b=nAj2LVcsLTK+CkUHNkiCy3FBLK7afKdhfynr1QOo+9kcssmLEhWwsLQaBlcAwcoodv aucIkh5JBA/pw4Nl36dzf3zu4Tb3l2w5t4PXv0XXHV7IlR0Dm5wIvWAQtJxyyiPfgSe0 aN7sfhQNuBN/oSSH3qpzGIi4/kUJB8y6hoEhdtp6JnBIiATNW8KeSFypvajf0iNJtkCc Xw4iZgtaw2thIrkAzOCZoSSzKDivw+oT11DUh3kihzTgIfuKFxTxSxQ9otKu0l9Ow4Uf zsMok/Wc7GxF9NqGJdW+pXNUTCMRKGBqnoQpACw3TGAnaXalDxy8itqQMOmC+cevxprx fqiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741189190; x=1741793990; 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=yO8rIUYsmfpiPaEUeyghGtqZEEwY/40aLvzN2/tuA48=; b=HtxJNeDEF6rPt2eceaBUGlSyvIYFm2MPW9IdIp+/3GnC3JTCO/0atsKNE7Wwlm2pMD 1OWdzD/e6NJQ5fgk3JATQooWlfg8ZCSY2LmF1c/NXFz6ryIsJI0I/EhHlwjVvCfh0qwK gk+2q7EH/kwVYgmUio80R7dG/0cWHrmfImuXvX3A278TRqkG8SDEtcZzEHXS+cFLhgCR jStB7Ftw+RguTCXjqOFAl0PHtDW0pHOnvP+mEOuE+nJyBDt8g8Pdc9Ijf7d16nQRHzE+ u1VGNOw29Ats+I8fkuBNQerMfLtQmoTUdHwnsJ5i1aRUrbeSaLS17HNIEiYBBOyIGniC O8SA== X-Gm-Message-State: AOJu0Yy3W3+XHm/IcqaDnKLm306ZwwXtxtmPB6pzYI+mqQwtrMb9Fjrw rjB0L82ClnyPbin6Qsxwx1u/gRy0zZKlGrxK5pjJ4VCQUSscKX6INMa+AnfEJkQsLDGW0ylrRly rAPY= X-Gm-Gg: ASbGncsKrBWEHVFEyaVtzMWOt6BKeNn2gzL3pmY+IxJBYLz43cAIxBpvNY3xZb+f4IA eusokO0lpKL6iG9PzpESic/OG0Axb72C02fEjnt/XYi/CAWvSr27F570vQnq/48nTYrLSVzrC4f iAFeAYUos/BSWSHedmAMoBic+PlsyxMMfCefymqIDgQ3bgyFmaCK3YbtTBpYgUswuaymbNnDett WQz2YTHlghqPBve0SgQ/i0VdnwIcfrEwqutwIr/u4u3CJcPfk7nUm16YM9pURpasDPh7eSEkxEv 2rnMt9GNQ5HwYNgqmP55m6H+rcXV/Ew2u6IuTl03ZETwqMMBTSUFIlBasrBcOxcHDad+/4TdNbM jx6kG751N3181iJ6LuQ0= X-Received: by 2002:a05:6000:186c:b0:390:f609:cbc with SMTP id ffacd0b85a97d-3911f7c3d13mr3569537f8f.35.1741189189912; Wed, 05 Mar 2025 07:39:49 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390e47a6d0asm21008964f8f.27.2025.03.05.07.39.49 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 05 Mar 2025 07:39:49 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Paolo Bonzini , Richard Henderson , Pierrick Bouvier , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= Subject: [RFC PATCH 04/18] qemu: Introduce 'qemu/legacy_binary_info.h' Date: Wed, 5 Mar 2025 16:39:14 +0100 Message-ID: <20250305153929.43687-5-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250305153929.43687-1-philmd@linaro.org> References: <20250305153929.43687-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=philmd@linaro.org; helo=mail-wr1-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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Introduce an API to get information specific to a binary from the binary name (argv[0]). Initialize it from qemu_init() on system emulation. Signed-off-by: Philippe Mathieu-Daudé --- meson.build | 2 +- include/qemu/legacy_binary_info.h | 14 +++ legacy_binary_info.c | 160 ++++++++++++++++++++++++++++++ system/vl.c | 2 + 4 files changed, 177 insertions(+), 1 deletion(-) create mode 100644 include/qemu/legacy_binary_info.h create mode 100644 legacy_binary_info.c diff --git a/meson.build b/meson.build index eaae1da2e92..e4ede6ba06f 100644 --- a/meson.build +++ b/meson.build @@ -3767,7 +3767,7 @@ if have_block endif endif -common_ss.add(files('cpu-common.c')) +common_ss.add(files('cpu-common.c', 'legacy_binary_info.c')) specific_ss.add(files('cpu-target.c', 'arch_info-target.c')) subdir('system') diff --git a/include/qemu/legacy_binary_info.h b/include/qemu/legacy_binary_info.h new file mode 100644 index 00000000000..ae67399ebf2 --- /dev/null +++ b/include/qemu/legacy_binary_info.h @@ -0,0 +1,14 @@ +/* + * QEMU legacy binary helpers + * + * Copyright (c) Linaro + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#ifndef QEMU_LEGACY_BINARY_INFO_H +#define QEMU_LEGACY_BINARY_INFO_H + +void legacy_binary_info_init(const char *argv0); + +#endif diff --git a/legacy_binary_info.c b/legacy_binary_info.c new file mode 100644 index 00000000000..0c50fc9248a --- /dev/null +++ b/legacy_binary_info.c @@ -0,0 +1,160 @@ +/* + * QEMU legacy binary helpers + * + * Copyright (c) Linaro + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "qemu/arch_info.h" +#include "qemu/legacy_binary_info.h" + +typedef struct LegacyBinaryInfo { + const char *binary_name; + QemuArchBit arch_bit; +} LegacyBinaryInfo; + +/* List alphabetically sorted by binary_name */ +static const LegacyBinaryInfo legacy_binary_infos[] = { + { + .binary_name = "qemu-system-aarch64", + .arch_bit = QEMU_ARCH_BIT_ARM, + }, + { + .binary_name = "qemu-system-alpha", + .arch_bit = QEMU_ARCH_BIT_ALPHA, + }, + { + .binary_name = "qemu-system-arm", + .arch_bit = QEMU_ARCH_BIT_ARM, + }, + { + .binary_name = "qemu-system-avr", + .arch_bit = QEMU_ARCH_BIT_AVR, + }, + { + .binary_name = "qemu-system-hppa", + .arch_bit = QEMU_ARCH_BIT_HPPA, + }, + { + .binary_name = "qemu-system-i386", + .arch_bit = QEMU_ARCH_BIT_I386, + }, + { + .binary_name = "qemu-system-loongarch64", + .arch_bit = QEMU_ARCH_BIT_LOONGARCH, + }, + { + .binary_name = "qemu-system-m68k", + .arch_bit = QEMU_ARCH_BIT_M68K, + }, + { + .binary_name = "qemu-system-microblaze", + .arch_bit = QEMU_ARCH_BIT_MICROBLAZE, + }, + { + .binary_name = "qemu-system-microblazeel", + .arch_bit = QEMU_ARCH_BIT_MICROBLAZE, + }, + { + .binary_name = "qemu-system-mips", + .arch_bit = QEMU_ARCH_BIT_MIPS, + }, + { + .binary_name = "qemu-system-mips64", + .arch_bit = QEMU_ARCH_BIT_MIPS, + }, + { + .binary_name = "qemu-system-mips64el", + .arch_bit = QEMU_ARCH_BIT_MIPS, + }, + { + .binary_name = "qemu-system-mipsel", + .arch_bit = QEMU_ARCH_BIT_MIPS, + }, + { + .binary_name = "qemu-system-or1k", + .arch_bit = QEMU_ARCH_BIT_OPENRISC, + }, + { + .binary_name = "qemu-system-ppc", + .arch_bit = QEMU_ARCH_BIT_PPC, + }, + { + .binary_name = "qemu-system-ppc64", + .arch_bit = QEMU_ARCH_BIT_PPC, + }, + { + .binary_name = "qemu-system-riscv32", + .arch_bit = QEMU_ARCH_BIT_RISCV, + }, + { + .binary_name = "qemu-system-riscv64", + .arch_bit = QEMU_ARCH_BIT_RISCV, + }, + { + .binary_name = "qemu-system-rx", + .arch_bit = QEMU_ARCH_BIT_RX, + }, + { + .binary_name = "qemu-system-s390x", + .arch_bit = QEMU_ARCH_BIT_S390X, + }, + { + .binary_name = "qemu-system-sh4", + .arch_bit = QEMU_ARCH_BIT_SH4, + }, + { + .binary_name = "qemu-system-sh4eb", + .arch_bit = QEMU_ARCH_BIT_SH4, + }, + { + .binary_name = "qemu-system-sparc", + .arch_bit = QEMU_ARCH_BIT_SPARC, + }, + { + .binary_name = "qemu-system-sparc64", + .arch_bit = QEMU_ARCH_BIT_SPARC, + }, + { + .binary_name = "qemu-system-tricore", + .arch_bit = QEMU_ARCH_BIT_TRICORE, + }, + { + .binary_name = "qemu-system-x86_64", + .arch_bit = QEMU_ARCH_BIT_I386, + }, + { + .binary_name = "qemu-system-xtensa", + .arch_bit = QEMU_ARCH_BIT_XTENSA, + }, + { + .binary_name = "qemu-system-xtensaeb", + .arch_bit = QEMU_ARCH_BIT_XTENSA, + }, +}; + +static int current_index = -1; + +void legacy_binary_info_init(const char *argv0) +{ + g_auto(GStrv) tokens = g_strsplit(argv0, G_DIR_SEPARATOR_S, -1); + unsigned count = 0; + const char *binary_name; + + while (tokens[count]) { + count++; + } + assert(count > 0); + binary_name = tokens[count - 1]; + + for (size_t i = 0; i < ARRAY_SIZE(legacy_binary_infos); i++) { + if (!strcmp(legacy_binary_infos[i].binary_name, binary_name)) { + current_index = i; + return; + } + } + fprintf(stderr, "Missing legacy info for '%s' binary.\n", binary_name); + abort(); +} diff --git a/system/vl.c b/system/vl.c index a41ba4a2d5f..74a062c7fff 100644 --- a/system/vl.c +++ b/system/vl.c @@ -28,6 +28,7 @@ #include "qemu/units.h" #include "qemu/module.h" #include "qemu/arch_info.h" +#include "qemu/legacy_binary_info.h" #include "exec/cpu-common.h" #include "exec/page-vary.h" #include "hw/qdev-properties.h" @@ -2883,6 +2884,7 @@ void qemu_init(int argc, char **argv) error_init(argv[0]); qemu_init_exec_dir(argv[0]); + legacy_binary_info_init(argv[0]); os_setup_limits(); From patchwork Wed Mar 5 15:39:15 2025 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: 870556 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp849051wrg; Wed, 5 Mar 2025 07:40:30 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWzLqLV+qqxDCGrlVdv2v4SeNMJhF4Dqnowr/b+BK9jzs2U7IS9rPZDyHm/3ykB1RKrxC/94A==@linaro.org X-Google-Smtp-Source: AGHT+IHctyNxdOLZTSOlvdKCdQZZMfiEPyFUuA3sJMQgt81YP/mfncQZ9FtpABSYZMoPxdKa8yzA X-Received: by 2002:a05:6214:29c3:b0:6e8:8e10:4243 with SMTP id 6a1803df08f44-6e8e6cfdbf0mr50786936d6.7.1741189230153; Wed, 05 Mar 2025 07:40:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741189230; cv=none; d=google.com; s=arc-20240605; b=Z7yrKWKMhjSbu7ZL0/Cs0OLBJh3XNXBxTkwzjPkUnbtx1maR8Uxc2L+Qw/N+ignAdo EypugUXv+Hm6xvmxyFk9oZbuwmSSPGGigFAKgIgNbvWQ4zPwt6vZ69IvMc6n6LgSwKfq XJBKeph3HJotmq7IJMJ4k+EKYubrgaZFIk1cIr6+OHUmzV9wDn3PUiUvSPrIGoOtIBYA tm1SrTQ8xrP/T63pkrNrC+TpEAKpT2Pv2l0fWT1PImc6TVcbBYFSDO92KIpPkCAnQUJ6 G189mfLw6DfImmM6esv/bVXs3zwSvkmkoRGoDJ3heN6MVz6EuRWv8yrhAk0b/U2Ry9By lVpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=7xkVi+fM9u6NjYnvimRvSzA5d9mqak031ohahGjE3Qo=; fh=iYS+U9AiAK/hVpJiag4U+eV/XPHIFc9y9I+tcL8yyYE=; b=gkwLMi7wEANIxYb14dhGmKy8VZgtn74zSlYZOhWdbvkyVFikgK6b0inF9KCXshlSnN gmUCCPlohk8c2Eut9VCuDWIPnSaeRqlPHzrB1h1C9hD5lGRXfbN0xq61xlDdmsA0/KUw x7RDBA88zBzGXcyK+6Qw68Xxn6wW+mQYo1lSi5VWM7Np2d+AMjpAJ5/Q++QiTKQEHBHl EgP0bAWsEXVRiSGdZ6ih9wtuhgYcBeMvdTBTFhPfYxvSKW91QLW0G3YIZfumNaZzxh9Z 3LZ03VMRBbcaMR+XNTMKsYwQJxlSnvNPyD5d91T3BkhN22OMXHq0P6tD0w8unAO029HL FzTQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TxXzzWx8; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6e8976cf533si134515726d6.272.2025.03.05.07.40.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 05 Mar 2025 07:40:30 -0800 (PST) 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=TxXzzWx8; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpqqn-0008JP-4K; Wed, 05 Mar 2025 10:40:01 -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 1tpqql-0008Iy-2h for qemu-devel@nongnu.org; Wed, 05 Mar 2025 10:39:59 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpqqj-0002J4-3b for qemu-devel@nongnu.org; Wed, 05 Mar 2025 10:39:58 -0500 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-38f403edb4eso4215623f8f.3 for ; Wed, 05 Mar 2025 07:39:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741189195; x=1741793995; 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=7xkVi+fM9u6NjYnvimRvSzA5d9mqak031ohahGjE3Qo=; b=TxXzzWx8WOIOlW2iEpgxcouBu0Xx8uHS5KKZbY5o6SME5u3OjNvUL8eA1POAn4ifJ6 4qQVpbNqdI6hgyXCILIGbq9ZuI4SR+eDHphPFNoTt2pFyAicX8DUKd/CP15aoJQXQRL0 2plfWgb1RmTSX61qbIJHMzbQGFdJSJjL+CA7jXYcdLNPALFHK/EwXQZirr3NcKUekk4q KAyTe+34XqtTSHBXQrLHr+PZpWq8WNgl5KD/taRLi/ub4Wj1eOVOjC+KS8djET1iiFB6 aUbKQZ874IoDkQnZEFRpPoGC8ot3caRhmDDOnfZQCDF306qb+YR19TIsb/Lv9somfK5u QzWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741189195; x=1741793995; 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=7xkVi+fM9u6NjYnvimRvSzA5d9mqak031ohahGjE3Qo=; b=nJkzNloKRF866aZNwl6bGDUDc3MgnZF6rOSojPyOOUMepKplgfuupcid1mbhVLuwN3 iiu2iw8jgeuFxOJ5uKzpBJYcQ0HlYJYweRaIsBB061/aevrMm0/k0/QDbgfEfz4Z/vTr FOGp1zAgSLZ+DOCZBqQKvdg3YIe/mfZPoKRYJeqI1ACF/6rD8PdeWWeVQT+/TRdp+vom 9OyKfB3UFwfgVGLoZWpUfWRLKjQ8uTHsoTEZfOgAmxXlBMpwES2R7+tKMOIXt9DwNefl kVVRMfxycJzfXf/vZCAV6+cKhPAKbLoLkaa5ZGoyiZlTouQXlFaDVMCQA6Yycj/ZyCPl fe0w== X-Gm-Message-State: AOJu0YzsK4U6uFc7uOZWL7+XtpkGBfpBmmoD8G51DA/D8DCMgIXOp8g9 7nHOD9OlX4Sgx9UY0oQWcH3LmJlDN2IPnFrQ3c1inL7C7TYeNo6W60orFgAdQmKnmTO+1p5MLc+ 1nBk= X-Gm-Gg: ASbGncsLFgMg7natPsRx6dlGRPU4/YqlhHiX8mFM3JuvB9o2WgAAAon4bmx+il4oX+r +UAqxtK3fvk+qJzT++SWvFl5X+wWYAhPj2ishhlhzoey+5+liPYmTQKW2grpTeUJZVOMGy5N8co wRYAUjmVgiqLqfiMWpO1ihu0ejKYA5eX5/6B0Cajd7HuJ/G6xe5gqbUFNUaroCreWRWlYkBbJRY yZz9XOrxxdd4D3JaWemibsWKMyOMqYH4TOJoRRJ+9Z4BvxBRCr0pi+P4QAjZ7hRJn237XOrDHTu 03n2JOsMZO8kKKVYztF9E8JRzR+hr3/QlvVnB541PJQCKcyeuKCP+2upvQcr72qzHkZcgRBB5x6 cYhXJpvsybGbRjmEWmto= X-Received: by 2002:a05:6000:1aca:b0:390:d954:5e7c with SMTP id ffacd0b85a97d-3911f7c3d08mr3752352f8f.38.1741189194743; Wed, 05 Mar 2025 07:39:54 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390e47b7b6asm21845512f8f.51.2025.03.05.07.39.53 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 05 Mar 2025 07:39:54 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Paolo Bonzini , Richard Henderson , Pierrick Bouvier , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= Subject: [RFC PATCH 05/18] qemu: Introduce legacy_binary_is_64bit() helper Date: Wed, 5 Mar 2025 16:39:15 +0100 Message-ID: <20250305153929.43687-6-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250305153929.43687-1-philmd@linaro.org> References: <20250305153929.43687-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=philmd@linaro.org; helo=mail-wr1-x435.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 Introduce legacy_binary_is_64bit() to check at runtime if a binary is compiled with TARGET_LONG_BITS == 64. Signed-off-by: Philippe Mathieu-Daudé --- include/qemu/legacy_binary_info.h | 3 +++ legacy_binary_info.c | 37 +++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/include/qemu/legacy_binary_info.h b/include/qemu/legacy_binary_info.h index ae67399ebf2..2d42e852b7a 100644 --- a/include/qemu/legacy_binary_info.h +++ b/include/qemu/legacy_binary_info.h @@ -11,4 +11,7 @@ void legacy_binary_info_init(const char *argv0); +/* Return runtime equivalent of TARGET_LONG_BITS == 64 check */ +bool legacy_binary_is_64bit(void); + #endif diff --git a/legacy_binary_info.c b/legacy_binary_info.c index 0c50fc9248a..be50d3f50ea 100644 --- a/legacy_binary_info.c +++ b/legacy_binary_info.c @@ -13,6 +13,7 @@ typedef struct LegacyBinaryInfo { const char *binary_name; QemuArchBit arch_bit; + unsigned long_bits; } LegacyBinaryInfo; /* List alphabetically sorted by binary_name */ @@ -20,118 +21,147 @@ static const LegacyBinaryInfo legacy_binary_infos[] = { { .binary_name = "qemu-system-aarch64", .arch_bit = QEMU_ARCH_BIT_ARM, + .long_bits = 64, }, { .binary_name = "qemu-system-alpha", .arch_bit = QEMU_ARCH_BIT_ALPHA, + .long_bits = 64, }, { .binary_name = "qemu-system-arm", .arch_bit = QEMU_ARCH_BIT_ARM, + .long_bits = 32, }, { .binary_name = "qemu-system-avr", .arch_bit = QEMU_ARCH_BIT_AVR, + .long_bits = 32, }, { .binary_name = "qemu-system-hppa", .arch_bit = QEMU_ARCH_BIT_HPPA, + .long_bits = 64, }, { .binary_name = "qemu-system-i386", .arch_bit = QEMU_ARCH_BIT_I386, + .long_bits = 32, }, { .binary_name = "qemu-system-loongarch64", .arch_bit = QEMU_ARCH_BIT_LOONGARCH, + .long_bits = 64, }, { .binary_name = "qemu-system-m68k", .arch_bit = QEMU_ARCH_BIT_M68K, + .long_bits = 32, }, { .binary_name = "qemu-system-microblaze", .arch_bit = QEMU_ARCH_BIT_MICROBLAZE, + .long_bits = 64, }, { .binary_name = "qemu-system-microblazeel", .arch_bit = QEMU_ARCH_BIT_MICROBLAZE, + .long_bits = 64, }, { .binary_name = "qemu-system-mips", .arch_bit = QEMU_ARCH_BIT_MIPS, + .long_bits = 64, }, { .binary_name = "qemu-system-mips64", .arch_bit = QEMU_ARCH_BIT_MIPS, + .long_bits = 64, }, { .binary_name = "qemu-system-mips64el", .arch_bit = QEMU_ARCH_BIT_MIPS, + .long_bits = 64, }, { .binary_name = "qemu-system-mipsel", .arch_bit = QEMU_ARCH_BIT_MIPS, + .long_bits = 32, }, { .binary_name = "qemu-system-or1k", .arch_bit = QEMU_ARCH_BIT_OPENRISC, + .long_bits = 32, }, { .binary_name = "qemu-system-ppc", .arch_bit = QEMU_ARCH_BIT_PPC, + .long_bits = 32, }, { .binary_name = "qemu-system-ppc64", .arch_bit = QEMU_ARCH_BIT_PPC, + .long_bits = 64, }, { .binary_name = "qemu-system-riscv32", .arch_bit = QEMU_ARCH_BIT_RISCV, + .long_bits = 32, }, { .binary_name = "qemu-system-riscv64", .arch_bit = QEMU_ARCH_BIT_RISCV, + .long_bits = 64, }, { .binary_name = "qemu-system-rx", .arch_bit = QEMU_ARCH_BIT_RX, + .long_bits = 32, }, { .binary_name = "qemu-system-s390x", .arch_bit = QEMU_ARCH_BIT_S390X, + .long_bits = 64, }, { .binary_name = "qemu-system-sh4", .arch_bit = QEMU_ARCH_BIT_SH4, + .long_bits = 32, }, { .binary_name = "qemu-system-sh4eb", .arch_bit = QEMU_ARCH_BIT_SH4, + .long_bits = 32, }, { .binary_name = "qemu-system-sparc", .arch_bit = QEMU_ARCH_BIT_SPARC, + .long_bits = 32, }, { .binary_name = "qemu-system-sparc64", .arch_bit = QEMU_ARCH_BIT_SPARC, + .long_bits = 64, }, { .binary_name = "qemu-system-tricore", .arch_bit = QEMU_ARCH_BIT_TRICORE, + .long_bits = 32, }, { .binary_name = "qemu-system-x86_64", .arch_bit = QEMU_ARCH_BIT_I386, + .long_bits = 64, }, { .binary_name = "qemu-system-xtensa", .arch_bit = QEMU_ARCH_BIT_XTENSA, + .long_bits = 32, }, { .binary_name = "qemu-system-xtensaeb", .arch_bit = QEMU_ARCH_BIT_XTENSA, + .long_bits = 32, }, }; @@ -151,6 +181,7 @@ void legacy_binary_info_init(const char *argv0) for (size_t i = 0; i < ARRAY_SIZE(legacy_binary_infos); i++) { if (!strcmp(legacy_binary_infos[i].binary_name, binary_name)) { + assert(legacy_binary_infos[i].long_bits); current_index = i; return; } @@ -158,3 +189,9 @@ void legacy_binary_info_init(const char *argv0) fprintf(stderr, "Missing legacy info for '%s' binary.\n", binary_name); abort(); } + +bool legacy_binary_is_64bit(void) +{ + assert(current_index != -1); + return legacy_binary_infos[current_index].long_bits == 64; +} From patchwork Wed Mar 5 15:39:16 2025 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: 870573 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp850728wrg; Wed, 5 Mar 2025 07:44:19 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXU20luj06kJz0GDsuGDmamCeTJ8aZ+OfEAtApUGGK1lzCTEcgYW8vp+Y4KfBwdw3NCDbFuWQ==@linaro.org X-Google-Smtp-Source: AGHT+IF4SRMaNO4iREpWJuZbv0whs9cKb+5/MG1NCMtpfjAy+9wvGKw3Hynj25YAiGguT83zzOCG X-Received: by 2002:a05:620a:1b90:b0:7c3:d314:723a with SMTP id af79cd13be357-7c3d8e79854mr583890285a.43.1741189458921; Wed, 05 Mar 2025 07:44:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741189458; cv=none; d=google.com; s=arc-20240605; b=duXZWnnZ4cGdT3owde8PtoJDuVeM9z07qO68hkJLzZ0rCFX+ybmHgajkE7Y/vQJmvX dkn7ugWW6vTREDOJBuFkucdgU4mpNwf4xcCKUcP3ZbkmeIXWmCyMeTAeNj7MiC+RZzJw IhEsPLPI882URdYi7QqZFn3/l9+/oNvryQfDwlsiTUyh+a0KzMK7sxS/Jewaxqe4/hFX JXe2lZjVuHAF/xgOZ1vfzA9PSXhR+SlxzA0glXpvQhze1b5kCZeezahe4TvjDvjk6YmK AxDV1A+kmzfBapD1uChBWMcWnnJjnoeRCvtEpR5vvVHrCUx9sNaVS0Ip8KV6qLG6PIWt 6REg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=L2KTLDysQM0wVa4x1RgyrU9A2skfuDU+tMT+Lbpm30s=; fh=iYS+U9AiAK/hVpJiag4U+eV/XPHIFc9y9I+tcL8yyYE=; b=bpGB3A371jOFiRYcMosYzQCKG/YiAzDh86D4yaC9uadHUySDWyVkiNw0kqMm/njb7S zt24Xb0pXfIDvw0RE7NBwav1GO6DY01qASbajTFxNXryqmhAZQUsijmj69caGl2l+p8W YYnB634duFrqtQQ1LNBfhW95jnE1bP8Im7hxi9daL64JUUxY4MT3TzPrETHH8BzXK+Nr 0tDW6U3PvK41qh5ATj31tG4PJPkNnDUk7nJbVFsrYVCaXx58VAwre9TaK9LcwfNyEB3j RP+kan17pXBZXOAK7Mqjbb45xGEkZ2i4OvWSpYkuEj4jm3fBrM4Am3gw2vSOR+lKjjpb +P8Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cZefp6PY; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c3cae97ecbsi423208885a.178.2025.03.05.07.44.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 05 Mar 2025 07:44:18 -0800 (PST) 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=cZefp6PY; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpqqs-0008Lu-Ht; Wed, 05 Mar 2025 10:40:06 -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 1tpqqp-0008KQ-AD for qemu-devel@nongnu.org; Wed, 05 Mar 2025 10:40:04 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpqqn-0002Ja-G6 for qemu-devel@nongnu.org; Wed, 05 Mar 2025 10:40:02 -0500 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-43bbc8b7c65so40122975e9.0 for ; Wed, 05 Mar 2025 07:40:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741189199; x=1741793999; 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=L2KTLDysQM0wVa4x1RgyrU9A2skfuDU+tMT+Lbpm30s=; b=cZefp6PYzpclDmYXYAulhsMPbtYEw8oU4f8ykGRJPY3SYbGQTMrWN7gqfwBqcr/n50 FK2qoblPMtcfBf1SUfk44mEebk9X2dpF4kNzYpfD1oys7bT+osqxqYDAu7JSZ2eI5sqU TWJXmaqALu4BXU0GaqqTDz9TJ8UXZKF3OnRM+3PvYrigDj9CzoB1hCO6JCch7j8bIWBm hz0dRXgFJge1/KsmxtOmVJzA/+0BxFR7cTiNloA+zbT+1eOSgVClOOTJimnfCH8X6XxW hbE0NM3534dxaWGb9ZA/mC3g5gSZajF0qGANTOPMbCzOjYRnp2961xeGUIqvo9AKWU6p 86eA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741189199; x=1741793999; 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=L2KTLDysQM0wVa4x1RgyrU9A2skfuDU+tMT+Lbpm30s=; b=GwpxrAdUg5N/7ZAjAoSqI3yerZhLKM1VOImvVpZlsyPiKFc2kQHDIzn/v9X2VmzY1M tuGjED63YHOufXmym5rvSuQye6mG4iqyP3vB4duO5AoQaXI88TxjHxK6BSm1k5GbA6bR 7d2/380jvbf3Pgl+lA8P5MezQTJZ6BeI8BDap0c/bo6kpi6tNPSNJ0RpHwRoC/mi8CJU JljVIn1y/LvWVQag69yLRkiSjGdZrjcGXpoEMqIJx6WyiR9wtWBLqEMiei0nlVxVEb8v oDiwPCEXEkAGHT8EgVF6+rZ0QPNocOJyhjIqD/C6tdnBSp1b/SHKVN5w8NOaVLo0L0rI zHLw== X-Gm-Message-State: AOJu0YzqtbekSodfivbW7C/+uAxlfmx/zgNn9lcEgFrZLUdl0mlppuM3 oI+wkxKQ+Cgn47jc7vMt7LibPoZ5XjGLPrL4ZmLuctMRYJbwfZuiB7m9Qw76oFIxK114ShWo8DM rYVU= X-Gm-Gg: ASbGncvo+HLsie5HGs9+hRkD732Y8aYlK72RDvhXPEolCCGXp1MyadobU2FdA4nm8am IhWFfoX7b8+5+nb56plkp7dsBzt4fuSq1OMXSF4K6JfKuP3mwXOKhgLxxE6SW78WUR8LhkxB88N VY3VHipj/RusM2KK5Ya2Nnq2Z8vydW6uXqCxSuA459EUJhE57LWWQS23UgkbGeAEMY3kyuBUdJ2 8v0rBQjayKpOPkdKBysACrLTp6PWe23pK+YQGf4UhpbTLh5EJqnJucyWm4hsYFGQw6a5U90anO2 D5wCddPh0z8stFuYsSYkfMbiVA0RHW8SLS/kp5iV36CAeWGvnG0UAgZJVRIpbUv8oeS5++A2ZSE z4Jsuni7jpTKs/U5LVB8= X-Received: by 2002:a5d:64a6:0:b0:391:80f:8055 with SMTP id ffacd0b85a97d-3911f74064bmr3611689f8f.18.1741189199555; Wed, 05 Mar 2025 07:39:59 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-391188029e0sm5643708f8f.52.2025.03.05.07.39.58 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 05 Mar 2025 07:39:59 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Paolo Bonzini , Richard Henderson , Pierrick Bouvier , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= Subject: [RFC PATCH 06/18] hw/mips/mipssim: Replace TARGET_MIPS64 by legacy_binary_is_64bit() Date: Wed, 5 Mar 2025 16:39:16 +0100 Message-ID: <20250305153929.43687-7-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250305153929.43687-1-philmd@linaro.org> References: <20250305153929.43687-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.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 For legacy MIPS binaries, legacy_binary_is_64bit() is equivalent of the compile time TARGET_MIPS64 definition. Signed-off-by: Philippe Mathieu-Daudé --- hw/mips/mipssim.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/hw/mips/mipssim.c b/hw/mips/mipssim.c index c530688e769..f94dbdc428b 100644 --- a/hw/mips/mipssim.c +++ b/hw/mips/mipssim.c @@ -28,6 +28,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/datadir.h" +#include "qemu/legacy_binary_info.h" #include "exec/address-spaces.h" #include "hw/clock.h" #include "hw/mips/mips.h" @@ -152,13 +153,10 @@ mips_mipssim_init(MachineState *machine) CPUMIPSState *env; ResetData *reset_info; int bios_size; + unsigned clock_hz = (legacy_binary_is_64bit() ? 6 : 12) * 1000 * 1000; cpuclk = clock_new(OBJECT(machine), "cpu-refclk"); -#ifdef TARGET_MIPS64 - clock_set_hz(cpuclk, 6000000); /* 6 MHz */ -#else - clock_set_hz(cpuclk, 12000000); /* 12 MHz */ -#endif + clock_set_hz(cpuclk, clock_hz); /* Init CPUs. */ cpu = mips_cpu_create_with_clock(machine->cpu_type, cpuclk, @@ -241,11 +239,8 @@ static void mips_mipssim_machine_init(MachineClass *mc) { mc->desc = "MIPS MIPSsim platform"; mc->init = mips_mipssim_init; -#ifdef TARGET_MIPS64 - mc->default_cpu_type = MIPS_CPU_TYPE_NAME("5Kf"); -#else - mc->default_cpu_type = MIPS_CPU_TYPE_NAME("24Kf"); -#endif + mc->default_cpu_type = legacy_binary_is_64bit() ? MIPS_CPU_TYPE_NAME("5Kf") + : MIPS_CPU_TYPE_NAME("24Kf"); mc->default_ram_id = "mips_mipssim.ram"; } From patchwork Wed Mar 5 15:39:17 2025 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: 870562 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp849562wrg; Wed, 5 Mar 2025 07:41:33 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXfsSt/k0xaQYEFQJ8wRHH++JBiWNHoXFy3I3kwwN5k8IoKgPHkX8dcixy5n9m71qSDJavxIQ==@linaro.org X-Google-Smtp-Source: AGHT+IGNVzlvx1ZuhyjXM3pBHsUeKg5JFEHhcTw8bgTMHFPNGVOVd2h59yOquAXp+4OIXZn7t+uQ X-Received: by 2002:a05:620a:6190:b0:7c3:d2f7:ca5e with SMTP id af79cd13be357-7c3d8bd27e5mr547490185a.12.1741189293367; Wed, 05 Mar 2025 07:41:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741189293; cv=none; d=google.com; s=arc-20240605; b=C1QINRhvuLylFEAF+8SwwaqxCn299EUhfqFQFYTdS69aOI5kiPRhuJK3WrmSdslnIx ec4UeFSiovVGoMALPrgSQpLMel+qSpcVKblN9rDNrd7vcpk8n1i9L9RanSrYEr3zU+Jt oB61imX4ql62NQPDzdV74AxWUcK4x0RzPeePR7DI+dvKB5niuN5RdZKl/RI/EzAKXZfG OQJ5dnYi/8zo8HxZm7ojEcTYb/9SNqYpKeXudwcg0EMxcWYV4uQrboTscxmyKZeNmsWm 2txZkQ4AeHIUF63BMLXT+FVBPh89Smz7pQmwvvnWF54tvpXnECMm0AaTiP6miRbVA3so AzAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=p6dIwE7gVAC3kvr4prQgvoWqphwYC2S/k+p1kJTqC1M=; fh=iYS+U9AiAK/hVpJiag4U+eV/XPHIFc9y9I+tcL8yyYE=; b=TcrBnYvv5WlcovgrD6/ARgynGR35YAL94Ti6h33/3c6kfzzA4jPus/JZUYuk2IC9bC mk9s0nb1xZ5rz3eWGtFOEwiqQnKQ/KHU+2T3pGaOIU/g/G/iZ5Ctdcpoqmg46YmGWIdd u13R6HJmKK8/naFXFeLDt5Q1OhoI2b6yG6QuEt5AfbeEWsactcgVOESMkB+XNfjDf6wD lW7r2OTFtn9Swe8q//NaBgd2buuTmDwHv/A/AMlbuqmSN/1RKH7xvg3ZlYa5xhRK1ZA/ 5pDCsE3bVZUZxRZDfYiEsOWVzX6UbdFMHTrffjljjd3AKHyoKPP/uymGrc+VnPdVDKTL T5gw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=c48DXGjx; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c3c28c93efsi553686585a.531.2025.03.05.07.41.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 05 Mar 2025 07:41:33 -0800 (PST) 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=c48DXGjx; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpqqw-0008QY-MK; Wed, 05 Mar 2025 10:40:11 -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 1tpqqu-0008Oc-T9 for qemu-devel@nongnu.org; Wed, 05 Mar 2025 10:40:08 -0500 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpqqt-0002LA-0i for qemu-devel@nongnu.org; Wed, 05 Mar 2025 10:40:08 -0500 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-4398ec2abc2so62238015e9.1 for ; Wed, 05 Mar 2025 07:40:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741189205; x=1741794005; 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=p6dIwE7gVAC3kvr4prQgvoWqphwYC2S/k+p1kJTqC1M=; b=c48DXGjxEH3K+6+lw+hB76dsjSZdOgCcSN5h7nwg82XugAfvjPON6BzNRCt96HtPtl ozBgF8lMemjy401D3REG238dJPC46+4zuGr0+TIaNeuiyT0OXM+Vq/gbljNdSROsy7aU Bf3SlFETTuWROUrRGXQHiJ+2K+AHeBd2/roowjwTSlYOKSgaRGqHf3Je723CYi6ygTRJ uruEAO0eD6c7lWzK4J0YWe5UI9jYiW18XT8wzep2rNsCDvZqoe7Z4YdrEtsD+K5b4KOx aXDgwNvFZacWKpUefF334Cn9MYakm3MxyIuha43oYFLnQm2KDi94JFjggJ3epmZ1MWQd GLGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741189205; x=1741794005; 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=p6dIwE7gVAC3kvr4prQgvoWqphwYC2S/k+p1kJTqC1M=; b=lQ2ZeqbkdyPY4rUh7XjR9n7XtlDc38fzdXIRg8z6kLa6AZYMa+skSpANaVkZKTu8u5 Io437DQhdt10gP0OGyMJu/X5408g3ikB3C45gl3hw/ugLJnVy+ZbR8VcZFCpZDKDaetr /9fjFSRegVgXGLxZ0sw/zl7xTeyw5vCiSIljsZzDtAmxrgAX2nqBMBpQlrkyMISitQ11 VSge9LH8k1Q7PAkBJv78Tj8vE/3PA31ILhiQBEgi0/skt7D254dDORd2PpkbnImWtfMR OxUvdFDfkMihOgjf2P+LI0oT58VRh6KKlb0Kdbb0l01z6ftUSHGz+8xlBmwd39phETwm yjqQ== X-Gm-Message-State: AOJu0YyxIzC3ZoN2J7rPkyfmbgAB33O18TnuRn01+N1zqwTmLXsq/ZUo Em6NtAsvd1ybqFSJrmPsSAYQuObc0vYKVGDjBKzYAQLBK3XDGcx37nxrhfc2gqkRNk+IG/5c5OP F+uI= X-Gm-Gg: ASbGncvh3PSX0tEpYYifWh3YOTL87pTnUP6qk1B5V3eit6JfbZ3B+AVfZsLgIEXLfw9 IrqNktW6lQHbYv1aRJcD2RJplezO4KRe2XnqwgLnC/aqSslrdVSiOQl/t4/4PKfMC38+O7utGmv D/p18tLpi6sv0VmRjnfxTFxkM0eT+HE/ZEr2lvyOr/3UZ2Jq8TqwQbLhZuRI41mUCT85NLWxlp6 Cui8SmATJsMW8o6zJ3QEphDiIJZz6yd6YHdWqQkR5LMsSHlMTSs/vVGq98t6n1h3XVXMUhUtSYs UBYfJ0w2Rs4tChyoGUS6yr1QSxfmQ8d72/rkRCj4FcIzUlS7axtP0VCLsOc82cG7sLBE87CNsgy IGH8bSr9MdOM5iWtOb9E= X-Received: by 2002:a05:600c:4f15:b0:439:8bc3:a697 with SMTP id 5b1f17b1804b1-43bd294bc2dmr28503345e9.4.1741189205082; Wed, 05 Mar 2025 07:40:05 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43bd435c6f4sm20308835e9.34.2025.03.05.07.40.03 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 05 Mar 2025 07:40:04 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Paolo Bonzini , Richard Henderson , Pierrick Bouvier , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= Subject: [RFC PATCH 07/18] hw/mips/malta: Replace TARGET_MIPS64 by legacy_binary_is_64bit() Date: Wed, 5 Mar 2025 16:39:17 +0100 Message-ID: <20250305153929.43687-8-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250305153929.43687-1-philmd@linaro.org> References: <20250305153929.43687-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.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 For legacy MIPS binaries, legacy_binary_is_64bit() is equivalent of the compile time TARGET_MIPS64 definition. Signed-off-by: Philippe Mathieu-Daudé --- hw/mips/malta.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/hw/mips/malta.c b/hw/mips/malta.c index 8e9cea70b13..3517e437f26 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -26,6 +26,7 @@ #include "qemu/units.h" #include "qemu/bitops.h" #include "qemu/datadir.h" +#include "qemu/legacy_binary_info.h" #include "qemu/cutils.h" #include "qemu/guest-random.h" #include "exec/tswap.h" @@ -1300,11 +1301,8 @@ static void mips_malta_machine_init(MachineClass *mc) mc->block_default_type = IF_IDE; mc->max_cpus = 16; mc->is_default = true; -#ifdef TARGET_MIPS64 - mc->default_cpu_type = MIPS_CPU_TYPE_NAME("20Kc"); -#else - mc->default_cpu_type = MIPS_CPU_TYPE_NAME("24Kf"); -#endif + mc->default_cpu_type = legacy_binary_is_64bit() ? MIPS_CPU_TYPE_NAME("20Kc") + : MIPS_CPU_TYPE_NAME("24Kf"); mc->default_ram_id = "mips_malta.ram"; compat_props_add(mc->compat_props, malta_compat, malta_compat_len); } From patchwork Wed Mar 5 15:39:18 2025 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: 870564 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp849620wrg; Wed, 5 Mar 2025 07:41:45 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVnErgZ+2uB1Lp7Rp0vIf/CwLduDyicQzRwh0F2Jw6Hb2925tOkkVvQ3CxxbUWlxushcj2+7w==@linaro.org X-Google-Smtp-Source: AGHT+IGubekAKUA8pxbM8Yul4a7uCx0xBSfcXkhx9081eHlsa4d6JWg0AtUmQgQMXVs5GAHWHgmy X-Received: by 2002:a05:620a:2625:b0:7c3:d63d:7bcd with SMTP id af79cd13be357-7c3d8e46660mr498398085a.41.1741189305349; Wed, 05 Mar 2025 07:41:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741189305; cv=none; d=google.com; s=arc-20240605; b=DVk8YAR/yuHvLmW/7vBMfBYHjCOFgLRAeCi4tBQUIKSCR411QKII3fPmdBCy8wf1+f otQGdAadx0bpDnyqrfasdH5MIXSIqczscCU4VVC6/UwRtUHIXJT8qXMfhH0+/5ZQHneA OYiaIXsiPFFQv7ZVG22Nnx4HEwKj9kgVnVw3zas85pgxWooaWQ5hW6YbU4shT8bifSvq YLP3ZE194qx6tchbPfEx0jdEh9W3Xp/1rmu7ynSObjTsi8zwYo4BQCYl4FjKftoYI/7b +usb9ZI7kFfLi6aJJPfLslW6sH0noBpdFwjPB7h1l2dBSqFwAIW1bI6SOind4dFzlEdq DBXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=RHsIUy8sKMvdJC/jiaNf5NT96KaTYh580z1CwMPFXu8=; fh=iYS+U9AiAK/hVpJiag4U+eV/XPHIFc9y9I+tcL8yyYE=; b=fiRmL/qqkQhJCUNeU3EQoAm1oZ4vVQXLGOAZZchPKplT53YGLDbapevjsEm6Emqj0k zhcg2YjLzUSZZWzsJFskVQzCQmMOkHXI8+jax8Gt20pzpRIrt59r9mdBjjQr/Lhrag4J g9BEqlMhNdN5n6s5iwVHsR4S+DfxugG8C/LdA22+YqHnpOI6gLqUP/p1gLwM3k/L2DyF BN5gKXO26YdD97tIlVLRWSNE1k+2vFtiirpQbTM1lnhgy1xQkODm68c5H0Pvwv637fu0 FQQIhwhbAq7TqAaonTFwYp2IanuywgFb7foCp9YkTxi3ZSA6Nj0Y83ojPBvfmmcCj4Dz i/QA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wDy7Pt6q; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c39779e8d8si1233692185a.391.2025.03.05.07.41.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 05 Mar 2025 07:41:45 -0800 (PST) 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=wDy7Pt6q; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpqr3-0008Sk-G8; Wed, 05 Mar 2025 10:40:17 -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 1tpqr0-0008SE-TQ for qemu-devel@nongnu.org; Wed, 05 Mar 2025 10:40:14 -0500 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpqqx-0002Lw-Mw for qemu-devel@nongnu.org; Wed, 05 Mar 2025 10:40:14 -0500 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-43bc4b16135so21693585e9.1 for ; Wed, 05 Mar 2025 07:40:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741189210; x=1741794010; 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=RHsIUy8sKMvdJC/jiaNf5NT96KaTYh580z1CwMPFXu8=; b=wDy7Pt6qy/l45gXtOt+d7wRwhG7cRfJXeP1LSoklQ4PhqbKzpiuCcBHfzmGexNM53W MQ7bLSkpmco19KnRaJ5K4K+SV8dtgQnGfs5aXsKSiySIr9dx1m+Z2BgeHrUn0n+OI0kL SGsduy/0VnJf+YRQDY76HgdUB2kNA1F4yaFO4wW4yZlciiXN0POABNKbf83paCvzOGg6 uqln6Ppin9HhPc5ZAKxwPybYoDB3c6hLllsmSgOl1rEB2ET94AO5gTsX6e4eu2JPOX2m Ke23OyGSjujky8WCn8mZAAit+yfM+girGJYYn2g5rRhdtL0g6EZ9EH8Z7TcsR9EDupJk Eulw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741189210; x=1741794010; 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=RHsIUy8sKMvdJC/jiaNf5NT96KaTYh580z1CwMPFXu8=; b=SvXMSpyKD5mmmRNSSQM4JF+DNG9QVbAxzXYr6INQIu47FtVruSY0r/ptq9k+Z6pjX4 SPwoeW4iaVr1TsjdgeV/6cAwYaoBWQHJq85LuLtl25HVbtTGxLQtSbMZCdDlWi603ZEF C3DFv8KphXilD68XnfA/ALE/+oJdWQXglFOzKoI7jc9Fh/u/KVUC/oCmbplvQ2Gb/E1M E+9rY1UPD9U0TLKgh2pLEUchjiBUsI2nyoUDOxlTHrka2dzkw06jJWUQAkzHrCMVirdE 2/skwt6r/r/OMVRlExZYtnWcGuiDVFighG7w55nPPBC79zuvu35MYShPvC0rSwQeKvX6 TNPw== X-Gm-Message-State: AOJu0YxejBjjKZApm6fkjAz8QByNkDNbkcpEZQQl7Y05ugt0B3g8T/kA KrA3HRSVTxnkAD7PKGceiuZTY5ohLi9OBYbeLODeXUMLtK/tdP0pwppvmSxQToH915z+7PIE66w Hf/s= X-Gm-Gg: ASbGnct/F3d6fUQoI0XoaNg2/LqciktLiSZHG1GsH5GnyzQh6nEWw3kX0WO5Za/kRVk z00IdPAfbKbrXmCkOqZfgHyXyGKd3klMD8eQ0O96GqQ438cGW2k4ytZqFvJ1odRG6HvIid6FVSO kSHrNVXvV1ccJczA8qhbKnL96o+RDWlC7TonQV4Ia8I2JWT3Dlq23Q6JdCK7s1ZZtaepk9berI+ ViGx/BH/MXIt5tWaVJ/jpRYEBEqLm8TLIv4h+BOyV7tPzMG6WqNWZYwNqZjGQZ86XoIfrhVMDmz 6SbXLbBKVvZHWLj2cphFe2AbI8vpmGi5yR9dCOzALuWXirv6aaYb5PUiC4eemN8sSnn5MjB+mW+ DcVFmdQ9mjICGjtezxqE= X-Received: by 2002:a05:600c:468e:b0:43b:bdf4:1c9 with SMTP id 5b1f17b1804b1-43bd2af4b26mr26941585e9.29.1741189209779; Wed, 05 Mar 2025 07:40:09 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43bd42badefsm20744025e9.18.2025.03.05.07.40.08 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 05 Mar 2025 07:40:09 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Paolo Bonzini , Richard Henderson , Pierrick Bouvier , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= Subject: [RFC PATCH 08/18] hw/i386: Inline TARGET_DEFAULT_CPU_TYPE definition Date: Wed, 5 Mar 2025 16:39:18 +0100 Message-ID: <20250305153929.43687-9-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250305153929.43687-1-philmd@linaro.org> References: <20250305153929.43687-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.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 For legacy x86 binaries, legacy_binary_is_64bit() is equivalent of the compile time TARGET_X86_64 definition. Use it in place in machine class_init() handlers, removing the need on TARGET_X86_64. Signed-off-by: Philippe Mathieu-Daudé --- target/i386/cpu.h | 6 ------ hw/i386/microvm.c | 5 ++++- hw/i386/pc.c | 5 ++++- hw/i386/xen/xen-pvh.c | 5 ++++- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 0ab2e1bdb40..7f3c1ceaca7 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -2555,12 +2555,6 @@ uint64_t cpu_get_tsc(CPUX86State *env); #define CPU_RESOLVING_TYPE TYPE_X86_CPU -#ifdef TARGET_X86_64 -#define TARGET_DEFAULT_CPU_TYPE X86_CPU_TYPE_NAME("qemu64") -#else -#define TARGET_DEFAULT_CPU_TYPE X86_CPU_TYPE_NAME("qemu32") -#endif - #define cpu_list x86_cpu_list /* MMU modes definitions */ diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c index d0a236c74f3..cc94e1408c6 100644 --- a/hw/i386/microvm.c +++ b/hw/i386/microvm.c @@ -19,6 +19,7 @@ #include "qemu/error-report.h" #include "qemu/cutils.h" #include "qemu/units.h" +#include "qemu/legacy_binary_info.h" #include "qapi/error.h" #include "qapi/visitor.h" #include "qapi/qapi-visit-common.h" @@ -654,7 +655,9 @@ static void microvm_class_init(ObjectClass *oc, void *data) mc->has_hotpluggable_cpus = false; mc->auto_enable_numa_with_memhp = false; mc->auto_enable_numa_with_memdev = false; - mc->default_cpu_type = TARGET_DEFAULT_CPU_TYPE; + mc->default_cpu_type = legacy_binary_is_64bit() + ? X86_CPU_TYPE_NAME("qemu64") + : X86_CPU_TYPE_NAME("qemu32"); mc->nvdimm_supported = false; mc->default_ram_id = "microvm.ram"; diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 63a96cd23f8..936a770aad8 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" +#include "qemu/legacy_binary_info.h" #include "hw/i386/pc.h" #include "hw/char/serial-isa.h" #include "hw/char/parallel.h" @@ -1794,7 +1795,9 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) hc->plug = pc_machine_device_plug_cb; hc->unplug_request = pc_machine_device_unplug_request_cb; hc->unplug = pc_machine_device_unplug_cb; - mc->default_cpu_type = TARGET_DEFAULT_CPU_TYPE; + mc->default_cpu_type = legacy_binary_is_64bit() + ? X86_CPU_TYPE_NAME("qemu64") + : X86_CPU_TYPE_NAME("qemu32"); mc->nvdimm_supported = true; mc->smp_props.dies_supported = true; mc->smp_props.modules_supported = true; diff --git a/hw/i386/xen/xen-pvh.c b/hw/i386/xen/xen-pvh.c index 33c10279763..f0080c83021 100644 --- a/hw/i386/xen/xen-pvh.c +++ b/hw/i386/xen/xen-pvh.c @@ -8,6 +8,7 @@ */ #include "qemu/osdep.h" +#include "qemu/legacy_binary_info.h" #include "qemu/error-report.h" #include "hw/boards.h" #include "system/system.h" @@ -81,7 +82,9 @@ static void xen_pvh_machine_class_init(ObjectClass *oc, void *data) MachineClass *mc = MACHINE_CLASS(oc); mc->desc = "Xen PVH x86 machine"; - mc->default_cpu_type = TARGET_DEFAULT_CPU_TYPE; + mc->default_cpu_type = legacy_binary_is_64bit() + ? X86_CPU_TYPE_NAME("qemu64") + : X86_CPU_TYPE_NAME("qemu32"); /* mc->max_cpus holds the MAX value allowed in the -smp cmd-line opts. */ mc->max_cpus = HVM_MAX_VCPUS; From patchwork Wed Mar 5 15:39:19 2025 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: 870561 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp849441wrg; Wed, 5 Mar 2025 07:41:15 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWifyrFXoHdxI7Lz4xWV2mSgH3SKjad/PbfPiRbTsyfaoNA25oMc4GIWOt4Wfx0AArfKCHXXw==@linaro.org X-Google-Smtp-Source: AGHT+IHLWl3ZGl/Z8hcibYuD8+klEC9LAGgWKDseZTlWr5AQZWZbLqMyYiw+difoM7tnn0bI2315 X-Received: by 2002:a05:620a:2626:b0:7c3:c500:ca96 with SMTP id af79cd13be357-7c3d9172203mr477634585a.9.1741189275169; Wed, 05 Mar 2025 07:41:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741189275; cv=none; d=google.com; s=arc-20240605; b=dxFzZyKf8iTWBwfgv49Y6miTl4MkQICcNcF6cKeVK0+NAhNYezpOnFkkMEVR9Q8ATN ciG5A81R/1JFcUuayDcZsRUWJniT9+9KCyG0awayIRwe3Nn037O0QnUPSjx5SW11ES30 dw5HOv08EZAgI4WIhToWd+MpbNjG4s8MTvWLeyE47y+LZ2kDvI7hYvpxEp4HrYGfW3l3 JvrqWIUDqBNwNqrJQd3Q5Y7JQO8JssEWpmR4KTQ281eKXZJr0bhuBEJ5+n3DPJ3EbDwa pgPVq5XtIBqbFoqC0p8l9UNF4pBtaZWeltM2if9M0pZK2g+GGS5UAUiZPlXK0V8LJK1e r+aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=tm6pJ8fvWIoYf16fHvVGbN/phK9k4HNSdSWeslgNhR4=; fh=iYS+U9AiAK/hVpJiag4U+eV/XPHIFc9y9I+tcL8yyYE=; b=ZmY+AqWhIzDAwH3gr0vHuTwMetxtQblyAzfV7UZbSzugcPf/Pv0n8qSSH7rnmaLcTm ta7pTdpSty4D3PyUBs8yd2Vcsw4t5k0iJRDfA/yQI7q1ZyRUDdi+Z56wsKmVZ82nanEl OpGW+DitaSWtxuQwY3dRz6SBc9FlKBFg7UYntLSqa0iDFzOErLeWUMv5Llk12AKhHncR TQPRgb06AtLBbFOJIrZRcmWpi9QO6ufQQuxD8pjRLxCIx8gzpmjBcscy8IK7jzS/wWP4 cv6TZKFhaRhmJ8b6Qu+a77wEK9ju+eQ2In5cmZPON7M6W4LBmrM13MYnZfbc2wsDOSz+ lHkw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Q4jbc19s; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c3cef1e292si348149785a.609.2025.03.05.07.41.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 05 Mar 2025 07:41:15 -0800 (PST) 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=Q4jbc19s; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpqr7-00005o-Ri; Wed, 05 Mar 2025 10:40:21 -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 1tpqr5-0008Tg-Ct for qemu-devel@nongnu.org; Wed, 05 Mar 2025 10:40:19 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpqr3-0002XU-FM for qemu-devel@nongnu.org; Wed, 05 Mar 2025 10:40:19 -0500 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-43948f77f1aso45795595e9.0 for ; Wed, 05 Mar 2025 07:40:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741189215; x=1741794015; 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=tm6pJ8fvWIoYf16fHvVGbN/phK9k4HNSdSWeslgNhR4=; b=Q4jbc19sjQr5hko3qHpe2APNeLFTCPO8Qxi66cWV+cKcTn0xf/RTXKc2p3b1QN3VQG nu4QfDfGxWu6D/9qQ1NBEAzL9VgtYBLaLed8mvfGCDfWTb1Id618cL8snIskq/ssH5oW U30f2bEiCeFpz4qqlVLZIlKX9ULn1jBs4hCGFWSLKmSxJHgKgAQle58O0TJlA1PrphPA 3JW0uBmrKBylRxg2rJvjWt8NrH+w70ZFi/OCYgmmuIhi5m2g9feNjjeB3pYKXnzT6V// Bkskv14Kv1ItpJ/Kj8IwZVyWEqbNGYeeLudYd3KTTQKgggtAKQeSxm6PHn9X8RE7/s8y vEGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741189215; x=1741794015; 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=tm6pJ8fvWIoYf16fHvVGbN/phK9k4HNSdSWeslgNhR4=; b=B4OclVK/unT65JvQtr8W1TceOCt4RQJ36A+ewr8fekJToCTjUVUxWv+ymcuhEK+aui +2KL9SoceU5n+vFrXYIaR5S4XWbvzSkYVi/UK4DoQOy5MhtkRkqeFinih4ZJJMSeJ6gk kDdiPAJ6wanBKhu/LbKyYGm5BqmlRsxzeYzY/e5whPbD5PfqlIK4UHQVKzyIQomBv/sq LVdBY0sKeF3HgmsiHmeSDDuKvDsrzgvJkgGApSY3oU7ad7X4WML6+OqVqzKa8zoird86 g+WEqb9mau3vWpp7dp51OZTHh2AAl9QP/JuCWEjco8HRIdCiJ/YzxkIJ2vSKtptVUNFa wikQ== X-Gm-Message-State: AOJu0Yzxaz6UumBPDzAPgDIC1qU1xU3wYspodj5ofNBubJM98c2Zapeg ExF3C4+kvwsa2ZyKOrqN4tzy2Z3wUIEY528vxnS5t/XSHjLR6DzpKJzK7vJHdfT3bBDvFqTg9Gr Eoec= X-Gm-Gg: ASbGncuVoZVLc/Kps0dPIJX6kv5ESz+jpUP9CDsUk5bgSZLL3amBBcTcXjXmu9CQJav QPZOXN90iZUz04Y6It6Z8eUfr5ASegYQ8AY4PKgbOQbIorz0AY31csSjs9JsDI+PA40Rs4MAN2R vRFiHIE5gaigsYsQnTRmG9V+cx/NzMPQEF9bhpIrAQvU6BAXPAhdw2G2+Aq1WU/SigUk5j2hLz4 7glpHVVb+0WAZzMhC9mXnNFliUDQDw9MKvRcbhZwr+Ya62VDR6th9XX3kz0w6XNJ6gWbrvlA4h8 LyMQMS6e8qv7IPD9guZxf7mhl3B37WyyciT97SAcv8LWL02Z0k8iZVAe15IFXYM9sjdBpAFDDR5 hcHogBnbWKBb+WnfS9hA= X-Received: by 2002:a05:600c:444c:b0:43b:ce36:7574 with SMTP id 5b1f17b1804b1-43bd29c6a29mr32248475e9.11.1741189215238; Wed, 05 Mar 2025 07:40:15 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43bd42e51e8sm20650775e9.26.2025.03.05.07.40.13 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 05 Mar 2025 07:40:14 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Paolo Bonzini , Richard Henderson , Pierrick Bouvier , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= Subject: [RFC PATCH 09/18] hw/ppc/mac: Replace TARGET_PPC64 by legacy_binary_is_64bit() Date: Wed, 5 Mar 2025 16:39:19 +0100 Message-ID: <20250305153929.43687-10-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250305153929.43687-1-philmd@linaro.org> References: <20250305153929.43687-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.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 For legacy PowerPC binaries, legacy_binary_is_64bit() is equivalent of the compile time TARGET_PPC64 definition. Signed-off-by: Philippe Mathieu-Daudé --- hw/ppc/mac_newworld.c | 9 ++++----- hw/ppc/mac_oldworld.c | 5 ++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index cb3dc3ab482..60cca313b10 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -49,6 +49,7 @@ #include "qemu/osdep.h" #include "qemu/datadir.h" #include "qemu/units.h" +#include "qemu/legacy_binary_info.h" #include "qapi/error.h" #include "hw/ppc/ppc.h" #include "hw/qdev-properties.h" @@ -581,11 +582,9 @@ static void core99_machine_class_init(ObjectClass *oc, void *data) mc->default_display = "std"; mc->default_nic = "sungem"; mc->kvm_type = core99_kvm_type; -#ifdef TARGET_PPC64 - mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("970fx_v3.1"); -#else - mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("7400_v2.9"); -#endif + mc->default_cpu_type = legacy_binary_is_64bit() + ? POWERPC_CPU_TYPE_NAME("970fx_v3.1") + : POWERPC_CPU_TYPE_NAME("7400_v2.9"); mc->default_ram_id = "ppc_core99.ram"; mc->ignore_boot_device_suffixes = true; fwc->get_dev_path = core99_fw_dev_path; diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c index 0dbcea035c3..a8515778e2d 100644 --- a/hw/ppc/mac_oldworld.c +++ b/hw/ppc/mac_oldworld.c @@ -27,6 +27,7 @@ #include "qemu/osdep.h" #include "qemu/datadir.h" #include "qemu/units.h" +#include "qemu/legacy_binary_info.h" #include "qapi/error.h" #include "hw/ppc/ppc.h" #include "hw/qdev-properties.h" @@ -416,9 +417,7 @@ static void heathrow_class_init(ObjectClass *oc, void *data) mc->block_default_type = IF_IDE; /* SMP is not supported currently */ mc->max_cpus = 1; -#ifndef TARGET_PPC64 - mc->is_default = true; -#endif + mc->is_default = !legacy_binary_is_64bit(); /* TOFIX "cad" when Mac floppy is implemented */ mc->default_boot_order = "cd"; mc->kvm_type = heathrow_kvm_type; From patchwork Wed Mar 5 15:39:20 2025 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: 870568 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp850085wrg; Wed, 5 Mar 2025 07:42:49 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVpxV1UaeFESOSHZbSn8mgr+4G3Jx2g3k0ruwpIDgez7E8DmUpbV8A/PYQ7yLyJ4LCEk00n+Q==@linaro.org X-Google-Smtp-Source: AGHT+IG+xQ0ClG1h/xdEccDyUdPac6FoMqMlGnrYr2+AyPSnvrMq+X9MmE8bkP4VoTRX0inLfP+M X-Received: by 2002:a05:620a:2621:b0:7c0:b42b:8a7b with SMTP id af79cd13be357-7c3d8e556a2mr604882285a.35.1741189369239; Wed, 05 Mar 2025 07:42:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741189369; cv=none; d=google.com; s=arc-20240605; b=QYW1vaZighBH8m4jKnlENNS5gsk7Y+R9xOi3bWooHGxzQBdn6gvIYURvW9983me5H3 +rekrOBUHLI8RfEMz2UvcCXl4ts7+tdOPWoTILclJ4SJEftnaDS2yCL3i1A24/LWKQ1A 86qsPsZ3b8aH0h6er0ATZS/Ls4S86np/079lixDlKctAxmuObCfnyrZT2SymEfv5NOO3 GADolK5BHsh5tqulB89h9vT2kOidA+dmxe/H6tkH5dx7zgjbXJpl+8Y2pDfFquEcSDDM oGyJ8uyQF+OZMsv6zW4BlnnixJ5HxIVzbWJT63SFbUIRV223fYrOPBHYoMx5J4IRxRJN Sgwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=fYDAc70iCmEcsaAQpim9Lu0U9CfOBiddFcVryIIgw1c=; fh=iYS+U9AiAK/hVpJiag4U+eV/XPHIFc9y9I+tcL8yyYE=; b=WiwUEC4a1TwXqp9eSmjZgfZ7RQjEqmcncU4cqI7dII6MDTTY27bctKFyF47t2ihGMV Bk+Jk0//QoygrsuQtIpvXt0XQ9wP5v9CmCd27NFmCPhhYx7jw1dBPAM7w+OSyf7z3ftQ hY5JQ2sfhdqv29LlYU/reHFBCx933b+ikqMyqIwGgk2pYpLXfkSpktwzeAjRtWPnN6Ir VhflO+m8PL0hk0gAbLiMnsEDwIKPWTkWF+r1TPhwiXWyKpa79/JZjfXG1QwOcJNhGXW0 D3WzVVXNLw1DNZzpEk+bAEpnobh0YFZxJCq9B6jj1zlK5VZVYs53io+/5jWMKY8tld7k oEgg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YkMY0QYP; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c3b58a1aeasi707520885a.125.2025.03.05.07.42.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 05 Mar 2025 07:42:49 -0800 (PST) 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=YkMY0QYP; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpqrP-0000MX-9p; Wed, 05 Mar 2025 10:40:39 -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 1tpqr9-0000B7-VA for qemu-devel@nongnu.org; Wed, 05 Mar 2025 10:40:25 -0500 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 1tpqr8-0002Yd-0r for qemu-devel@nongnu.org; Wed, 05 Mar 2025 10:40:23 -0500 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-388cae9eb9fso3709630f8f.3 for ; Wed, 05 Mar 2025 07:40:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741189220; x=1741794020; 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=fYDAc70iCmEcsaAQpim9Lu0U9CfOBiddFcVryIIgw1c=; b=YkMY0QYPt/LvwyelHu9FWgbr6h6iETjtGO5oUtRKzVuRdXJmU0MvggKrPQ5nos1x/r UDjkG3fCKv0GXa8tPhFJcDUXJ/DZQN7ppa6/8+8GUmRgpVA+ReWCWLu2bgGLzzNtgGGI XTYYcDLf6mmjzy1Di5Ir2qgO/4ih5bb25/0HtyYCDzUOqNDHUiou5DIf0y3utI4RVy4d 4yP0ArNp9ef4YAvAoMN43bd6X84Z4j1kfmJx9LFdiyidgxQ9axqLyv2ujgdtTjxWtJUL NgdzieO6bH2fKwXUFGt8CwdCyiSzg1PLQPJHQ/58sPhcdtaun1T+Vno55fTTc/nQN1Wu ZB4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741189220; x=1741794020; 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=fYDAc70iCmEcsaAQpim9Lu0U9CfOBiddFcVryIIgw1c=; b=QTZLQa2MnORvXC34Q59v14NuKZCuIkY1E/wtoyzS73Yci5Y5UjNAkEbGWnwrz9fBmj wwVlC4CMKbzEerpwr487HMW8pjc3BbcICLSNP2VJcNA4EW7sa/iSR/vTFeRjf1DKEN2x lpu1y3W45WtxDuT0k9IdjIdr0/9YmIMS9jUoHTBj/1v73eSjwja97RdJrKLapdXrbALl tmf40EAuwAy7TamKGTG8dw5l2ZngyLjY0OeTH8W+e6sYU6ry3OomIGnm6RJci6DGL3vf rfLo0uMjpioOdkwTPqQ4rW0lpRRh0Yxlo93WxxqM5fCVYlttCBfaDk8bSgpgu+iiIyeK PNww== X-Gm-Message-State: AOJu0Yw7degxVPtBDUT/WVO7/U8pHvL9aOKV3CLtAMO46srizBzXeA3c JQRP9oi/v/fq1YVLQDPXX6j0UqHrpffc7cq2v25jMndtrpf4myEm6FhelQ0GnIfDZ0ZN8a9iv/e Redo= X-Gm-Gg: ASbGnctSjetN0JxQCsUTkEQMMm3FZt/rjeIWjnbzoDc0Lqk7h6aks788h/f8ooRnaoT D1bmE48/au18JGf0iaFRJgmBNSRzibyn1uMryS364EE/r8mvKS+TXebQbPQdxeT32mLWv7Z+4oZ JE4E/0Jwy/ELtX/hXY6wloaaJF2MkpPs8rKHRBW1W5GxtnVAsk5S93N1WUdfBBV2PDi/XL44Duj 305RemwBjtQFBIFPu4UqM+ETOia1eMH66j9ChclosOaQcZ9SUtmq3e7nkg0YGBzOiHOg/VoRYgw qe4zE6Pb52TnXrAYqHeBBQjDvlXvGZ6JHweerz5PqiJCHinI16t87tYE8TxRZ0e/12maF2ToTGA EOVrwytjiveO8c1mlsuY= X-Received: by 2002:a05:6000:1869:b0:390:fbba:e64b with SMTP id ffacd0b85a97d-3911f789f82mr4109789f8f.31.1741189220035; Wed, 05 Mar 2025 07:40:20 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390e485dbe7sm21577111f8f.93.2025.03.05.07.40.19 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 05 Mar 2025 07:40:19 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Paolo Bonzini , Richard Henderson , Pierrick Bouvier , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= Subject: [RFC PATCH 10/18] qemu: Introduce legacy_binary_is_big_endian() helper Date: Wed, 5 Mar 2025 16:39:20 +0100 Message-ID: <20250305153929.43687-11-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250305153929.43687-1-philmd@linaro.org> References: <20250305153929.43687-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 Introduce legacy_binary_endianness() to return the endianness of a legacy binary, and legacy_binary_is_big_endian() being equivalent of compile time TARGET_BIG_ENDIAN definition. Signed-off-by: Philippe Mathieu-Daudé --- include/qemu/legacy_binary_info.h | 8 ++++++ legacy_binary_info.c | 43 +++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/include/qemu/legacy_binary_info.h b/include/qemu/legacy_binary_info.h index 2d42e852b7a..18886a05402 100644 --- a/include/qemu/legacy_binary_info.h +++ b/include/qemu/legacy_binary_info.h @@ -9,9 +9,17 @@ #ifndef QEMU_LEGACY_BINARY_INFO_H #define QEMU_LEGACY_BINARY_INFO_H +#include "qapi/qapi-types-common.h" + void legacy_binary_info_init(const char *argv0); /* Return runtime equivalent of TARGET_LONG_BITS == 64 check */ bool legacy_binary_is_64bit(void); +/* Return runtime equivalent of TARGET_BIG_ENDIAN definition */ +bool legacy_binary_is_big_endian(void); + +/* Return endianness of legacy binary */ +EndianMode legacy_binary_endianness(void); + #endif diff --git a/legacy_binary_info.c b/legacy_binary_info.c index be50d3f50ea..c9a8e99699e 100644 --- a/legacy_binary_info.c +++ b/legacy_binary_info.c @@ -9,10 +9,12 @@ #include "qemu/osdep.h" #include "qemu/arch_info.h" #include "qemu/legacy_binary_info.h" +#include "qapi/qapi-types-common.h" typedef struct LegacyBinaryInfo { const char *binary_name; QemuArchBit arch_bit; + EndianMode endianness; unsigned long_bits; } LegacyBinaryInfo; @@ -21,146 +23,175 @@ static const LegacyBinaryInfo legacy_binary_infos[] = { { .binary_name = "qemu-system-aarch64", .arch_bit = QEMU_ARCH_BIT_ARM, + .endianness = ENDIAN_MODE_LITTLE, .long_bits = 64, }, { .binary_name = "qemu-system-alpha", .arch_bit = QEMU_ARCH_BIT_ALPHA, + .endianness = ENDIAN_MODE_LITTLE, .long_bits = 64, }, { .binary_name = "qemu-system-arm", .arch_bit = QEMU_ARCH_BIT_ARM, + .endianness = ENDIAN_MODE_LITTLE, .long_bits = 32, }, { .binary_name = "qemu-system-avr", .arch_bit = QEMU_ARCH_BIT_AVR, + .endianness = ENDIAN_MODE_LITTLE, .long_bits = 32, }, { .binary_name = "qemu-system-hppa", .arch_bit = QEMU_ARCH_BIT_HPPA, + .endianness = ENDIAN_MODE_BIG, .long_bits = 64, }, { .binary_name = "qemu-system-i386", .arch_bit = QEMU_ARCH_BIT_I386, + .endianness = ENDIAN_MODE_LITTLE, .long_bits = 32, }, { .binary_name = "qemu-system-loongarch64", .arch_bit = QEMU_ARCH_BIT_LOONGARCH, + .endianness = ENDIAN_MODE_LITTLE, .long_bits = 64, }, { .binary_name = "qemu-system-m68k", .arch_bit = QEMU_ARCH_BIT_M68K, + .endianness = ENDIAN_MODE_BIG, .long_bits = 32, }, { .binary_name = "qemu-system-microblaze", .arch_bit = QEMU_ARCH_BIT_MICROBLAZE, + .endianness = ENDIAN_MODE_BIG, .long_bits = 64, }, { .binary_name = "qemu-system-microblazeel", .arch_bit = QEMU_ARCH_BIT_MICROBLAZE, + .endianness = ENDIAN_MODE_LITTLE, .long_bits = 64, }, { .binary_name = "qemu-system-mips", .arch_bit = QEMU_ARCH_BIT_MIPS, + .endianness = ENDIAN_MODE_BIG, .long_bits = 64, }, { .binary_name = "qemu-system-mips64", .arch_bit = QEMU_ARCH_BIT_MIPS, + .endianness = ENDIAN_MODE_BIG, .long_bits = 64, }, { .binary_name = "qemu-system-mips64el", .arch_bit = QEMU_ARCH_BIT_MIPS, + .endianness = ENDIAN_MODE_LITTLE, .long_bits = 64, }, { .binary_name = "qemu-system-mipsel", .arch_bit = QEMU_ARCH_BIT_MIPS, + .endianness = ENDIAN_MODE_LITTLE, .long_bits = 32, }, { .binary_name = "qemu-system-or1k", .arch_bit = QEMU_ARCH_BIT_OPENRISC, + .endianness = ENDIAN_MODE_LITTLE, .long_bits = 32, }, { .binary_name = "qemu-system-ppc", .arch_bit = QEMU_ARCH_BIT_PPC, + .endianness = ENDIAN_MODE_BIG, .long_bits = 32, }, { .binary_name = "qemu-system-ppc64", .arch_bit = QEMU_ARCH_BIT_PPC, + .endianness = ENDIAN_MODE_BIG, .long_bits = 64, }, { .binary_name = "qemu-system-riscv32", .arch_bit = QEMU_ARCH_BIT_RISCV, + .endianness = ENDIAN_MODE_LITTLE, .long_bits = 32, }, { .binary_name = "qemu-system-riscv64", .arch_bit = QEMU_ARCH_BIT_RISCV, + .endianness = ENDIAN_MODE_LITTLE, .long_bits = 64, }, { .binary_name = "qemu-system-rx", .arch_bit = QEMU_ARCH_BIT_RX, + .endianness = ENDIAN_MODE_LITTLE, .long_bits = 32, }, { .binary_name = "qemu-system-s390x", .arch_bit = QEMU_ARCH_BIT_S390X, + .endianness = ENDIAN_MODE_BIG, .long_bits = 64, }, { .binary_name = "qemu-system-sh4", .arch_bit = QEMU_ARCH_BIT_SH4, + .endianness = ENDIAN_MODE_LITTLE, .long_bits = 32, }, { .binary_name = "qemu-system-sh4eb", .arch_bit = QEMU_ARCH_BIT_SH4, + .endianness = ENDIAN_MODE_BIG, .long_bits = 32, }, { .binary_name = "qemu-system-sparc", .arch_bit = QEMU_ARCH_BIT_SPARC, + .endianness = ENDIAN_MODE_BIG, .long_bits = 32, }, { .binary_name = "qemu-system-sparc64", .arch_bit = QEMU_ARCH_BIT_SPARC, + .endianness = ENDIAN_MODE_BIG, .long_bits = 64, }, { .binary_name = "qemu-system-tricore", .arch_bit = QEMU_ARCH_BIT_TRICORE, + .endianness = ENDIAN_MODE_LITTLE, .long_bits = 32, }, { .binary_name = "qemu-system-x86_64", .arch_bit = QEMU_ARCH_BIT_I386, + .endianness = ENDIAN_MODE_LITTLE, .long_bits = 64, }, { .binary_name = "qemu-system-xtensa", .arch_bit = QEMU_ARCH_BIT_XTENSA, + .endianness = ENDIAN_MODE_LITTLE, .long_bits = 32, }, { .binary_name = "qemu-system-xtensaeb", .arch_bit = QEMU_ARCH_BIT_XTENSA, + .endianness = ENDIAN_MODE_BIG, .long_bits = 32, }, }; @@ -182,6 +213,7 @@ void legacy_binary_info_init(const char *argv0) for (size_t i = 0; i < ARRAY_SIZE(legacy_binary_infos); i++) { if (!strcmp(legacy_binary_infos[i].binary_name, binary_name)) { assert(legacy_binary_infos[i].long_bits); + assert(legacy_binary_infos[i].endianness != ENDIAN_MODE_UNSPECIFIED); current_index = i; return; } @@ -195,3 +227,14 @@ bool legacy_binary_is_64bit(void) assert(current_index != -1); return legacy_binary_infos[current_index].long_bits == 64; } + +EndianMode legacy_binary_endianness(void) +{ + assert(current_index != -1); + return legacy_binary_infos[current_index].endianness; +} + +bool legacy_binary_is_big_endian(void) +{ + return legacy_binary_endianness() == ENDIAN_MODE_BIG; +} From patchwork Wed Mar 5 15:39:21 2025 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: 870560 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp849411wrg; Wed, 5 Mar 2025 07:41:11 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWKH2K2kHrG6g+6fuQdEeGhOwKKTfagtDceoP1U77E+OqJqt5rh7DHM5z2ab+B1STpLs011eg==@linaro.org X-Google-Smtp-Source: AGHT+IFTZmtWcPznv5vg/hrA/icrKEUuVvX/FmwPwEJpjpzTgoo10egVlNjA7FKhnnXs/UjuSIWz X-Received: by 2002:a05:6214:2526:b0:6e4:4331:aae6 with SMTP id 6a1803df08f44-6e8e6d1ec58mr51986156d6.39.1741189271644; Wed, 05 Mar 2025 07:41:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741189271; cv=none; d=google.com; s=arc-20240605; b=SzDe8QKzzgsvmXNsJt+LuTP8vJ5JV3IQewUGQqJbA0CmDINSKpmkIAEGt9S8mwr8yV fj2BLAtW1CaCL90K0e8FqBSq+zVOh2DyfQvptuURc8riz51Z4f3Cb0ayAJ12gmY3qNhE iwG4RIuRsv/Iq535RDK1BPHvo2Ax4SCvAtqCzA0xf5FiyLXNKrx20xSB5xc7o2SPDEwC nbtj5gvgjaDJmARu2FVJtMPu6DMvPv92Rp5VdV0kYmq5mCkGQEhgbCA0/jFDCXnX3/Da afM1CC9EalvqVcCB4+FOMAXtzwzmE7drPkfcUJQgKXVVpHraAK842VFA+PtDS0GrEYBg a4BA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=h75Q8oFB88c1KxlztseXVkazErFGK1NRT/MtbJI0cyg=; fh=iYS+U9AiAK/hVpJiag4U+eV/XPHIFc9y9I+tcL8yyYE=; b=RPzQgaXakP4gnebQUiDeeObx4+Raj8EoFSjrtaNCwPUhjmi5VoruOGhbyymvSagvlq OR1PviVUCTH7UEYucktd6NRUF9sYd66i/pnbeuwqpKuKZknNZqWjSTOqYch9dIzReVrD f+GIh0qsPZR+j1pKzBD4pD3vOBpE5pnM3IeFWPnPm5LvOCq+TbOlLwQnN84ghhAL8MNB LBvcQi6UPQ2eBlP3c67/JID+tusN9YtqDDq2MTuQvycJf5pUpgd4D2P7EHSZ9EpII9kr uq/JE8Bu3rW+cHxYN57Gv8IacdLqww9Yk7FGoc0b/9cfEdk3r7F4KFXK/W7cZnDluuVV 04vA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CqqxoSQB; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6e8977020fbsi129377256d6.498.2025.03.05.07.41.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 05 Mar 2025 07:41:11 -0800 (PST) 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=CqqxoSQB; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpqrS-0000Z0-Hw; Wed, 05 Mar 2025 10:40:42 -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 1tpqrF-0000Fe-EJ for qemu-devel@nongnu.org; Wed, 05 Mar 2025 10:40:31 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450: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 1tpqrD-0002Yw-Dy for qemu-devel@nongnu.org; Wed, 05 Mar 2025 10:40:28 -0500 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-38a25d4b9d4so4199817f8f.0 for ; Wed, 05 Mar 2025 07:40:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741189225; x=1741794025; 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=h75Q8oFB88c1KxlztseXVkazErFGK1NRT/MtbJI0cyg=; b=CqqxoSQBo2gAujJYVlE9bT4K1R5IVnfaGIpvyn+fU11FMflWA6FkxGQlJgzGX2ZehC hG+iBBAEpVdRwVcwaOHEV6yehNxNkfJv4NpUzPVAXO7jEPqj24yt4QeEKXD/nH9CXWul Q9BBLJh7MAVn+KRJd88XHXTyC7UOIUlZJW4SCQEusVQt0QdEbDR732W/biXpDnHIGbYi SObWxLDuOGcghisjYGj60y0DnyIG6A3/ONlf09nL5g19H6PvH+DXR/5bg2CyYzDh06Uf SgjoN1UKwFQf6GoBA6k2IArCgj0UMkSGTC3ul+jZwCcZBxLZwzqTEKME1xyvmtHZzI4E 07QA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741189225; x=1741794025; 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=h75Q8oFB88c1KxlztseXVkazErFGK1NRT/MtbJI0cyg=; b=MZ+VvvFLMYIVD9C/Tj9Dc7/FsfR4VqMIPc7NFF2C6KwQJikw4M7v6l+xBupZjfsJpt P+D7ySHq21CArkoybKque/+rDMo/MAze8NcIece/y4H/Zt3UVPfiMXQC2cQ78OUdfrXh Qm2wNVbIykUUIJlddYR+yMcsSZDG12kqH1jwq0KwhLG0HnGmuwrg1uBG9G64Cmmr3e+e UFGtuTEz7yRw1x/zebyx+za78ln5L0xjE7V5dwFOk/T1gbTMmgae35hrC5pO6+ExnzK6 yTPGyMqD4OqvvQgeWG94QzjYQDKj49LHA0Tz8FwSsJoCzEfjIjBA3cAj4CjMY7e0pMNK teMw== X-Gm-Message-State: AOJu0YxSjURCaLNWoXUGEJsYMWagH/1ZaPIwfKoMbDKqJfZj+MsoQEgF 4PaY0VZM14ysom0pE2NneqC6BZTISG9FOpnNdgAirYRaggUR97wASko1wupZuQpMhHBVFCyOPpE S4AE= X-Gm-Gg: ASbGncu9ULweRO+zZL74CsEPBCrw6d3kN1XInXK8rQ+bf23uf5hyg9MiqRlQZg2hnAL AGES5zc4MsoKl4/e/xy1hO2wXuIvNk2ci6zjon26JawZrmwvtcsy1dARGKX8TngnDb6+MI2jF/R KZZuvsI13nRQ8mJeXhQe6W+T5M6WTCXY70xMOAQMFn6kRMlivVnBYusssZyq3Aa/E101GCWQLGq E20lIs9ecgurKSKhpa+FotGaZ//vn0yf+IIeOtsa2TYP0i4rRFlaiJDMQ9ylenOwot6dnvDIWuE sgrsagvaFy7cYhibimKeMbSCeuXCsbeo1631/IvLjbfY39gifXbpOtFOUBryq18GgbBFpHzRPtY hFT1q1ZlqcwGy9zOUfB0= X-Received: by 2002:a05:6000:2cf:b0:391:6fd:bb8a with SMTP id ffacd0b85a97d-3911f740597mr3342520f8f.14.1741189224730; Wed, 05 Mar 2025 07:40:24 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-391288b54cbsm243197f8f.28.2025.03.05.07.40.23 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 05 Mar 2025 07:40:24 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Paolo Bonzini , Richard Henderson , Pierrick Bouvier , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= Subject: [RFC PATCH 11/18] hw/mips/jazz: Replace TARGET_BIG_ENDIAN by legacy_binary_is_big_endian Date: Wed, 5 Mar 2025 16:39:21 +0100 Message-ID: <20250305153929.43687-12-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250305153929.43687-1-philmd@linaro.org> References: <20250305153929.43687-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=philmd@linaro.org; helo=mail-wr1-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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org For legacy binaries, legacy_binary_is_big_endian() is equivalent of the compile time TARGET_BIG_ENDIAN definition. Signed-off-by: Philippe Mathieu-Daudé --- hw/mips/jazz.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c index 1700c3765de..b6f7565f6c5 100644 --- a/hw/mips/jazz.c +++ b/hw/mips/jazz.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "qemu/datadir.h" +#include "qemu/legacy_binary_info.h" #include "hw/clock.h" #include "hw/mips/mips.h" #include "hw/intc/i8259.h" @@ -59,12 +60,6 @@ enum jazz_model_e { JAZZ_PICA61, }; -#if TARGET_BIG_ENDIAN -#define BIOS_FILENAME "mips_bios.bin" -#else -#define BIOS_FILENAME "mipsel_bios.bin" -#endif - static void main_cpu_reset(void *opaque) { MIPSCPU *cpu = opaque; @@ -120,7 +115,8 @@ static const MemoryRegionOps dma_dummy_ops = { }; static void mips_jazz_init_net(IOMMUMemoryRegion *rc4030_dma_mr, - DeviceState *rc4030, MemoryRegion *dp8393x_prom) + DeviceState *rc4030, MemoryRegion *dp8393x_prom, + bool is_big_endian) { DeviceState *dev; SysBusDevice *sysbus; @@ -136,7 +132,7 @@ static void mips_jazz_init_net(IOMMUMemoryRegion *rc4030_dma_mr, dev = qdev_new("dp8393x"); qdev_set_nic_properties(dev, nd); qdev_prop_set_uint8(dev, "it_shift", 2); - qdev_prop_set_bit(dev, "big_endian", TARGET_BIG_ENDIAN); + qdev_prop_set_bit(dev, "big_endian", is_big_endian); object_property_set_link(OBJECT(dev), "dma_mr", OBJECT(rc4030_dma_mr), &error_abort); sysbus = SYS_BUS_DEVICE(dev); @@ -194,6 +190,9 @@ static void mips_jazz_init(MachineState *machine, MemoryRegion *bios2 = g_new(MemoryRegion, 1); SysBusESPState *sysbus_esp; ESPState *esp; + bool is_big_endian = legacy_binary_is_big_endian(); + const char *default_bios_filename = is_big_endian ? "mips_bios.bin" + : "mipsel_bios.bin"; static const struct { unsigned freq_hz; unsigned pll_mult; @@ -212,8 +211,7 @@ static void mips_jazz_init(MachineState *machine, * ext_clk[jazz_model].pll_mult); /* init CPUs */ - cpu = mips_cpu_create_with_clock(machine->cpu_type, cpuclk, - TARGET_BIG_ENDIAN); + cpu = mips_cpu_create_with_clock(machine->cpu_type, cpuclk, is_big_endian); env = &cpu->env; qemu_register_reset(main_cpu_reset, cpu); @@ -245,7 +243,8 @@ static void mips_jazz_init(MachineState *machine, memory_region_add_subregion(address_space, 0xfff00000LL, bios2); /* load the BIOS image. */ - filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, machine->firmware ?: BIOS_FILENAME); + filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, machine->firmware + ?: default_bios_filename); if (filename) { bios_size = load_image_targphys(filename, 0xfff00000LL, MAGNUM_BIOS_SIZE); @@ -329,7 +328,7 @@ static void mips_jazz_init(MachineState *machine, } /* Network controller */ - mips_jazz_init_net(rc4030_dma_mr, rc4030, dp8393x_prom); + mips_jazz_init_net(rc4030_dma_mr, rc4030, dp8393x_prom, is_big_endian); /* SCSI adapter */ dev = qdev_new(TYPE_SYSBUS_ESP); From patchwork Wed Mar 5 15:39:22 2025 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: 870559 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp849250wrg; Wed, 5 Mar 2025 07:40:54 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCX3hrGEHYt0WRzeLc4gpLrDx40xYgNvn4TrCfPzJsvJ9OBGuiNg4TF3g3/+gJZi0XW5rhudxw==@linaro.org X-Google-Smtp-Source: AGHT+IHNCdlsd/SeQ/F9L5+rR+fGVNPBdmw8MGDio1UUAyVP5iqFyUkqmQzOKQZNeEUVJ83462lk X-Received: by 2002:a05:620a:8706:b0:7c0:a524:fb9c with SMTP id af79cd13be357-7c3d8f0a68fmr502266585a.47.1741189254106; Wed, 05 Mar 2025 07:40:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741189254; cv=none; d=google.com; s=arc-20240605; b=D9cgevIkH2Jy+1n6bSv+jSDlucD7d3jXOt9C7OuroWJvIvF5NlR13Z+qu7RGUGIK92 VM6pUgUYqTult20f7i3p1LOvS3jofpKCPMIWv8gYbPzshB0Ek/7KG8PYTMmgMQUc1tkt jJ/iYnTwdzZE+QoAYUCGnZIY1+iXA7fNnjGTCQrc3cSPpJuLLIkyaeECi82dAAK86ENl twdIyY8hZBog1HOQ97etGyUW+qoIufMj0mBBHoAikCasHJNnjO2xNucIAHfo9Yy+p94N i54+ZdH98/O2uEMkna5IZCgO5bHOPvb52NCb2AST3a1BNnVk9yPYNKW8hXzcALOV4O0W cr2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=KgCOVp2CKYNDhFT/FOf4qCf2zv7LZPk8S7w6YrhW+hs=; fh=iYS+U9AiAK/hVpJiag4U+eV/XPHIFc9y9I+tcL8yyYE=; b=lAGKIOywoX2c4z4bwb+weoHf+zhw7YKcsCAU9v+Is3KT0ncWlmh0He/qO84qio+9ez loOmMJHNbd0Y5l+J+U5dKrRvjbC7WwdcrmbW3It8s7b8YJk0uBtRQNBj5om8v7d0ynwO hTHQwS0PH5c2yw7EGMs+YaCwwgTWG6APP1jGPABqkaF/h61dkxTaxhypA3bzFK7UUScI 594L9wayPxb4hmGS5cWK2MkWMHtdXnAv6E+uEyq355/Q4LpL5sIH8W8XZNv5V5TVdSUF n3awbG6797YgYhC21qzb97tbTfKcxMqq2HT8TqIAoX0ADHW5Q0xhqtQWDchM1SpnnYq1 DBBA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=j7sga5Fm; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c3d1820cd3si304991085a.544.2025.03.05.07.40.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 05 Mar 2025 07:40:54 -0800 (PST) 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=j7sga5Fm; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpqrS-0000XI-Bu; Wed, 05 Mar 2025 10:40:42 -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 1tpqrJ-0000O0-Ee for qemu-devel@nongnu.org; Wed, 05 Mar 2025 10:40:37 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpqrH-0002ae-P0 for qemu-devel@nongnu.org; Wed, 05 Mar 2025 10:40:33 -0500 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-390e88caa4dso3527542f8f.1 for ; Wed, 05 Mar 2025 07:40:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741189229; x=1741794029; 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=KgCOVp2CKYNDhFT/FOf4qCf2zv7LZPk8S7w6YrhW+hs=; b=j7sga5FmOA/NLLKx7dHENpSFK5hx7TYNe0NF3wSZmNWc3ioKBQUD3gulMz4HZ0Ggdw dLF/nOEwuqivnG5yIe4+1Q9W4iWbHDx2odfVQaY4+7BSvFzWBYdVU1j2egXduLDgoeoI TBhxttXdEdMsz+4Xp1JxX7bsVlWi0qbZ9draeaDWZqAglYyoH6pDy5w1rnNlBNlwL5WR ShyumCkJtRc+QBmyR3uKy4dHvyLrjza5cLN83TcbwkONTHgEh1fp32m90ec8LA1CyiCY HwgkRdFMfb0LnIZvYvO9LMwZVfjeYTnPtsYJ7RIWdV7orzDw52kmc0Bb5FTJMYT1VswJ fuAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741189229; x=1741794029; 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=KgCOVp2CKYNDhFT/FOf4qCf2zv7LZPk8S7w6YrhW+hs=; b=jAl8noAItbU9inRrIdcDfOp5Rop8Dd6uPw21m+Jj9Ex/DBug2NfAnuToR7K5upfzKi gW6SmE/W8XcyJ4S/6qhuzMI4LeCZVLWelyXaQ1JQLwwuwSoTkpYTXbOjjARdcVYNC+cF 1mQ3q6yZXhiXhn78f9lr+9FNqnXfwAueDWWd1KCco0eIEgpVuUaDe9utecMNgSqrpVLv Xlz5FPssvvz8zN1PiuqNQEUf+J9tIHe4iaKOIH1E7PrgSjyFfi1MlSWI/IH/kpqm9jMz QmUAkNWz8uLQbspiQX4V1G9OhVmdAPbyU9SbGrP4aWxRwjOubLQduDFTMVxZa9DgIfN9 E2PA== X-Gm-Message-State: AOJu0YztKfnd6l1PvoQ0s9MnBbF6romZEL2OqrQMSYEaQt9rZWe36lLa xh81MdAnvbp3dkQQyWt0I23hl7dYbmLTdPeVeHwlMA6eswCyb0tpsAXF9CiGlj3V/+5NnD3v/fV hVLc= X-Gm-Gg: ASbGnctsxtCD9bDzEAUvPwDgCbrcfBqlW0GA6+Qz+laYCt7eShGJobf0EVCDSEZ0gdm puzhfpEjwZl9I7nJW2cUEyuChGDEFKZuueZIWOcgXa1swZU/34swfSnQxXuGeRvpEbN2nKD1t4V 2nh6+2EEdsL0KEqaaLxQf1GLyjjAZtc5wR2aqBIZXciXDUCf6M8ii5qYjdaa1vFR11mU19Ycd1B hulWiZHWEaOYdSHYs57L8wY7xWdS546xBMDVZb9ageqc3FqorQ+3mPQMryxGVqzyMZeUeC8YAr4 0qS7hVpqHYVnX6QPZguD5nuyi7+uKHvGPYieUyV2t9wYfgnXjwQEVkfE6NnBhkskHfF50LWGFTW 6Wv+S7JFVsdaccB2njeo= X-Received: by 2002:a5d:5984:0:b0:391:1f9:c59a with SMTP id ffacd0b85a97d-3911f7c4cf6mr2948440f8f.46.1741189229495; Wed, 05 Mar 2025 07:40:29 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390e47b6ceesm21094089f8f.45.2025.03.05.07.40.28 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 05 Mar 2025 07:40:29 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Paolo Bonzini , Richard Henderson , Pierrick Bouvier , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= Subject: [RFC PATCH 12/18] hw/mips/mipssim: Use legacy_binary_is_big_endian() Date: Wed, 5 Mar 2025 16:39:22 +0100 Message-ID: <20250305153929.43687-13-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250305153929.43687-1-philmd@linaro.org> References: <20250305153929.43687-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=philmd@linaro.org; helo=mail-wr1-x42f.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 For legacy binaries, legacy_binary_is_big_endian() is equivalent of the compile time TARGET_BIG_ENDIAN definition. Signed-off-by: Philippe Mathieu-Daudé --- hw/mips/mipssim.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/hw/mips/mipssim.c b/hw/mips/mipssim.c index f94dbdc428b..c0959a9e24f 100644 --- a/hw/mips/mipssim.c +++ b/hw/mips/mipssim.c @@ -47,12 +47,6 @@ #define BIOS_SIZE (4 * MiB) -#if TARGET_BIG_ENDIAN -#define BIOS_FILENAME "mips_bios.bin" -#else -#define BIOS_FILENAME "mipsel_bios.bin" -#endif - static struct _loaderparams { int ram_size; const char *kernel_filename; @@ -65,7 +59,7 @@ typedef struct ResetData { uint64_t vector; } ResetData; -static uint64_t load_kernel(void) +static uint64_t load_kernel(bool is_big_endian) { uint64_t entry, kernel_high, initrd_size; long kernel_size; @@ -75,7 +69,7 @@ static uint64_t load_kernel(void) cpu_mips_kseg0_to_phys, NULL, &entry, NULL, &kernel_high, NULL, - TARGET_BIG_ENDIAN ? ELFDATA2MSB : ELFDATA2LSB, + is_big_endian ? ELFDATA2MSB : ELFDATA2LSB, EM_MIPS, 1, 0); if (kernel_size < 0) { error_report("could not load kernel '%s': %s", @@ -153,14 +147,16 @@ mips_mipssim_init(MachineState *machine) CPUMIPSState *env; ResetData *reset_info; int bios_size; + bool is_big_endian = legacy_binary_is_big_endian(); + const char *default_bios_filename = is_big_endian ? "mips_bios.bin" + : "mipsel_bios.bin"; unsigned clock_hz = (legacy_binary_is_64bit() ? 6 : 12) * 1000 * 1000; cpuclk = clock_new(OBJECT(machine), "cpu-refclk"); clock_set_hz(cpuclk, clock_hz); /* Init CPUs. */ - cpu = mips_cpu_create_with_clock(machine->cpu_type, cpuclk, - TARGET_BIG_ENDIAN); + cpu = mips_cpu_create_with_clock(machine->cpu_type, cpuclk, is_big_endian); env = &cpu->env; reset_info = g_new0(ResetData, 1); @@ -177,7 +173,8 @@ mips_mipssim_init(MachineState *machine) /* Map the BIOS / boot exception handler. */ memory_region_add_subregion(address_space_mem, 0x1fc00000LL, bios); /* Load a BIOS / boot exception handler image. */ - filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, machine->firmware ?: BIOS_FILENAME); + filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, machine->firmware + ?: default_bios_filename); if (filename) { bios_size = load_image_targphys(filename, 0x1fc00000LL, BIOS_SIZE); g_free(filename); @@ -199,7 +196,7 @@ mips_mipssim_init(MachineState *machine) loaderparams.kernel_filename = kernel_filename; loaderparams.kernel_cmdline = kernel_cmdline; loaderparams.initrd_filename = initrd_filename; - reset_info->vector = load_kernel(); + reset_info->vector = load_kernel(is_big_endian); } /* Init CPU internal devices. */ From patchwork Wed Mar 5 15:39:23 2025 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: 870566 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp850077wrg; Wed, 5 Mar 2025 07:42:49 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCU+tdutESPF49k6LUqz9A62of8qRmz6sIgqnoudrG7QPK3peMc8iU7am4E/5A9ay4Qk87K4pQ==@linaro.org X-Google-Smtp-Source: AGHT+IHog40+yAQyf8FefiKZg2VQZeBVQXnwiKfUJbIG/6UqIwsGyoW5rrG2m2XZ7MYn63ObVApR X-Received: by 2002:ac8:5fcc:0:b0:474:bc66:a905 with SMTP id d75a77b69052e-4750b23c752mr53045551cf.4.1741189368719; Wed, 05 Mar 2025 07:42:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741189368; cv=none; d=google.com; s=arc-20240605; b=M/jzBwiJNs9awsqIQiV6Ldy8P1KtjVsMEwclwxNStJXJCZgOcIDEc9prZ0JyBEPCqR L70jLUj1t8JexNx16YEufmRauCrdpGOiRlyn79Zrf4pCucgLt6hmPzF186K6SWOxwzVf 1psvYVnvZC7U52dpO3XMoSbVc2FDDTeVLjxGTwR8LLTXBZ5hSohvu3c8IWeH3E2VOEhv qI7JzcsW4arTE4JVQYqiKOLVEOJzT5vLwopDV182rZsvp4hybC5VFAGmZTFH+6mNDvD2 /War5UdQu8/hbOeNLx/+Z7p9X1V7NUeOA4duIduKMYJj5e4erk0gPhPZEeAG/e8dVaUH pkOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=4OC+PlyCRZLGzf6tvLjkEgzmve3rRTU2dVEb5T9eDDQ=; fh=iYS+U9AiAK/hVpJiag4U+eV/XPHIFc9y9I+tcL8yyYE=; b=T9DLn0lx1dOf1pUyJLRc64t5DBXgH5GcQUGpGg99DpWL4NIBtHFHY/ZUE6oo6y9naQ GmHpBe4NM54Hcw/FFDeWX8FWbJD2M3TcN9EvzHYRuYpTNg73nZNcNwIYqIbJb1Ci5/lL F/hWVHXJToqZLhlIp9RAGrXlDdBgvW3LI26Iw8+GkOEvro0dehaFKetO338qNkx6jZD+ 924pAoFFm6NqPEqFNfBfyVvXwqpiB4uIHvpn84SNsYjeYb/zaQOOgx1VENIIWSng3/Je NDwvVMbtCrv5en21TdiTXgSUaFBtv8cwahsdl+7zwI0qPUwlAAHxLA5sDrufG/eIA0+J TocQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="b/YeO2v7"; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-4751939c056si1148771cf.557.2025.03.05.07.42.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 05 Mar 2025 07:42:48 -0800 (PST) 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="b/YeO2v7"; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpqrY-0000gV-By; Wed, 05 Mar 2025 10:40:49 -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 1tpqrP-0000SH-8p for qemu-devel@nongnu.org; Wed, 05 Mar 2025 10:40:39 -0500 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpqrN-0002bB-4A for qemu-devel@nongnu.org; Wed, 05 Mar 2025 10:40:38 -0500 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-43bcf9612f4so12976585e9.3 for ; Wed, 05 Mar 2025 07:40:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741189234; x=1741794034; 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=4OC+PlyCRZLGzf6tvLjkEgzmve3rRTU2dVEb5T9eDDQ=; b=b/YeO2v7VHhjdEkd4WJk0LoDvREN1xyR+DpQO+RT1HZLHfnEOT6vf0wXhIFBBqd9yp NjPymYt7vqzMdKB0D4UoDrxTW5xhbeEWiU79vfByrJs5v35NXo2wAHdO1K+UPfcD5nMM zfj9YAIbH6142/BLTFkFSxWBkw57OiVSJQNpl6X59XnwDOAfVJw0vauPiB4vHBGqaIhe o9Pgy2BL+WsEuUzFAmaa7MEWExnBnch+kWMUhaYcRh02ksyFex6N/lrmwJpO144qNoHE 4l0bNkFirOughwVxp/SOpmqYI03UmVuCmJ/IucEJkP7X1C9WkFpz3cb0zsMntkT33GD+ XQWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741189234; x=1741794034; 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=4OC+PlyCRZLGzf6tvLjkEgzmve3rRTU2dVEb5T9eDDQ=; b=QTkCUrW23UOF7qITgCkClLf7HNNinY5b6dFwkLCUzTUffZKn5/PJ/2kqxZQTwbOnRs xpoDCwI9ac657AJvCNqubXixe8nBRZ/Zo+rh7JGR7sLigLEwacct3s7wjx67QdYStQMe D8hSI3uwfH0/DsaHBq334IDn8J6GWI6UJJ7j4xSs7HuoS3seO6LCqfE/hQSdYPClQCcp wIS/B8S1CyueSPcLRHx/lEEGwhLq3rgN9Ofs/2QU4QV80FUCczSFf8ufIzMfREcKoXFu uzEcjwLEkJEcHDRhIpgtJSeVHw5n5kAGqqy/UMNCRdkX0YS9eDcF87SlXi1t/u7lIZTn S7gA== X-Gm-Message-State: AOJu0YyMq04fB1/QezhWLw6HJ7ZxkfbPBYuOIlShRzJ5Cv4FMCekeAPX RQcElSFJgWjIuHZgaFa+2DQA5v4sz4MnFnzFOUAxgTgdnclZsBLb90y1Wvmtk5xz6zRnEcHAu8l ZMxE= X-Gm-Gg: ASbGncsUnvXVPtJnXUkvmxWhousUnWEvUpk7hWhDxggysb8F164S4uKZPjrsRtdh2Wp tLsGt/iam6Tl6C7In/7HMW2b9qkLk6SOCK+jPyGioq+3Tk52loenaFglWOIE70M24gzWJ0v5Atl xGMh2mq1PMSyvPqD8r/+k2XhQrSDkiJG5DW9RZtbAwAxHbTxPHRVEp02gUNYHb+O/MxIKpeZldj n2fSZUqQmY0Rd61ym97urP0pJT2kLvnuZ7H/36f6ZdM40SEJrGzAvxM/0fSadzh0Kxn+MUi0BUf 5b2mJ1/bwRK0dcaCo1ll962OIQoeO+mb57DCZkJh3WszSQqY3kdxKQNs0jdgOlUwDuXOjbB+1SJ dQNRs7V6Qp6k0/tz9l/A= X-Received: by 2002:a05:600c:4f51:b0:439:92ca:f01b with SMTP id 5b1f17b1804b1-43bd29bb5f2mr24975095e9.13.1741189234128; Wed, 05 Mar 2025 07:40:34 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390e47a72d5sm21730622f8f.31.2025.03.05.07.40.33 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 05 Mar 2025 07:40:33 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Paolo Bonzini , Richard Henderson , Pierrick Bouvier , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= Subject: [RFC PATCH 13/18] hw/xtensa/sim: Replace TARGET_BIG_ENDIAN by legacy_binary_is_big_endian Date: Wed, 5 Mar 2025 16:39:23 +0100 Message-ID: <20250305153929.43687-14-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250305153929.43687-1-philmd@linaro.org> References: <20250305153929.43687-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.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 For legacy binaries, legacy_binary_is_big_endian() is equivalent of the compile time TARGET_BIG_ENDIAN definition. Signed-off-by: Philippe Mathieu-Daudé --- hw/xtensa/sim.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/xtensa/sim.c b/hw/xtensa/sim.c index 1cea29c66d4..cd7c6014c3b 100644 --- a/hw/xtensa/sim.c +++ b/hw/xtensa/sim.c @@ -26,6 +26,7 @@ */ #include "qemu/osdep.h" +#include "qemu/legacy_binary_info.h" #include "qapi/error.h" #include "system/reset.h" #include "system/system.h" @@ -101,7 +102,8 @@ void xtensa_sim_load_kernel(XtensaCPU *cpu, MachineState *machine) uint64_t elf_entry; int success = load_elf(kernel_filename, NULL, translate_phys_addr, cpu, &elf_entry, NULL, NULL, NULL, - TARGET_BIG_ENDIAN ? ELFDATA2MSB : ELFDATA2LSB, + legacy_binary_is_big_endian() ? ELFDATA2MSB + : ELFDATA2LSB, EM_XTENSA, 0, 0); if (success > 0) { From patchwork Wed Mar 5 15:39:24 2025 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: 870571 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp850435wrg; Wed, 5 Mar 2025 07:43:38 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXPGK4IWZbvOzB/bhfz/W2XnTn7ThEfqi2/8TiQ47SvCRkmErc3cfuP5mdIyH2kSYVLxLgrAw==@linaro.org X-Google-Smtp-Source: AGHT+IFElsBSQarWxTk9cg2imrZGkDei0D2xMc5O9xbMJuFyCZvrZ3cbYO9LP8ro/7xxsjtJwT6A X-Received: by 2002:a05:620a:6185:b0:7c0:a075:3d9b with SMTP id af79cd13be357-7c3d918cd65mr540958785a.13.1741189418544; Wed, 05 Mar 2025 07:43:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741189418; cv=none; d=google.com; s=arc-20240605; b=D2jhbavEo9vc7wWI22XJQZ2UtDgNIFPAOlDOmtL93eG67UsEPTlFGcT+UxmZY2IPzs IQfJu6O9FTHfyZQmC0C3y+Q0USLJ481yQDli8jOKG4hKJl9H1GhVY5ldbxwTU+DxaV46 QBUbJyoPHhD1IG5+NoHlQ6koxe/mjZDWenyhhs6dosprYyQyq+mzUGDmho+VyfGYA1n9 6hGYF8mudgwAyMvkt/UJ9DTWgfLiMCE2w6/lRnHZz/2dR2eSty1IAgsNrrrCieENglt3 n14uxp98Kip9nAdY5sa4kg8sP/M8+vVqW0Ll4KA8XxS9UmazvWRwsnjw4wCVYd9Ol3mX gQVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=6yTWsYV7yfcZRB8fKtcjLgcDtoMSuGOlcV0M3TYNzGI=; fh=iYS+U9AiAK/hVpJiag4U+eV/XPHIFc9y9I+tcL8yyYE=; b=kKK4fkcNp9JJGBp/2eUTZS3DpzlzMlzUCPJZDFifBs2RSB/zs4NmCB8CLfLhVZUlhq ZBkIc6/WzyRghT40yerOUUXJOPvGwWG+0vgbGABRQKkSE1t2tN5bVyu1EJle+PtPcLnS /FNteH73lDrinE0KyxeEuitTfkSwfKCti8lyAM5s15bZm1BpVRacOToaHvvdpENJiSAZ vHt2o33hawdM2qgQbTOLzgQnVBX4/awnkJdG18O3rSEPLSyV38zL3Regf3FfP8/UCShB xk2yiA/eXh2phpELkYIez4tI6lFT2vfsbOyIpqJfcPj/Yl0oExOb/NRo4ZwRUIxVmV+Y BTKw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UzoVL2na; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c3d6fc48a9si231824285a.162.2025.03.05.07.43.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 05 Mar 2025 07:43:38 -0800 (PST) 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=UzoVL2na; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpqra-0000lU-6P; Wed, 05 Mar 2025 10:40:50 -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 1tpqrU-0000de-1c for qemu-devel@nongnu.org; Wed, 05 Mar 2025 10:40:45 -0500 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 1tpqrR-0002bt-UR for qemu-devel@nongnu.org; Wed, 05 Mar 2025 10:40:43 -0500 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-390e3b3d432so4644332f8f.2 for ; Wed, 05 Mar 2025 07:40:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741189240; x=1741794040; 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=6yTWsYV7yfcZRB8fKtcjLgcDtoMSuGOlcV0M3TYNzGI=; b=UzoVL2nakmRGmzJfmGz7PMGX+0Wve3Dehhz5M9YBUVSscGVZdx6/gRbWOtpTusDIeI oi1RkVJVq9Xqo36CFpFjBTkw+LB8dpF8UDHNzm+crOwZ7qDq/Dvxc1BVoIggONOqoEpN tTa47bqh5yJ5TIYd6haTXT7WXK28HIgl+ORE0eQPunJKSWEAJG+zSvyg2Dh5q3IEz+TY cAoBgTHlIJ8BviFw3TjQSGPr+1ZD3L2xKKSC1b48Xb9m9qMbaChFPALTMPbMxbK6YNJ8 mdj5uyUG0gRgvfyWZzd+1YdWt1vhLwwGssYlwuqze9nizdz3kJb0spK8BBfBJdzTGv2D m0UA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741189240; x=1741794040; 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=6yTWsYV7yfcZRB8fKtcjLgcDtoMSuGOlcV0M3TYNzGI=; b=RH6PQhD1Q9lmHZ7Hn9fdCNn4I/mVyeo2KjBikHEJXM9MPC6yyctF++V8eV56sde/S5 DBNigjQIiY+dtnOZM9YtY694y8Vlb2Nkyf56Sb0oAvXdvr8tvIBJ8k2eEvzKVH/DUEZO DjhiIdn9a7TSK1rN912n4EzTGaq8kk0DNoApv4O1oKefCGudpdtZElc3qZEUB5A2QgSe r2usCMvX8SrdvSx6MgwAchjjcbxesxs11YMPRu8XNQ+2Ajo50MHFT9ivPpTkqdlo5mF2 dbl2wvAIn5yUEYUMvNOkg5j/3ziZW/gSHiszX4EEC3kUps5H5djkF9Mrd2aVsqJ8mhX8 /4kg== X-Gm-Message-State: AOJu0Yxw7YxIa8lEAlDCyKtJ1kcoYAgT2I1L3EdH8Tx5KbfNUcVAR11i Z97zUt+k1+185WJ2i5YGvr78aORlOlWsIIPwJB8VPRo5EW9mZo/XBSxTmFN2vK/EaUW8L85cVCR t630= X-Gm-Gg: ASbGncs30mW2wO3QCsTCvF42pbGjtRqQzyJwCxGhTRtO7vQn5sa4UznZibtl8puFWBN qhoH8xsHEvSr1qs37N4gOQa3098DISvjL7f1iSYMnuk4TcArH2v5Gy9wmSr0DXnreui5LWwGR2i 311+I9xCgteswqEJKwQlP4Z4SfoypOuDgKEbUv/fSKKmby79EIJaVu5WGMkAdsw9UXjiMFbAfbV 7YkVF2V4fUGB/m2UUyH17NuoSAdaQDL9OCZ9zsDP335NMkEhT824NG4HKgJ2b6OnkOZ21qewXjY ysdur9DVws1Intn4/x6hA10Gg5Ox51YZikBn6m3agGQzcZcGtbFwGU3kuTQCJSoNoIecTu3+cec nOYbwtEIghTI4YoAuBQU= X-Received: by 2002:a5d:64e9:0:b0:391:2192:ccd6 with SMTP id ffacd0b85a97d-3912192cd5fmr2461486f8f.39.1741189238864; Wed, 05 Mar 2025 07:40:38 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390e485d6dbsm21356258f8f.82.2025.03.05.07.40.37 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 05 Mar 2025 07:40:38 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Paolo Bonzini , Richard Henderson , Pierrick Bouvier , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= Subject: [RFC PATCH 14/18] hw/xtensa/xtfpga: Check endianness via legacy_binary_is_big_endian() Date: Wed, 5 Mar 2025 16:39:24 +0100 Message-ID: <20250305153929.43687-15-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250305153929.43687-1-philmd@linaro.org> References: <20250305153929.43687-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 For legacy binaries, legacy_binary_is_big_endian() is equivalent of the compile time TARGET_BIG_ENDIAN definition. Signed-off-by: Philippe Mathieu-Daudé --- hw/xtensa/xtfpga.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c index 3f3677f1c9a..7f0a849b795 100644 --- a/hw/xtensa/xtfpga.c +++ b/hw/xtensa/xtfpga.c @@ -27,6 +27,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" +#include "qemu/legacy_binary_info.h" #include "qapi/error.h" #include "cpu.h" #include "system/system.h" @@ -238,6 +239,7 @@ static void xtfpga_init(const XtfpgaBoardDesc *board, MachineState *machine) uint32_t freq = 10000000; int n; unsigned int smp_cpus = machine->smp.cpus; + bool is_big_endian = legacy_binary_is_big_endian(); if (smp_cpus > 1) { mx_pic = xtensa_mx_pic_init(31); @@ -311,7 +313,7 @@ static void xtfpga_init(const XtfpgaBoardDesc *board, MachineState *machine) dinfo = drive_get(IF_PFLASH, 0, 0); if (dinfo) { - flash = xtfpga_flash_init(system_io, board, dinfo, TARGET_BIG_ENDIAN); + flash = xtfpga_flash_init(system_io, board, dinfo, is_big_endian); } /* Use presence of kernel file name as 'boot from SRAM' switch. */ @@ -399,7 +401,7 @@ static void xtfpga_init(const XtfpgaBoardDesc *board, MachineState *machine) uint64_t elf_entry; int success = load_elf(kernel_filename, NULL, translate_phys_addr, cpu, &elf_entry, NULL, NULL, NULL, - TARGET_BIG_ENDIAN ? ELFDATA2MSB : ELFDATA2LSB, + is_big_endian ? ELFDATA2MSB : ELFDATA2LSB, EM_XTENSA, 0, 0); if (success > 0) { entry_point = elf_entry; @@ -437,9 +439,9 @@ static void xtfpga_init(const XtfpgaBoardDesc *board, MachineState *machine) 0x21, 0xfe, 0xff, /* l32r a2, entry_a2 */ 0xa0, 0x00, 0x00, /* jx a0 */ }; - const size_t boot_sz = TARGET_BIG_ENDIAN ? sizeof(boot_be) - : sizeof(boot_le); - uint8_t *boot = TARGET_BIG_ENDIAN ? boot_be : boot_le; + const size_t boot_sz = is_big_endian ? sizeof(boot_be) + : sizeof(boot_le); + uint8_t *boot = is_big_endian ? boot_be : boot_le; uint32_t entry_pc = tswap32(entry_point); uint32_t entry_a2 = tswap32(tagptr); From patchwork Wed Mar 5 15:39:25 2025 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: 870563 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp849575wrg; Wed, 5 Mar 2025 07:41:36 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUQ4E/V0npm2be9f/3ISMSPo8P+VLoKVW9+pEd+Y/Yz+rRa8cdLBPeCEWWxkvZfNqq5nTt15w==@linaro.org X-Google-Smtp-Source: AGHT+IGnVNF+k9J6wqfjiZ6AD6GtpnUjv1B0Vm0zASNcxp7fdzUkhA5ulPo8c8veDb1RzxGVtkiw X-Received: by 2002:a05:620a:6411:b0:7c3:bfb3:7f52 with SMTP id af79cd13be357-7c3d8ee1cbbmr518994985a.42.1741189296282; Wed, 05 Mar 2025 07:41:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741189296; cv=none; d=google.com; s=arc-20240605; b=aQgB7BixmrLv7MbN7m3juvgNfLv3fVHd5IF/2MDZZL+NQ2POsvIGKsmIRVDfjjX9yD mtkykDRSzqjrVGA7GfRRtRw1veCLsuoRvZEiF1316lUeiD9HZBGL8INu3mq3MiO453dD mpivzlt5aaKHxnOovNTtpAv7qLeDmMpAtOXH9no3WQ2HNDBIU26llpQRgpg6G/IQwxVf iQWdJwIZdCcHbciakSHVd7p/gppppjUBL6kO3uQ/IZsxAsT2RdVvMT7GThhnJzFMHFx7 gWCJi7FGDZ1cvs1nhhL+VrwHHEUcD54iGAFYzSfKb6dV0kX3VQ1acJICdRDDr+rteP5Z kLVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=zCLXy/6Jr/0dTWXwfCWT0ZtMvCFd8v9iNYIKh2Xds74=; fh=iYS+U9AiAK/hVpJiag4U+eV/XPHIFc9y9I+tcL8yyYE=; b=ExYqz7eYlBVOuoF6eNA+wwJ7t87lIJutmZKYMTg1jUolULBia0VqsWDAe65ai03gnX oARnMYrHURiScQyqktAxrwqH4rQmwdCP5zc6lO6PqDpU1S6epxCcpIDS0OXy4iHiVKeO GATelokY7J3CV+3WeUr545bBn6QDn6kafpCuVNv6YTN3U+Q1TBfZ208xBSJHrej9TN3f yck8POyBWVe8WTRORZmRVsdAJCEw7DuYkPtRONB6StRGJFy2aFYdeGIaccp43pHAm0wj UjsIeiAiDZ+YrjJ42Vdkse4/SdsgxFZkYl/EElU4XzUzW2GGeJqMd6tdIbdU7vSthZ2S En3w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LtHdewnI; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-474f9c99022si45578221cf.237.2025.03.05.07.41.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 05 Mar 2025 07:41:36 -0800 (PST) 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=LtHdewnI; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpqrc-0000qF-34; Wed, 05 Mar 2025 10:40:52 -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 1tpqrX-0000gU-KX for qemu-devel@nongnu.org; Wed, 05 Mar 2025 10:40:47 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpqrV-0002cR-P4 for qemu-devel@nongnu.org; Wed, 05 Mar 2025 10:40:47 -0500 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-438a39e659cso47730345e9.2 for ; Wed, 05 Mar 2025 07:40:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741189243; x=1741794043; 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=zCLXy/6Jr/0dTWXwfCWT0ZtMvCFd8v9iNYIKh2Xds74=; b=LtHdewnI0eoML0y3ophnI/8JLHRmlU2u4RiXzulKM7Ub9tKUgPGhuNDk+Y5m5lHWWI WKBqZgGkj+YQ+ynLkwUCdKmfnhMRMlWa1bm7uPxz80AjZbYKYp73l4HGZf0PQnS/s+kw pWxCbYaaw3ee2SQZA1Txw1fd9R6t271IWQDznALzY422SuX6sFJQKi+Vazz3913yMjEQ X1C2HA3pJYpEdAWYJVHvmyNJ7GIRjwOzUkCmLSJMyAJ51KC44WrOYDCYYCc1Edy91Hzr d91iU5GzO5t4nCp4HzBoeGaqZe5nP1th8cchz505wA+HahkLhRpZ1+0eGU91tEUqKtmc bJsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741189243; x=1741794043; 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=zCLXy/6Jr/0dTWXwfCWT0ZtMvCFd8v9iNYIKh2Xds74=; b=Tb7iDtH7wf5CcnpE4ASRlOXXsiEmtoJegWmPshC2+wDU2sN2qTQJxjZsFzdH2RDJMa Qe14kQLFwNvdSItguYu3TuT9LsYxQIIEspDhqu+zPmFD7/EicMZ/ft1XVjOn4wI0hC0p 8eMtzgu5NFmj4TkTxehWpb3gAIkrcM6/LZsz9/q/IxBS9ULKD8imbaiKd5hXjrRtRsIF U4g3JYFaz8wUgAxkN5GpfpZcDxZXu0KldssUCF0s5tCoGFulG56n7xFIzI6w3Et334XE Le5ATC6YyODk5QxAmvcT0LdGSXo1i0uiSif42UMwMpzM+lw6KwNnbFochHnxy1Qexu8X swOw== X-Gm-Message-State: AOJu0YwWWrvgtFuedPTTF8ywpFcjIYxmL0TmxGoQkPDdj0iy9y0mUhUQ fE4cZZj5IPlWoAMn0DfXc8dHoFy2cXKfaI41tykH3HNxVzeONvIi+rEsggDnPrKJBjmoM0Pvp/e U+nY= X-Gm-Gg: ASbGncuOppiHLDMbGdkv/VOZJAvGGPtqE8XLDjECq6yPQ6hKyBLadO1/8Qw3ouVLg47 vyGkyxiEkGvgcUt5giWReSkcy1PVi9GSg+IzdsKLtzM53SeqOJhQGCahTrh3C/UW0CTDyfWnbu2 C0jBtxVV4y+CpdfbM4Ym2aTmH5kxCfmxXZK/oUNIT/3BgYGTk0pbtApbFh/fHefIY3dw03F4OUF QqHo1lDpEHL+ZMiSOfTA0/hVtwEtmYKK+7xxzSKySanCG1WxRekzQjOdRi7P6oUzqvu+rtPPBsL 19+UVJSYDTT+gBwHfzmqldD5EAopaSHcIAL+cE0+fKm0lbbcZCHYAFk58tIXB798Vvz5x0xB+aJ OTzgz6pPPrQq9p/xW34A= X-Received: by 2002:a05:600c:4f06:b0:439:9f42:8652 with SMTP id 5b1f17b1804b1-43bd296df39mr27311485e9.17.1741189243554; Wed, 05 Mar 2025 07:40:43 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39118753933sm5479088f8f.48.2025.03.05.07.40.42 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 05 Mar 2025 07:40:43 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Paolo Bonzini , Richard Henderson , Pierrick Bouvier , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= Subject: [RFC PATCH 15/18] hw/microblaze/petalogix_ml605_mmu: Use legacy_binary_is_big_endian() Date: Wed, 5 Mar 2025 16:39:25 +0100 Message-ID: <20250305153929.43687-16-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250305153929.43687-1-philmd@linaro.org> References: <20250305153929.43687-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=philmd@linaro.org; helo=mail-wm1-x329.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 For legacy binaries, legacy_binary_is_big_endian() is equivalent of the compile time TARGET_BIG_ENDIAN definition. Signed-off-by: Philippe Mathieu-Daudé --- hw/microblaze/petalogix_ml605_mmu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c index 21ad215e442..f324a863772 100644 --- a/hw/microblaze/petalogix_ml605_mmu.c +++ b/hw/microblaze/petalogix_ml605_mmu.c @@ -27,6 +27,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" +#include "qemu/legacy_binary_info.h" #include "qapi/error.h" #include "cpu.h" #include "hw/sysbus.h" @@ -80,8 +81,7 @@ petalogix_ml605_init(MachineState *machine) MemoryRegion *phys_lmb_bram = g_new(MemoryRegion, 1); MemoryRegion *phys_ram = g_new(MemoryRegion, 1); qemu_irq irq[32]; - EndianMode endianness = TARGET_BIG_ENDIAN ? ENDIAN_MODE_BIG - : ENDIAN_MODE_LITTLE; + EndianMode endianness = legacy_binary_endianness(); /* init CPUs */ cpu = MICROBLAZE_CPU(object_new(TYPE_MICROBLAZE_CPU)); From patchwork Wed Mar 5 15:39:26 2025 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: 870570 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp850249wrg; Wed, 5 Mar 2025 07:43:10 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXulT72ORUk8iyN5EN6TZSglm1FNJ6YOmFdDv9uvXAmm3aN09E2WLQjqGgPKyXLlr5ptIjEYw==@linaro.org X-Google-Smtp-Source: AGHT+IH3PmZ4xXBC0kelJzyof7OPBUnRexeOPGBcRu3yVxRVqMIn8tTB/9dOip5r96GyAIEfPEpV X-Received: by 2002:a05:620a:8706:b0:7c3:c1df:149a with SMTP id af79cd13be357-7c3d8ec7c89mr484206185a.46.1741189389932; Wed, 05 Mar 2025 07:43:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741189389; cv=none; d=google.com; s=arc-20240605; b=WH0DvOdhgQCMMv6QimvXCoIwuqdjNBaGdsg134GAzXa8sV30ZvY9pL7vyrMeWrZQyt 7SihUReK9UvIJwkpzO7BpoZ3wsfeeFVR9Ey3nH25o+oReiKz4RlP+ZMXl+8XaYw8rNEP y0CMteAE6+hzjpugFBH60I8lYLsYMTeUAG5jP7OfbTOZ1KwwKDPTj3q15aXdJVbGaUUP gGLN5vT+RFyxc0JXHXWqHfItSvd4gA/EX/81x+ISr91BsVWKgWauW3okiWEDQf9xZb2v 2qJZLzMVVK3g646JkV+hlSpHK2EeZCHJ/18iTslBN4T2A+9hkHwEn9MZC7q3v27urAW4 eu+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=+vtQIxIHxpXveYUhgNWWXCgOpU/U9ptA2e3UaY3frqU=; fh=iYS+U9AiAK/hVpJiag4U+eV/XPHIFc9y9I+tcL8yyYE=; b=VC7nIEIBvOAl2/tUmZojpFm1pAbI4I/nHGVIvifrM/NOPcWloezM9AuH18mTjpebOc 7yc73PYUZX0Do59J5NNUtcZJA6kRxRXcJYV2roS+BDcaUthAQHUeRdNShbJT0lQgBgqF KUWXSRADMgTKZex4y1QAjesyyju9NcALnp+gTSfr8/y+t+SxlHxWNium/xtQqt/GlLjc eS3FU1wPLZ8YtT5MfikDcwcK75YhrWaIClirr9HSLSfBPRMvbgXcKFo7C8T8o766bMEH LmjUrsc1CTDSKNVzcLkJBzLkTYTpKlUQGiTbEL/0yjEAM6r/FuFI3Z+Qlqcj3E2ZgbFT ZDMw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ev19cYtP; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c3df94026dsi73285685a.385.2025.03.05.07.43.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 05 Mar 2025 07:43:09 -0800 (PST) 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=Ev19cYtP; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpqrm-00018L-Ka; Wed, 05 Mar 2025 10:41:02 -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 1tpqrc-0000qe-2E for qemu-devel@nongnu.org; Wed, 05 Mar 2025 10:40:52 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpqra-0002cu-3T for qemu-devel@nongnu.org; Wed, 05 Mar 2025 10:40:51 -0500 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-43bc48ff815so6925465e9.0 for ; Wed, 05 Mar 2025 07:40:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741189248; x=1741794048; 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=+vtQIxIHxpXveYUhgNWWXCgOpU/U9ptA2e3UaY3frqU=; b=Ev19cYtPzA4UrckDtxwZJjqeKKN95r12kjAydAWAdn9FidWY2fK9Jln7WzibXFEgts ylK/vfovFDFu/V/foL7KFSoOX3BrgoRpZfNhhyHegRjOohCBb7PHypgCAr5buuEMYZFZ rNUusQudXXIFjcpRMTcdReaBN53F9kt/P1MBfm8IlMKW1cva17g5yaSfH9TwcAockSRA I3womS+vttfK/G08TkeaRHi8/a+GsMaZptrI63y3cKluBKNblVQ75JpfGyRIJhAAfeEu ZgKX2BAihtqMcGxtkaf6DcHMw8e+8Cj77QsokAGpmaPOpVV1wFUlhChRBvdfncioI274 caWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741189248; x=1741794048; 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=+vtQIxIHxpXveYUhgNWWXCgOpU/U9ptA2e3UaY3frqU=; b=EVyCkdNxwJY8C6xDXLanxs7WuMJUeOjDhWB93H2PHOQJR0wig7zsCEL001rEWIoNoR E7tGc7qKFVFmQjkU5Gl7LnvFJFyxnOaANPeRctwPSMphEqeXJkAHy31ptnX5Yoz6h7vL 6eS13hrEb5+JSa6o6YKEmDr1Ba1dDhf7zt4YrMbLCD2RgcAv8sjqGvWdpQ/eKDpHAP/t zDME+Ph8U2p5NzoE9UFaLCML3d8+zdM4y627WBb3JWd5YTKajWED4/Di2M8M51kgb0Nq lWzDtoJ7iSpt8bZs5ZgpHSfiJKZMPGURW74A1Lsuh2/6HwxSwtwzCcjZ8+xf8t4RSU0H oGcg== X-Gm-Message-State: AOJu0YzGOLe68J85HnRN2GPUllSqR2efY3W9QVKxbaPpHWu/gEcPC/nH LbZf05ekNaxc8usWrSTU6LKRQ1WD/WFdS63+jo6Dva6PxbLOuAyupnsB5ncu5S6g+XdbyOzpXCU r9Hg= X-Gm-Gg: ASbGncuVRjf8mfZehSv1BS8C7BzN6SU1U30EVpdVP7kbS6j9Q/etxuxD9gtls9QKyi+ I5EUknHqkKTP2P4EzchSiQLnbka+yUFnmlTRVO9tkV42+aMPHLX4hhXRHVVYOIXSBCpxndlxnON UvK7DqH7upnB/Uy0IB59uClK7BP9f4FzqUYhv8PuTbQZDWnq09bJTidKvpSLJZrT8ZZgRKp7myK zlCdiHT19675oXKbxVExtIKxJ/rbKimZEBTOixYg/3b1zNkEkbCgq4bcnATIDOtQSK+pyecwKX4 Ct8ncIN+qoAZVHkLFrNU3OYoVqqU5fq7exAbiHZM4AhNNL45UiKxFntenZ5eFimxjrQPIdVnbFF Gu6dSa342jdYTLKmGT2k= X-Received: by 2002:a05:600c:470e:b0:439:9434:4f3b with SMTP id 5b1f17b1804b1-43bd20ba1c7mr28944025e9.8.1741189248150; Wed, 05 Mar 2025 07:40:48 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43bd6530fd6sm14836865e9.6.2025.03.05.07.40.47 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 05 Mar 2025 07:40:47 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Paolo Bonzini , Richard Henderson , Pierrick Bouvier , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= Subject: [RFC PATCH 16/18] hw/microblaze/petalogix_s3adsp1800_mmu: Use legacy_binary_is_big_endian Date: Wed, 5 Mar 2025 16:39:26 +0100 Message-ID: <20250305153929.43687-17-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250305153929.43687-1-philmd@linaro.org> References: <20250305153929.43687-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.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 For legacy binaries, legacy_binary_is_big_endian() is equivalent of the compile time TARGET_BIG_ENDIAN definition. Signed-off-by: Philippe Mathieu-Daudé --- hw/microblaze/petalogix_s3adsp1800_mmu.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petalogix_s3adsp1800_mmu.c index bdba2006b72..12d4d6c336f 100644 --- a/hw/microblaze/petalogix_s3adsp1800_mmu.c +++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" +#include "qemu/legacy_binary_info.h" #include "qapi/error.h" #include "cpu.h" #include "hw/sysbus.h" @@ -71,13 +72,12 @@ petalogix_s3adsp1800_init(MachineState *machine) MemoryRegion *phys_ram = g_new(MemoryRegion, 1); qemu_irq irq[32]; MemoryRegion *sysmem = get_system_memory(); - EndianMode endianness = TARGET_BIG_ENDIAN ? ENDIAN_MODE_BIG - : ENDIAN_MODE_LITTLE; + EndianMode endianness = legacy_binary_endianness(); cpu = MICROBLAZE_CPU(object_new(TYPE_MICROBLAZE_CPU)); object_property_set_str(OBJECT(cpu), "version", "7.10.d", &error_abort); object_property_set_bool(OBJECT(cpu), "little-endian", - !TARGET_BIG_ENDIAN, &error_abort); + endianness == ENDIAN_MODE_LITTLE, &error_abort); qdev_realize(DEVICE(cpu), NULL, &error_abort); /* Attach emulated BRAM through the LMB. */ @@ -135,7 +135,8 @@ petalogix_s3adsp1800_init(MachineState *machine) create_unimplemented_device("xps_gpio", GPIO_BASEADDR, 0x10000); - microblaze_load_kernel(cpu, !TARGET_BIG_ENDIAN, ddr_base, ram_size, + microblaze_load_kernel(cpu, endianness == ENDIAN_MODE_LITTLE, + ddr_base, ram_size, machine->initrd_filename, BINARY_DEVICE_TREE_FILE, NULL); @@ -145,7 +146,9 @@ static void petalogix_s3adsp1800_machine_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); - mc->desc = "PetaLogix linux refdesign for xilinx Spartan 3ADSP1800"; + mc->desc = legacy_binary_endianness() == ENDIAN_MODE_LITTLE + ? "PetaLogix linux refdesign for xilinx Spartan 3ADSP1800 (little endian)" + : "PetaLogix linux refdesign for xilinx Spartan 3ADSP1800 (big endian)"; mc->init = petalogix_s3adsp1800_init; mc->is_default = true; } From patchwork Wed Mar 5 15:39:27 2025 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: 870567 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp850081wrg; Wed, 5 Mar 2025 07:42:49 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUBBiw5kRm3hYQ7pG0Rj8rYoul/j3bfENRnZ5IMiPuJk8K3zr7AP834QbT4odTsux7VR5HG7g==@linaro.org X-Google-Smtp-Source: AGHT+IFT9+mP+63uPElwivGZooOf3g8uCPuLEuHochFftwsQIojy4rTiGq2xqVRTv0tv86lhz4gp X-Received: by 2002:a05:6214:c8c:b0:6e8:9526:5788 with SMTP id 6a1803df08f44-6e8e6c8cc8emr45139616d6.0.1741189369163; Wed, 05 Mar 2025 07:42:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741189369; cv=none; d=google.com; s=arc-20240605; b=O9d5nM6YQJTuN5Sipav+RSx1dx0Cmk0EdV0UPIFFBVr8ZYJp/lrswYnh1PkZWZaPY5 T5mZ3RNxI4lswRWMaH/3EDBMD+P42Ouq+3cJaRcH9ZAYPHUOTVbyQ4yavYt0hB/3uQe7 Ei88dZC1tA1ZNSm51JPxKnhv6jDe+K4qMqOOPQQnH5TfZ1jxapln7SoDG8AcZsFYb/yI sq8V2duzSIET/MufnM0NYK/K8jqCumLEPqTHz2Kn3NXBmXZgkL+pEKUrZzKtEEZRwlpo loeorWLZfT/cwRFNtieAPBRYijLtYSW3WUSFmtsrY+N0hmupfbKRtsAj0K9K8xzapT7t 7TEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=SAe89AKUiv2OCh4O9g61YeTeEn2jUwLCWPqWxHhFQsc=; fh=iYS+U9AiAK/hVpJiag4U+eV/XPHIFc9y9I+tcL8yyYE=; b=a/C5nHKsTKsN4KdkUeUhV0NLmcQ9Ese4CNtSWY7CkVz0/CBzZme5BXCf0tOXmtVW2Q 1RMimmh0BzeoH9F8U0LpRpAe+zM+KUjB6SsNSxsGb4qGoDfx3kuy/zsiH1C7OUNJ58xR DZqPc6yOwO3o8meRYYKg3o4hPGLRIgm75J37lagXfBsBlVh/vcDz0CxOYmjimHi+SRQK e/tVSVnnTaSgjAwGzs7fjaKyqG5KKrAWWgSmtJhqy1DYhzdhs1rzoUg2bAMZiuVtcOJ+ ZMFx8cRAk6ixBUXtlW9QR582hpg3ePB+49u5dHJNjqDUuENld9RqLW3RB/+GukgszmcE wbOg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=uOrrI5kE; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6e897701327si126891266d6.455.2025.03.05.07.42.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 05 Mar 2025 07:42:49 -0800 (PST) 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=uOrrI5kE; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpqro-0001FK-Un; Wed, 05 Mar 2025 10:41:05 -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 1tpqrg-0000wH-Kn for qemu-devel@nongnu.org; Wed, 05 Mar 2025 10:40:58 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpqre-0002dd-M6 for qemu-devel@nongnu.org; Wed, 05 Mar 2025 10:40:56 -0500 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-38dcac27bcbso689623f8f.0 for ; Wed, 05 Mar 2025 07:40:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741189253; x=1741794053; 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=SAe89AKUiv2OCh4O9g61YeTeEn2jUwLCWPqWxHhFQsc=; b=uOrrI5kECw3Wm8T2q5n91gWwkzWdyDjyhQNLEp9ewsm7O+/k4lkmq71+5O2W/gtAsi tyY8EQBQo/LJ/bJJ/YCc7cbldn4ED/2wX05dFYQI2Cf9WYVmbX3beowP2JUs2xfvXMBs nIcDksmkdofqNvLL12wyeRbxlNkjPbZkaRbHgtFNBs1xVouET4hjtr1DY2B2vA+xFPM4 6UbJYXvKJc04o4YRbbA4lsp+cLfS1sGfJABulUuGC/H+p7ubvjQwwxSHHzt0mfUn7eOQ tTv44ZkjGa5xFGN6yVMooWMkx/dAafDlPrCESMsctL9Gr/h3XAPQbVj4l3npAKD4fgZS oreg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741189253; x=1741794053; 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=SAe89AKUiv2OCh4O9g61YeTeEn2jUwLCWPqWxHhFQsc=; b=SgBlc4KiIR+28ugJrIY5U4K9Hd6by5H9ImraeAgAmZE57d1TN462GKWbBRtgWgpWIl aRelrSzEgh3ge9rfA2aWpazkSPQDHfpmwf5gcH8U01EOtJ7g0q07TxjmYF+2QYK3007A FnnfJltykTCPseGN1Ve7gq6ONO/2oExZ1xhWaFeOlgsrE1wKYllN+xqpJ+EKFf2e5/C1 H6Z2N+iBdKMiwMrUbJIEixbKRdO7YaXEofeJxIUIX01LYNIyLcSeCCBrCA/NttcXdg8q uONB5ZaM8PaFN5Il9KSQ5uQMlJBUgbSZUpV36H25vM9cdMAWKgVqMNyA0Zv6BXkeKYnu zDBg== X-Gm-Message-State: AOJu0YzW8zhnyMepl2t3pK5tsOXcI9w8c28e+/VemktzgyNRc0HPJHkI Qr6b9mosB9nCJRJvdJeMH6fVpFKa9nXpmMbpoFQLd+7R41aWC45k+8e4yv9DGYuvz+wXi0zKtSh z+0Y= X-Gm-Gg: ASbGncsKEpoP+Gsq8GOYgaRE7V3Y6DbHZ1oiuwW+9e+VYNPKeqy7ZTWcipiROBnq3HR kPQz7vk4dY9mjdgxVclf9mdY+NkJlZ15gzmq8+mAeePxh1WXtja1ETNPOFEA1J/uQ4RZ3wFPhAF zfjYouwOxcOqf/AlGJuUuqd//3e4VEmBghYDXkBhQGPvcmxtTooip8xrIxCKHi0pftVQN7d2iiY R0pK6ZcLLHa/q/9j6c7InuyXH5WVaVROybamcd9hOqnzNKqaaPVLzOSd/PV81xcM4s5oQZMf4JQ nm7V7W3BAwpZIhuq8ldTd8wXNGM2TbM0XWcCck64Dwx59lRPpBeViGFUNPIthRfI6WlHgYecHXX 3zNe26RMVnN3S+aB0N9g= X-Received: by 2002:a5d:6c62:0:b0:390:e9ee:f27a with SMTP id ffacd0b85a97d-3911ea54ab8mr2711232f8f.28.1741189252778; Wed, 05 Mar 2025 07:40:52 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390e47a7473sm21707201f8f.38.2025.03.05.07.40.51 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 05 Mar 2025 07:40:52 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Paolo Bonzini , Richard Henderson , Pierrick Bouvier , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= Subject: [RFC PATCH 17/18] meson: Allow symlinking system emulation binaries Date: Wed, 5 Mar 2025 16:39:27 +0100 Message-ID: <20250305153929.43687-18-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250305153929.43687-1-philmd@linaro.org> References: <20250305153929.43687-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=philmd@linaro.org; helo=mail-wr1-x42e.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 The 'legacy binary' API allows checking target specific features at runtime by comparing the argv[0] binary name. Add few lines to easily symlink indentical targets (see next commit). Signed-off-by: Philippe Mathieu-Daudé --- This is ugly meson, but the point is to show a prototype. One problem is we can not run 'make check-$suite-$target' anymore :( --- meson.build | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/meson.build b/meson.build index e4ede6ba06f..c2b7ec57739 100644 --- a/meson.build +++ b/meson.build @@ -3251,6 +3251,9 @@ host_kconfig = \ ignored = [ 'TARGET_XML_FILES', 'TARGET_ABI_DIR', 'TARGET_ARCH' ] +aliased_targets = [] +aliased_target = {} + default_targets = 'CONFIG_DEFAULT_TARGETS' in config_host actual_target_dirs = [] fdt_required = [] @@ -3273,6 +3276,9 @@ foreach target : target_dirs endif config_target += { 'CONFIG_BSD_USER': 'y' } elif target.endswith('softmmu') + if config_target['TARGET_NAME'] in aliased_targets + continue + endif config_target += { 'CONFIG_SYSTEM_ONLY': 'y' } config_target += { 'CONFIG_SOFTMMU': 'y' } endif @@ -4307,6 +4313,16 @@ foreach target : target_dirs link_args: link_args, win_subsystem: exe['win_subsystem']) + if target_name in aliased_target + exe_alias = 'qemu-system-' + aliased_target[target_name] + emulators += {exe_alias : custom_target(exe_alias, + input: [emulator], + output: exe_alias, + command: ['ln', '-f', '@INPUT@', '@OUTPUT@'], + install : true, + install_dir : get_option('bindir'))} + endif + if host_os == 'darwin' icon = 'pc-bios/qemu.rsrc' build_input = [emulator, files(icon)] From patchwork Wed Mar 5 15:39:28 2025 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: 870572 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp850606wrg; Wed, 5 Mar 2025 07:44:02 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXd750IU8aqPBP2FhSMkghU0jSUt9DFow/ID9rTIiUoCxX32tDRepUYnsEblf6VeTYO96c0fQ==@linaro.org X-Google-Smtp-Source: AGHT+IECJt84OTJr8hA+pVTYIkenaI2ssarpmOJIYub+c8GqUaJFtwwMeXbZvUV121L1KKClnN5H X-Received: by 2002:a05:620a:1d01:b0:7c0:7c8f:c3a9 with SMTP id af79cd13be357-7c3d8e4643cmr563591885a.1.1741189441768; Wed, 05 Mar 2025 07:44:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741189441; cv=none; d=google.com; s=arc-20240605; b=B4KWJYap2A0pOitU8E6GOgBXR4f/Gr4I1eD+v4i0l2BOTIwgk8pjs05xG4fkK1O2YP Mc+oAajSnj/NjZgoyeeYTMkX5tx+Tf/U2KMEO3rTWvvioaVe0paWwKt07rhF6QJ7nETo 6ikhJ/Xw4ZSGVtB5CfFVwLJF1QQpYJQEoibZGfVDmXnW+cFwjWCH23e0wlJjOu5TkG43 dCBo5TZTWTvmyV9fPX2bhkDib9tW31Z7VzMVc4/B3e8lc9DGPMUg4+ElB0f7DSnX4gEL Z3usDK9v+dpM1T5LSC1//sV2uvDFA7rxScM80bb/59RSztkZk6o+XzTYpUOxw3mXpVIr AKBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=fyaw8diXz251XjYJL/kNHyvPJKVoVonVHEPK8PU5vpE=; fh=iYS+U9AiAK/hVpJiag4U+eV/XPHIFc9y9I+tcL8yyYE=; b=dT/5gpKpR5gsavQoVyaGekSDqQ/fRDyOriECIZHQAl5cMmDKwNxOLSSf1GReOFSwPA e3AnhLhqizQsEuuLqYh14EnUKP5OZlfOlSJMMls/nY2WM3LZOhHDDkTjPHezh0Jz8Bjr wsqgUnejdRpBhQWSCX9dhc4+twsC1Y+HfowSK4RSa+ijEfq7cx1QDnAZG87bU6FfmO3+ t7fDc+ISC4X9m1M56g1ePD4czz3wjrjSPRK4KRzunfwdFaDX4WPy5YZQbTi3LXUnVeCY Grbk5GmC3rIqZQPSQ0YEWyUV393Z9l0yNWIKiDBO42AUA6sf6WR+muLlVJay1IxpkYhz XGhg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=flmxNWm5; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c3b7345ba6si671287485a.621.2025.03.05.07.44.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 05 Mar 2025 07:44:01 -0800 (PST) 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=flmxNWm5; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpqrs-0001eV-TR; Wed, 05 Mar 2025 10:41:08 -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 1tpqrk-00013S-Vi for qemu-devel@nongnu.org; Wed, 05 Mar 2025 10:41:01 -0500 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 1tpqrj-0002e4-5d for qemu-devel@nongnu.org; Wed, 05 Mar 2025 10:41:00 -0500 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-39129017bbbso23467f8f.1 for ; Wed, 05 Mar 2025 07:40:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741189257; x=1741794057; 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=fyaw8diXz251XjYJL/kNHyvPJKVoVonVHEPK8PU5vpE=; b=flmxNWm5zDF+PZN4QDUAR8lYtofcn9/TrInFQ/m9k8lAGseQohnJnFur0eN66f01v6 DWnw3nVD+wNTORLiCscF7Rf6m93H73qHQVQT+cns0yq8IlzC8Ask1xQf7rZzLF3Y0ngX wBbeZn5QZjTMZ0hyP9T23xpW1XbSghuxLlmUdW/CmQAskPrSl0rVqtZXZEVigQf7CreV 47l+kT2EjncfopbVLBE8pSS0A1O3PcdSKfBzxkicZS7YVARe+uzPBKx1au2/6u97peNA nH7Ryx55r1mxcmbjDoWf3sKsrMLJPOjJ9sqbY57sL6L1O3JzotIvOSZadLVOtfEIpvnh q20Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741189257; x=1741794057; 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=fyaw8diXz251XjYJL/kNHyvPJKVoVonVHEPK8PU5vpE=; b=Rc2+JUYZkZvZqdy/irjLgl/t7JGEYs2lQAwsl+3PRktTpFO9Jm2CFKIoi8H66QoM6V c2S198PmtszNk7FUTtLvExXP3kIju3AeGE1ohOhWFyfnlX/4tR6RSMmxSsNCz9cd7WJx 6Zk9QU+tRV47ji5+yLleUquEqm2O0orTrec1DPxnNptfBEoinuNTXZ0pjF+2bmfRkPDE acdleAolF+lVqKGBweLDSW8JQoXNE6GfFdoLRLLEq1pSO8JG6Cioa3ijtNSEGTgKrTJI FpGPRuC4sMREEhSpMvtqM4NTGDPDmHDlgS+DunzSCFbRb470WtcPyiru0Zb2pow0ULV4 Z6HQ== X-Gm-Message-State: AOJu0Yy2Pj4yV+M7rLCK9yQwe05hSKIGYm6HT06meYr7ie0ZRvVUMW2y tG9lffSLG6ok9J2b9yOiFpkCZzQwimfzYLZGBHQWIQYGGBLW+f3pNlg04cYT2zdDA3xZZ6gl5hP uD6M= X-Gm-Gg: ASbGncsk/hCVXJiG+kKrJFo2l0VvuAwE67DZvZxy0VHdH8y/tRoBDSxYwXd9kao5rvt gGJZLYfmJunMbB31DlGToiEU1H132XgzHpjZGgut1LuZs7ImymX2PoRR1WWdxiKAwpkF5lfOOGG Yk7B9rn3OU7zHFydRhYVyaudbGkaNL3KsXvVAur/LALeJ3qhGfJw5aKtl9etI0R5hjk+SHJfHYr cXJ++A3sk1xu1/TWfBRdQQ5h4a1c4FJDV3Et/ZUhlJ8XNKrei06oKKBopilJAEC6Rb4urrtJO3w Hn/dDaSiIU0Q83ZFkzLwErqJFeaApzPn1Bf6R90nZjj5dQXKp1K8ibtDdwHYn041/8f5eB96tzi 6Fl//gpa2Nh16AGePygc= X-Received: by 2002:a05:6000:1788:b0:390:f9d0:5e3 with SMTP id ffacd0b85a97d-3911f72632cmr2691115f8f.1.1741189257450; Wed, 05 Mar 2025 07:40:57 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-391212eb81esm2396309f8f.9.2025.03.05.07.40.56 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 05 Mar 2025 07:40:57 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Paolo Bonzini , Richard Henderson , Pierrick Bouvier , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= Subject: [RFC PATCH 18/18] configs/targets: Merge qemu-system-microblaze{el} binaries Date: Wed, 5 Mar 2025 16:39:28 +0100 Message-ID: <20250305153929.43687-19-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250305153929.43687-1-philmd@linaro.org> References: <20250305153929.43687-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 qemu-system-microblaze and qemu-system-microblazeel binaries are functionally equivalent (except the default endianness). By using legacy_binary_is_big_endian() to get the binary endianness at runtime, we can merge both binaries (using a symlink). Signed-off-by: Philippe Mathieu-Daudé --- configs/targets/microblazeel-softmmu.mak | 8 -------- meson.build | 4 ++-- 2 files changed, 2 insertions(+), 10 deletions(-) delete mode 100644 configs/targets/microblazeel-softmmu.mak diff --git a/configs/targets/microblazeel-softmmu.mak b/configs/targets/microblazeel-softmmu.mak deleted file mode 100644 index 52cdeae1a28..00000000000 --- a/configs/targets/microblazeel-softmmu.mak +++ /dev/null @@ -1,8 +0,0 @@ -TARGET_ARCH=microblaze -TARGET_SUPPORTS_MTTCG=y -# needed by boot.c -TARGET_NEED_FDT=y -TARGET_XML_FILES=gdb-xml/microblaze-core.xml gdb-xml/microblaze-stack-protect.xml -# System mode can address up to 64 bits via lea/sea instructions. -# TODO: These bypass the mmu, so we could emulate these differently. -TARGET_LONG_BITS=64 diff --git a/meson.build b/meson.build index c2b7ec57739..46f97b1b7a7 100644 --- a/meson.build +++ b/meson.build @@ -3251,8 +3251,8 @@ host_kconfig = \ ignored = [ 'TARGET_XML_FILES', 'TARGET_ABI_DIR', 'TARGET_ARCH' ] -aliased_targets = [] -aliased_target = {} +aliased_targets = ['microblazeel'] +aliased_target = {'microblaze': 'microblazeel'} default_targets = 'CONFIG_DEFAULT_TARGETS' in config_host actual_target_dirs = []