From nobody Wed Apr 2 13:16:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1741189221; cv=none; d=zohomail.com; s=zohoarc; b=VIG42/SpugpfVvT5LZE4ElTGFqhiXcVUNmh0n9wqaqww7gW09FLlYBMN0L5DO9988ZvgKHJ+3bjJPMugrh6tuFu4icFYmxXOoIBCQ+V2j7ZTVAnLDOiRoAGEkSOCqyVudlKOyVByTKpMJ3Z3T8dJUvFhdW7u+kDDsiVUm4+bMu4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1741189221; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=A2FkBxorOu2f4P3hJ5OavZpNo+Kja/eoTDhM7V1YPN0=; b=YeY+hFM6/fMEo0MgFGXaIPk3UTvhI6mf1K2z/lc/0m25fmV5xUXGOTX4m82AinzOISvIeJ/qNcDUqU7jc6xFRVxbSK9ix7xGRv3M0akn5ODWs8nuCnyDGDOH2VYIWHNLGLFfdr4H7medy/Y1Bb9E92w7W7D1rx2saPCtk1za0yc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 174118922138171.43403518520188; Wed, 5 Mar 2025 07:40:21 -0800 (PST) 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) 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) 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-Google-Smtp-Source: AGHT+IG5I5DsZdbodVA3yFmcxk6l1JA1RGsMnT8bwoIQ/GvDweKhkl2ceTzOvhZ6IXKu6cEFk5jkOg== 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) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Richard Henderson , Pierrick Bouvier , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1741189224670019000 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=C3=A9 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 --=20 2.47.1 From nobody Wed Apr 2 13:16:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1741189389; cv=none; d=zohomail.com; s=zohoarc; b=MoQCBwHN319h5tUiewrfmAI70lgVoRPklWEYEsuil4hNRs4cwidHUntQDllDAxqHUCb26HEbwCaN13CjQmBlm+suaQkrdn3YmkDE+rt89LMe0xk7i/S/RdxGd7KeuRDeAKU8U2wul8OKvE4h+woAcUCM/o6xhlvkBXrUAptYwXo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1741189389; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=wRaiRNOXt2Tm6E+k8ENfXrbiXjiTCdfFjZ148djIZfg=; b=UE4z6xW5DclCMD/idp30ctMbsRCZ6UDpRfEsAnVCd/JQUlwT00FcvDMT2PuKx495JPAliLyn8/s13uPH/hIPAJr8iBaeLNzjwn8JXzr3NzwdV6UWSPagMT5u/uyw2FCrn3OYxbESJ6odVRLgQ7xCuM0uloEuP5LFGXo5nXzgVK0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1741189389927165.98389780507034; Wed, 5 Mar 2025 07:43:09 -0800 (PST) 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) 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) 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-Google-Smtp-Source: AGHT+IF9Y3yTj3l4rEmYN8S7RWCl8soWh/hPSQQ5G9Ol+uEL+06GgwMED12RVVtncEVuqE5wz9RoVw== 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) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Richard Henderson , Pierrick Bouvier , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1741189391911019100 Prefer runtime helpers to get target page size. Signed-off-by: Philippe Mathieu-Daud=C3=A9 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(VFIOCo= ntainerBase *bcontainer, VFIORamDiscardListener *vrdl; =20 /* Ignore some corner cases not relevant in practice. */ - g_assert(QEMU_IS_ALIGNED(section->offset_within_region, TARGET_PAGE_SI= ZE)); + 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())); =20 vrdl =3D g_new0(VFIORamDiscardListener, 1); vrdl->bcontainer =3D bcontainer; --=20 2.47.1 From nobody Wed Apr 2 13:16:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1741189244; cv=none; d=zohomail.com; s=zohoarc; b=VyCUcDyzDC384283qURhzQMM7qq2CBUu56Oc5xz2FSGz4R+jeWxMZAdS8D88yc5Eh49/FlO0ieudBRAdBtBw/Nt+leeO4Vx+yDBXjmDTM4Jfk0Jv9bXNEyVD51G+a0fU/TfPQymhxrhRKpEPKzobaVvQxVa3X500pqfN2JL7+Mg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1741189244; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=xdtas5HdXydL2NOaru6Yo7c9eAGwqywYol70/Ag2vxo=; b=bCEP1Xychz2598zlsDMne70altblQEFz35yzSrEpFwHIJBQ9jlRbYHMbgHte8opnUghyCio7J68qw1+Nh1ZbmxIaIwLP60HiV4vYyTO0qEb6cJUHY0e+YgZ3nruVC9iKS7N7AXycU3IFFeBGfAEmI2ZpFdqM2sV5gLeZ5V7pVMA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1741189244202480.06649337396254; Wed, 5 Mar 2025 07:40:44 -0800 (PST) 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) 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) 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-Google-Smtp-Source: AGHT+IGqmhu/i4tlWiizNzpPx8mEocXR9cuZYwCsTXNSpMVaO4jgil7kIFzVs+8gqF9dkMUyrm2VHg== 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) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Richard Henderson , Pierrick Bouvier , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1741189245828019000 Ensure common code never use this target specific definition. Signed-off-by: Philippe Mathieu-Daud=C3=A9 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 =20 #pragma GCC poison CPU_INTERRUPT_HARD #pragma GCC poison CPU_INTERRUPT_EXITTB --=20 2.47.1 From nobody Wed Apr 2 13:16:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1741189360; cv=none; d=zohomail.com; s=zohoarc; b=Moav0CdYh3uZuuA0qJxRh9l6bzTfE8AUkhVZ6+s7kGorvo1iQTPuX/1hRFDIiRNs5tgcYP8kOAU4noWjncwkOg+3O/GUokcxMiqZdtA85uOosVnmoRNizaAsAd0/L025eRHQqkKpdONfiSg7AO2VbGWaO01BEyXReraA2Agqb90= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1741189360; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=yO8rIUYsmfpiPaEUeyghGtqZEEwY/40aLvzN2/tuA48=; b=nRvWgk4IHobACbTQ34cXMBnRKSBLFw0PybmcuvKPpZkeJXwD6IOErLPKsK+Ib6szSCimd3ZAQ7PxsyS7CM5snEhaYSSA2zO0y7LDlaF8oHrnwbefBIr+4GxGL0F2jMcYxhzik2w3sgN2FvPHNt++z1D+dBkLMWdqUlMynZnZ3q0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1741189360326766.5572634119162; Wed, 5 Mar 2025 07:42:40 -0800 (PST) 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) 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) 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-Google-Smtp-Source: AGHT+IG3RVUWfz3pij+8dv7UpzBYF5BrCgJPwOUtxqW3U8p6LEMITUNUqsumhTtxxnlaJrkX4NdytQ== 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) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Richard Henderson , Pierrick Bouvier , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1741189362750019100 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=C3=A9 --- 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 =20 -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')) =20 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[] =3D { + { + .binary_name =3D "qemu-system-aarch64", + .arch_bit =3D QEMU_ARCH_BIT_ARM, + }, + { + .binary_name =3D "qemu-system-alpha", + .arch_bit =3D QEMU_ARCH_BIT_ALPHA, + }, + { + .binary_name =3D "qemu-system-arm", + .arch_bit =3D QEMU_ARCH_BIT_ARM, + }, + { + .binary_name =3D "qemu-system-avr", + .arch_bit =3D QEMU_ARCH_BIT_AVR, + }, + { + .binary_name =3D "qemu-system-hppa", + .arch_bit =3D QEMU_ARCH_BIT_HPPA, + }, + { + .binary_name =3D "qemu-system-i386", + .arch_bit =3D QEMU_ARCH_BIT_I386, + }, + { + .binary_name =3D "qemu-system-loongarch64", + .arch_bit =3D QEMU_ARCH_BIT_LOONGARCH, + }, + { + .binary_name =3D "qemu-system-m68k", + .arch_bit =3D QEMU_ARCH_BIT_M68K, + }, + { + .binary_name =3D "qemu-system-microblaze", + .arch_bit =3D QEMU_ARCH_BIT_MICROBLAZE, + }, + { + .binary_name =3D "qemu-system-microblazeel", + .arch_bit =3D QEMU_ARCH_BIT_MICROBLAZE, + }, + { + .binary_name =3D "qemu-system-mips", + .arch_bit =3D QEMU_ARCH_BIT_MIPS, + }, + { + .binary_name =3D "qemu-system-mips64", + .arch_bit =3D QEMU_ARCH_BIT_MIPS, + }, + { + .binary_name =3D "qemu-system-mips64el", + .arch_bit =3D QEMU_ARCH_BIT_MIPS, + }, + { + .binary_name =3D "qemu-system-mipsel", + .arch_bit =3D QEMU_ARCH_BIT_MIPS, + }, + { + .binary_name =3D "qemu-system-or1k", + .arch_bit =3D QEMU_ARCH_BIT_OPENRISC, + }, + { + .binary_name =3D "qemu-system-ppc", + .arch_bit =3D QEMU_ARCH_BIT_PPC, + }, + { + .binary_name =3D "qemu-system-ppc64", + .arch_bit =3D QEMU_ARCH_BIT_PPC, + }, + { + .binary_name =3D "qemu-system-riscv32", + .arch_bit =3D QEMU_ARCH_BIT_RISCV, + }, + { + .binary_name =3D "qemu-system-riscv64", + .arch_bit =3D QEMU_ARCH_BIT_RISCV, + }, + { + .binary_name =3D "qemu-system-rx", + .arch_bit =3D QEMU_ARCH_BIT_RX, + }, + { + .binary_name =3D "qemu-system-s390x", + .arch_bit =3D QEMU_ARCH_BIT_S390X, + }, + { + .binary_name =3D "qemu-system-sh4", + .arch_bit =3D QEMU_ARCH_BIT_SH4, + }, + { + .binary_name =3D "qemu-system-sh4eb", + .arch_bit =3D QEMU_ARCH_BIT_SH4, + }, + { + .binary_name =3D "qemu-system-sparc", + .arch_bit =3D QEMU_ARCH_BIT_SPARC, + }, + { + .binary_name =3D "qemu-system-sparc64", + .arch_bit =3D QEMU_ARCH_BIT_SPARC, + }, + { + .binary_name =3D "qemu-system-tricore", + .arch_bit =3D QEMU_ARCH_BIT_TRICORE, + }, + { + .binary_name =3D "qemu-system-x86_64", + .arch_bit =3D QEMU_ARCH_BIT_I386, + }, + { + .binary_name =3D "qemu-system-xtensa", + .arch_bit =3D QEMU_ARCH_BIT_XTENSA, + }, + { + .binary_name =3D "qemu-system-xtensaeb", + .arch_bit =3D QEMU_ARCH_BIT_XTENSA, + }, +}; + +static int current_index =3D -1; + +void legacy_binary_info_init(const char *argv0) +{ + g_auto(GStrv) tokens =3D g_strsplit(argv0, G_DIR_SEPARATOR_S, -1); + unsigned count =3D 0; + const char *binary_name; + + while (tokens[count]) { + count++; + } + assert(count > 0); + binary_name =3D tokens[count - 1]; + + for (size_t i =3D 0; i < ARRAY_SIZE(legacy_binary_infos); i++) { + if (!strcmp(legacy_binary_infos[i].binary_name, binary_name)) { + current_index =3D 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) =20 error_init(argv[0]); qemu_init_exec_dir(argv[0]); + legacy_binary_info_init(argv[0]); =20 os_setup_limits(); =20 --=20 2.47.1 From nobody Wed Apr 2 13:16:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1741189230; cv=none; d=zohomail.com; s=zohoarc; b=mUoZqmi0nkgaBFF8HpA3TdtzOM070cHptLE1AnxQN5aahAyT1eJjOOAD9H6n+xWDMEz6qGrrjS1oiEeO5gaK2HguNFVP2B8vs5RrnfXV/N438ZKnAqttDYFXvKQ91xMlQDOyvS4iqM38WrVlJiwudElrgZy4rUfWUPj+sc4kqZY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1741189230; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=7xkVi+fM9u6NjYnvimRvSzA5d9mqak031ohahGjE3Qo=; b=DQXw+XJNtrTHpD0U4x2wmwtWnIb2r8Sk90vZCuMvdH/MapGgag9JfuhSu2Km+jmZxkkeZSoCTRUVjtORvdJyee5/aAewKLHhLuRkNbx9LW0HjDHrdw61U8SYMPY/kCzXQ1LvCtHkz43iJpSnd1b0+Tk8dPOtv+zXhstdj7ldURw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1741189230607281.8351998519406; Wed, 5 Mar 2025 07:40:30 -0800 (PST) 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) 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) 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-Google-Smtp-Source: AGHT+IH2SNSYu1go+vMvptDDaHOCOikxea34irNUz8kMS5JlxACZU665AtGU83pq/RQohXFrBz531Q== 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) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Richard Henderson , Pierrick Bouvier , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1741189233605019100 Introduce legacy_binary_is_64bit() to check at runtime if a binary is compiled with TARGET_LONG_BITS =3D=3D 64. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 @@ =20 void legacy_binary_info_init(const char *argv0); =20 +/* Return runtime equivalent of TARGET_LONG_BITS =3D=3D 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; =20 /* List alphabetically sorted by binary_name */ @@ -20,118 +21,147 @@ static const LegacyBinaryInfo legacy_binary_infos[] = =3D { { .binary_name =3D "qemu-system-aarch64", .arch_bit =3D QEMU_ARCH_BIT_ARM, + .long_bits =3D 64, }, { .binary_name =3D "qemu-system-alpha", .arch_bit =3D QEMU_ARCH_BIT_ALPHA, + .long_bits =3D 64, }, { .binary_name =3D "qemu-system-arm", .arch_bit =3D QEMU_ARCH_BIT_ARM, + .long_bits =3D 32, }, { .binary_name =3D "qemu-system-avr", .arch_bit =3D QEMU_ARCH_BIT_AVR, + .long_bits =3D 32, }, { .binary_name =3D "qemu-system-hppa", .arch_bit =3D QEMU_ARCH_BIT_HPPA, + .long_bits =3D 64, }, { .binary_name =3D "qemu-system-i386", .arch_bit =3D QEMU_ARCH_BIT_I386, + .long_bits =3D 32, }, { .binary_name =3D "qemu-system-loongarch64", .arch_bit =3D QEMU_ARCH_BIT_LOONGARCH, + .long_bits =3D 64, }, { .binary_name =3D "qemu-system-m68k", .arch_bit =3D QEMU_ARCH_BIT_M68K, + .long_bits =3D 32, }, { .binary_name =3D "qemu-system-microblaze", .arch_bit =3D QEMU_ARCH_BIT_MICROBLAZE, + .long_bits =3D 64, }, { .binary_name =3D "qemu-system-microblazeel", .arch_bit =3D QEMU_ARCH_BIT_MICROBLAZE, + .long_bits =3D 64, }, { .binary_name =3D "qemu-system-mips", .arch_bit =3D QEMU_ARCH_BIT_MIPS, + .long_bits =3D 64, }, { .binary_name =3D "qemu-system-mips64", .arch_bit =3D QEMU_ARCH_BIT_MIPS, + .long_bits =3D 64, }, { .binary_name =3D "qemu-system-mips64el", .arch_bit =3D QEMU_ARCH_BIT_MIPS, + .long_bits =3D 64, }, { .binary_name =3D "qemu-system-mipsel", .arch_bit =3D QEMU_ARCH_BIT_MIPS, + .long_bits =3D 32, }, { .binary_name =3D "qemu-system-or1k", .arch_bit =3D QEMU_ARCH_BIT_OPENRISC, + .long_bits =3D 32, }, { .binary_name =3D "qemu-system-ppc", .arch_bit =3D QEMU_ARCH_BIT_PPC, + .long_bits =3D 32, }, { .binary_name =3D "qemu-system-ppc64", .arch_bit =3D QEMU_ARCH_BIT_PPC, + .long_bits =3D 64, }, { .binary_name =3D "qemu-system-riscv32", .arch_bit =3D QEMU_ARCH_BIT_RISCV, + .long_bits =3D 32, }, { .binary_name =3D "qemu-system-riscv64", .arch_bit =3D QEMU_ARCH_BIT_RISCV, + .long_bits =3D 64, }, { .binary_name =3D "qemu-system-rx", .arch_bit =3D QEMU_ARCH_BIT_RX, + .long_bits =3D 32, }, { .binary_name =3D "qemu-system-s390x", .arch_bit =3D QEMU_ARCH_BIT_S390X, + .long_bits =3D 64, }, { .binary_name =3D "qemu-system-sh4", .arch_bit =3D QEMU_ARCH_BIT_SH4, + .long_bits =3D 32, }, { .binary_name =3D "qemu-system-sh4eb", .arch_bit =3D QEMU_ARCH_BIT_SH4, + .long_bits =3D 32, }, { .binary_name =3D "qemu-system-sparc", .arch_bit =3D QEMU_ARCH_BIT_SPARC, + .long_bits =3D 32, }, { .binary_name =3D "qemu-system-sparc64", .arch_bit =3D QEMU_ARCH_BIT_SPARC, + .long_bits =3D 64, }, { .binary_name =3D "qemu-system-tricore", .arch_bit =3D QEMU_ARCH_BIT_TRICORE, + .long_bits =3D 32, }, { .binary_name =3D "qemu-system-x86_64", .arch_bit =3D QEMU_ARCH_BIT_I386, + .long_bits =3D 64, }, { .binary_name =3D "qemu-system-xtensa", .arch_bit =3D QEMU_ARCH_BIT_XTENSA, + .long_bits =3D 32, }, { .binary_name =3D "qemu-system-xtensaeb", .arch_bit =3D QEMU_ARCH_BIT_XTENSA, + .long_bits =3D 32, }, }; =20 @@ -151,6 +181,7 @@ void legacy_binary_info_init(const char *argv0) =20 for (size_t i =3D 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 =3D 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 !=3D -1); + return legacy_binary_infos[current_index].long_bits =3D=3D 64; +} --=20 2.47.1 From nobody Wed Apr 2 13:16:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1741189459; cv=none; d=zohomail.com; s=zohoarc; b=FAVmaQ49KcBJ9zCzCuthqbmcwqSnDD4uaRSV8si79NFDwp0F49rn69FY3bchFlFIFmueva9d7iRxkQp8Oxhs5DsO9t05Xe49te0n4I4jtphkYPg6pGo7zVsonHjPlw9n4xs2Fxa7lcUicyurR7l2NDWIdGfSUt4j1nXNjWuTtbM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1741189459; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=L2KTLDysQM0wVa4x1RgyrU9A2skfuDU+tMT+Lbpm30s=; b=LqXldpmx0mjIunalJqiTD/uf2CGMAqGEVIz7R0i4AUd1G9MmI9zjvURQD5pFYQdP4pcYnI557/XtIaBDKkbQEH5jA9yJyWHJE1W+e+6JZlac5p0XMp6od+mpNibht+GFd4gTgjH+M6lAyqr8eCy5jDYCpYsq4lFdtnIJckwcgbg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1741189459214908.120707232478; Wed, 5 Mar 2025 07:44:19 -0800 (PST) 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) 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) 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-Google-Smtp-Source: AGHT+IHEb4a6rWDKmaXzEfsK4vZCgV1/vwsRpaXSrY5DLqOzPUkpFyFw4hzqDTCH2wyV+Oos6Ge0ng== 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) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Richard Henderson , Pierrick Bouvier , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1741189462272019100 For legacy MIPS binaries, legacy_binary_is_64bit() is equivalent of the compile time TARGET_MIPS64 definition. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 =3D (legacy_binary_is_64bit() ? 6 : 12) * 1000 * 100= 0; =20 cpuclk =3D 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); =20 /* Init CPUs. */ cpu =3D mips_cpu_create_with_clock(machine->cpu_type, cpuclk, @@ -241,11 +239,8 @@ static void mips_mipssim_machine_init(MachineClass *mc) { mc->desc =3D "MIPS MIPSsim platform"; mc->init =3D mips_mipssim_init; -#ifdef TARGET_MIPS64 - mc->default_cpu_type =3D MIPS_CPU_TYPE_NAME("5Kf"); -#else - mc->default_cpu_type =3D MIPS_CPU_TYPE_NAME("24Kf"); -#endif + mc->default_cpu_type =3D legacy_binary_is_64bit() ? MIPS_CPU_TYPE_NAME= ("5Kf") + : MIPS_CPU_TYPE_NAME("= 24Kf"); mc->default_ram_id =3D "mips_mipssim.ram"; } =20 --=20 2.47.1 From nobody Wed Apr 2 13:16:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1741189293; cv=none; d=zohomail.com; s=zohoarc; b=cVReGf+DOz1DqljAZj9915W7MroRsGf8UkT6VKSJgJZwPCavsOoHjCzPGyVkw5TEd2WH59C8+03w0woa5dm5OY9htElIP8IUMYLy6P2lituo/z2XniHTl7voun9a4mYsXsALsHI62G7I3PzV6R6JSA9wwqzra8Dg6lJucrYu+pY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1741189293; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=p6dIwE7gVAC3kvr4prQgvoWqphwYC2S/k+p1kJTqC1M=; b=ej9BVyn5NE4xq9C1AuDNq6EuRktXJdAHxnvL1MaGXX8a+8Onnli52dj7qn7FITlZ2nXs3Zf9skLBqE6TiqcOH5iY3ZWiE5Vgct3A26uZKQxDwqOvQFP43kUA+fDOComyCr1A9U4x1dOZGhkq6ENfX7Fqa0Fmb/31xvqKk4X78U8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1741189293649203.25110532080384; Wed, 5 Mar 2025 07:41:33 -0800 (PST) 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) 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) 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-Google-Smtp-Source: AGHT+IEEw1M4NTgNFD4c1Pk88DDohyB7w17rsrnSVgJ/UueZW5oDEyan6zat3wzUzU3k9bDq32o2Fw== 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) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Richard Henderson , Pierrick Bouvier , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1741189295681019100 For legacy MIPS binaries, legacy_binary_is_64bit() is equivalent of the compile time TARGET_MIPS64 definition. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 =3D IF_IDE; mc->max_cpus =3D 16; mc->is_default =3D true; -#ifdef TARGET_MIPS64 - mc->default_cpu_type =3D MIPS_CPU_TYPE_NAME("20Kc"); -#else - mc->default_cpu_type =3D MIPS_CPU_TYPE_NAME("24Kf"); -#endif + mc->default_cpu_type =3D legacy_binary_is_64bit() ? MIPS_CPU_TYPE_NAME= ("20Kc") + : MIPS_CPU_TYPE_NAME("= 24Kf"); mc->default_ram_id =3D "mips_malta.ram"; compat_props_add(mc->compat_props, malta_compat, malta_compat_len); } --=20 2.47.1 From nobody Wed Apr 2 13:16:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1741189305; cv=none; d=zohomail.com; s=zohoarc; b=gVTPSx6DRNulywEwZOA9pv0kq3DrLtaoO+wJ4h1eMJzgvdQdYXnUS4OqbJQusGmIdVDw0L3lDkpJj/GZDcUAV19X99LH94LZtgbEmGL38YsIDH1hQ+arvGgBNy2mDsZngjvEd/Hr7gPPfHbWGl4ZnhKLh4hCoQaLzD78fDpVCrk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1741189305; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=RHsIUy8sKMvdJC/jiaNf5NT96KaTYh580z1CwMPFXu8=; b=LW9xIeJVr2iA9iVvELJUjTH2kwf/wZ8dfFqEv7v9mmXPzg+/lirW1r4p6tUYeJQWYMTBIGTtz9ow2cyb8P8U5uV5gJ4xzXxhV5xWgsMcMCcn2r1Ls8YD9gi/FQONL7I5/TqpnsikGZ03NA90K0jcElTmvDP4kUIIBnq2DV4yu5s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1741189305400982.9435584724091; Wed, 5 Mar 2025 07:41:45 -0800 (PST) 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) 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) 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-Google-Smtp-Source: AGHT+IHOUVpD+bGIsn9N3xpYujRIAoxMaeIxhOt1BddFy+SOh08mb7/IAJ0D2a6iA7SvK7QD0LFQCA== 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) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Richard Henderson , Pierrick Bouvier , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1741189305957019000 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=C3=A9 --- 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); =20 #define CPU_RESOLVING_TYPE TYPE_X86_CPU =20 -#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 =20 /* 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 *d= ata) mc->has_hotpluggable_cpus =3D false; mc->auto_enable_numa_with_memhp =3D false; mc->auto_enable_numa_with_memdev =3D false; - mc->default_cpu_type =3D TARGET_DEFAULT_CPU_TYPE; + mc->default_cpu_type =3D legacy_binary_is_64bit() + ? X86_CPU_TYPE_NAME("qemu64") + : X86_CPU_TYPE_NAME("qemu32"); mc->nvdimm_supported =3D false; mc->default_ram_id =3D "microvm.ram"; =20 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 @@ =20 #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, vo= id *data) hc->plug =3D pc_machine_device_plug_cb; hc->unplug_request =3D pc_machine_device_unplug_request_cb; hc->unplug =3D pc_machine_device_unplug_cb; - mc->default_cpu_type =3D TARGET_DEFAULT_CPU_TYPE; + mc->default_cpu_type =3D legacy_binary_is_64bit() + ? X86_CPU_TYPE_NAME("qemu64") + : X86_CPU_TYPE_NAME("qemu32"); mc->nvdimm_supported =3D true; mc->smp_props.dies_supported =3D true; mc->smp_props.modules_supported =3D 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 @@ */ =20 #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, v= oid *data) MachineClass *mc =3D MACHINE_CLASS(oc); =20 mc->desc =3D "Xen PVH x86 machine"; - mc->default_cpu_type =3D TARGET_DEFAULT_CPU_TYPE; + mc->default_cpu_type =3D legacy_binary_is_64bit() + ? X86_CPU_TYPE_NAME("qemu64") + : X86_CPU_TYPE_NAME("qemu32"); =20 /* mc->max_cpus holds the MAX value allowed in the -smp cmd-line opts.= */ mc->max_cpus =3D HVM_MAX_VCPUS; --=20 2.47.1 From nobody Wed Apr 2 13:16:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1741189275; cv=none; d=zohomail.com; s=zohoarc; b=CpwU7NeiXCMfTsMIgwCacCccCsgy4ySt2deJnnj+sHQ2ufYMP2xjvxEAo9hLpdNStOFOWRp0jRBmiOFxuVAD4mA42UUI54c339RaqKpOmZhS7aDY3r86h2Z4Cah40u8kIoiq/jusW8yoGVGReBpXF77PUIPjvyclY8GQFEFvzMw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1741189275; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=tm6pJ8fvWIoYf16fHvVGbN/phK9k4HNSdSWeslgNhR4=; b=LO73PBEn/Hup75Gl3aox1n8DXlB6SYf8ICI0zq5zIQevidqVp5tB4JcCTv4rLIExJE4qHPFZ9EvIO7Or3xpGVYgAxA4zALyo90mn0QLDlO2HpMyty1SiEKn89l59zLpGAgqedbqQ2sG/MB2gEWrtl6c5K0cLiMKMjitUvhH4YAw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1741189275564104.98535314238688; Wed, 5 Mar 2025 07:41:15 -0800 (PST) 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) 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) 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-Google-Smtp-Source: AGHT+IEpmqmnKdMSOtUJeLzOByuvT5O+r8pr7oNhVOjKYGTHuuYcRPHjLHAdaBSWCJiLUmWhQvS0Cw== 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) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Richard Henderson , Pierrick Bouvier , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1741189277660019100 For legacy PowerPC binaries, legacy_binary_is_64bit() is equivalent of the compile time TARGET_PPC64 definition. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 =3D "std"; mc->default_nic =3D "sungem"; mc->kvm_type =3D core99_kvm_type; -#ifdef TARGET_PPC64 - mc->default_cpu_type =3D POWERPC_CPU_TYPE_NAME("970fx_v3.1"); -#else - mc->default_cpu_type =3D POWERPC_CPU_TYPE_NAME("7400_v2.9"); -#endif + mc->default_cpu_type =3D legacy_binary_is_64bit() + ? POWERPC_CPU_TYPE_NAME("970fx_v3.1") + : POWERPC_CPU_TYPE_NAME("7400_v2.9"); mc->default_ram_id =3D "ppc_core99.ram"; mc->ignore_boot_device_suffixes =3D true; fwc->get_dev_path =3D 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 =3D IF_IDE; /* SMP is not supported currently */ mc->max_cpus =3D 1; -#ifndef TARGET_PPC64 - mc->is_default =3D true; -#endif + mc->is_default =3D !legacy_binary_is_64bit(); /* TOFIX "cad" when Mac floppy is implemented */ mc->default_boot_order =3D "cd"; mc->kvm_type =3D heathrow_kvm_type; --=20 2.47.1 From nobody Wed Apr 2 13:16:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1741189370; cv=none; d=zohomail.com; s=zohoarc; b=LZ09xkJV/5IIn7/fozxgS4Kgomm7rqjzzYQ6Fp2G61fd7ApX0PzeFCkX3uwIBPWVnaTPBEdmAtp4Y3PuVK5CMFymc7xaEH0aOEhifb6TuyuoGdkps+BKpj4DeqwjsZECY4S1C2Bv50j31zEEjA4mod/Otu+e3e+wMAIzwd5SwVo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1741189370; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=fYDAc70iCmEcsaAQpim9Lu0U9CfOBiddFcVryIIgw1c=; b=iUJXLtFidePU9Zo1VjAdwAcKhiYe2yiP+ffLf/SMWgzQupN6R/kIxxlCgk7aM0v0f8zNeMe0PBThI9SUqS2V3mxnsV9WwdkSkbEPGvW9vKfI98+ruNnT2t29i2Hm1z2luStg12BlSYjybZvrLIvSp+3eZ26wS+kf3HwBjj6JTOQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1741189370607894.8737767631276; Wed, 5 Mar 2025 07:42:50 -0800 (PST) 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) 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) 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-Google-Smtp-Source: AGHT+IHroEkV8P6Vz2KqqECLrWsyC5n3bWV3S4dxFGiwdRq/c7o7hZuQb8VuOSVRyA0UAd26buKBew== 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) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Richard Henderson , Pierrick Bouvier , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1741189372595019000 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=C3=A9 --- 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 =20 +#include "qapi/qapi-types-common.h" + void legacy_binary_info_init(const char *argv0); =20 /* Return runtime equivalent of TARGET_LONG_BITS =3D=3D 64 check */ bool legacy_binary_is_64bit(void); =20 +/* 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" =20 typedef struct LegacyBinaryInfo { const char *binary_name; QemuArchBit arch_bit; + EndianMode endianness; unsigned long_bits; } LegacyBinaryInfo; =20 @@ -21,146 +23,175 @@ static const LegacyBinaryInfo legacy_binary_infos[] = =3D { { .binary_name =3D "qemu-system-aarch64", .arch_bit =3D QEMU_ARCH_BIT_ARM, + .endianness =3D ENDIAN_MODE_LITTLE, .long_bits =3D 64, }, { .binary_name =3D "qemu-system-alpha", .arch_bit =3D QEMU_ARCH_BIT_ALPHA, + .endianness =3D ENDIAN_MODE_LITTLE, .long_bits =3D 64, }, { .binary_name =3D "qemu-system-arm", .arch_bit =3D QEMU_ARCH_BIT_ARM, + .endianness =3D ENDIAN_MODE_LITTLE, .long_bits =3D 32, }, { .binary_name =3D "qemu-system-avr", .arch_bit =3D QEMU_ARCH_BIT_AVR, + .endianness =3D ENDIAN_MODE_LITTLE, .long_bits =3D 32, }, { .binary_name =3D "qemu-system-hppa", .arch_bit =3D QEMU_ARCH_BIT_HPPA, + .endianness =3D ENDIAN_MODE_BIG, .long_bits =3D 64, }, { .binary_name =3D "qemu-system-i386", .arch_bit =3D QEMU_ARCH_BIT_I386, + .endianness =3D ENDIAN_MODE_LITTLE, .long_bits =3D 32, }, { .binary_name =3D "qemu-system-loongarch64", .arch_bit =3D QEMU_ARCH_BIT_LOONGARCH, + .endianness =3D ENDIAN_MODE_LITTLE, .long_bits =3D 64, }, { .binary_name =3D "qemu-system-m68k", .arch_bit =3D QEMU_ARCH_BIT_M68K, + .endianness =3D ENDIAN_MODE_BIG, .long_bits =3D 32, }, { .binary_name =3D "qemu-system-microblaze", .arch_bit =3D QEMU_ARCH_BIT_MICROBLAZE, + .endianness =3D ENDIAN_MODE_BIG, .long_bits =3D 64, }, { .binary_name =3D "qemu-system-microblazeel", .arch_bit =3D QEMU_ARCH_BIT_MICROBLAZE, + .endianness =3D ENDIAN_MODE_LITTLE, .long_bits =3D 64, }, { .binary_name =3D "qemu-system-mips", .arch_bit =3D QEMU_ARCH_BIT_MIPS, + .endianness =3D ENDIAN_MODE_BIG, .long_bits =3D 64, }, { .binary_name =3D "qemu-system-mips64", .arch_bit =3D QEMU_ARCH_BIT_MIPS, + .endianness =3D ENDIAN_MODE_BIG, .long_bits =3D 64, }, { .binary_name =3D "qemu-system-mips64el", .arch_bit =3D QEMU_ARCH_BIT_MIPS, + .endianness =3D ENDIAN_MODE_LITTLE, .long_bits =3D 64, }, { .binary_name =3D "qemu-system-mipsel", .arch_bit =3D QEMU_ARCH_BIT_MIPS, + .endianness =3D ENDIAN_MODE_LITTLE, .long_bits =3D 32, }, { .binary_name =3D "qemu-system-or1k", .arch_bit =3D QEMU_ARCH_BIT_OPENRISC, + .endianness =3D ENDIAN_MODE_LITTLE, .long_bits =3D 32, }, { .binary_name =3D "qemu-system-ppc", .arch_bit =3D QEMU_ARCH_BIT_PPC, + .endianness =3D ENDIAN_MODE_BIG, .long_bits =3D 32, }, { .binary_name =3D "qemu-system-ppc64", .arch_bit =3D QEMU_ARCH_BIT_PPC, + .endianness =3D ENDIAN_MODE_BIG, .long_bits =3D 64, }, { .binary_name =3D "qemu-system-riscv32", .arch_bit =3D QEMU_ARCH_BIT_RISCV, + .endianness =3D ENDIAN_MODE_LITTLE, .long_bits =3D 32, }, { .binary_name =3D "qemu-system-riscv64", .arch_bit =3D QEMU_ARCH_BIT_RISCV, + .endianness =3D ENDIAN_MODE_LITTLE, .long_bits =3D 64, }, { .binary_name =3D "qemu-system-rx", .arch_bit =3D QEMU_ARCH_BIT_RX, + .endianness =3D ENDIAN_MODE_LITTLE, .long_bits =3D 32, }, { .binary_name =3D "qemu-system-s390x", .arch_bit =3D QEMU_ARCH_BIT_S390X, + .endianness =3D ENDIAN_MODE_BIG, .long_bits =3D 64, }, { .binary_name =3D "qemu-system-sh4", .arch_bit =3D QEMU_ARCH_BIT_SH4, + .endianness =3D ENDIAN_MODE_LITTLE, .long_bits =3D 32, }, { .binary_name =3D "qemu-system-sh4eb", .arch_bit =3D QEMU_ARCH_BIT_SH4, + .endianness =3D ENDIAN_MODE_BIG, .long_bits =3D 32, }, { .binary_name =3D "qemu-system-sparc", .arch_bit =3D QEMU_ARCH_BIT_SPARC, + .endianness =3D ENDIAN_MODE_BIG, .long_bits =3D 32, }, { .binary_name =3D "qemu-system-sparc64", .arch_bit =3D QEMU_ARCH_BIT_SPARC, + .endianness =3D ENDIAN_MODE_BIG, .long_bits =3D 64, }, { .binary_name =3D "qemu-system-tricore", .arch_bit =3D QEMU_ARCH_BIT_TRICORE, + .endianness =3D ENDIAN_MODE_LITTLE, .long_bits =3D 32, }, { .binary_name =3D "qemu-system-x86_64", .arch_bit =3D QEMU_ARCH_BIT_I386, + .endianness =3D ENDIAN_MODE_LITTLE, .long_bits =3D 64, }, { .binary_name =3D "qemu-system-xtensa", .arch_bit =3D QEMU_ARCH_BIT_XTENSA, + .endianness =3D ENDIAN_MODE_LITTLE, .long_bits =3D 32, }, { .binary_name =3D "qemu-system-xtensaeb", .arch_bit =3D QEMU_ARCH_BIT_XTENSA, + .endianness =3D ENDIAN_MODE_BIG, .long_bits =3D 32, }, }; @@ -182,6 +213,7 @@ void legacy_binary_info_init(const char *argv0) for (size_t i =3D 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 !=3D ENDIAN_MODE_UNSP= ECIFIED); current_index =3D i; return; } @@ -195,3 +227,14 @@ bool legacy_binary_is_64bit(void) assert(current_index !=3D -1); return legacy_binary_infos[current_index].long_bits =3D=3D 64; } + +EndianMode legacy_binary_endianness(void) +{ + assert(current_index !=3D -1); + return legacy_binary_infos[current_index].endianness; +} + +bool legacy_binary_is_big_endian(void) +{ + return legacy_binary_endianness() =3D=3D ENDIAN_MODE_BIG; +} --=20 2.47.1 From nobody Wed Apr 2 13:16:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1741189272; cv=none; d=zohomail.com; s=zohoarc; b=B62zpjJXUP8/9RdEDAxFOr5o8Ze5mT6+NFhnU4fski7WdE0l7pz6VWqtqXuP0FsVe61XATl/3ZXvmRb8cVey/QmO0DUspWdh5Z7UF9K1B0iJXmAGWsb77mSyHDSNhSoqdMqdV5+QrpaRCu9KRevgUXMVVMUrf8nCCFQQ4YcvkiI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1741189272; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=h75Q8oFB88c1KxlztseXVkazErFGK1NRT/MtbJI0cyg=; b=flpIxIHhgtQEjwdjhNjCA0kWvpJv73AyDLIbIZJKuy7Ek1OHMEg/iHc822H2Bfv7rNDwfpUP27kK4t9OEJhUlaRRGoSSTf+sYU7TKNMLZGzbe19neMjYOAOaZLCnynXsDXt4wk5LTxQcvT+fdenVElW/J1LEIAXmjLwNdzD769c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1741189272281890.7942273218515; Wed, 5 Mar 2025 07:41:12 -0800 (PST) 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) 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) 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-Google-Smtp-Source: AGHT+IFSjbTE5HXp9KyZNAh82ePsMKy7upgs6ToOmvQCiPR00bzw/AMHbUAXgjxdLnjIMDCUPcKj1g== 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) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Richard Henderson , Pierrick Bouvier , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1741189273606019100 For legacy binaries, legacy_binary_is_big_endian() is equivalent of the compile time TARGET_BIG_ENDIAN definition. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 @@ =20 #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, }; =20 -#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 =3D opaque; @@ -120,7 +115,8 @@ static const MemoryRegionOps dma_dummy_ops =3D { }; =20 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 *rc403= 0_dma_mr, dev =3D 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 =3D SYS_BUS_DEVICE(dev); @@ -194,6 +190,9 @@ static void mips_jazz_init(MachineState *machine, MemoryRegion *bios2 =3D g_new(MemoryRegion, 1); SysBusESPState *sysbus_esp; ESPState *esp; + bool is_big_endian =3D legacy_binary_is_big_endian(); + const char *default_bios_filename =3D 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); =20 /* init CPUs */ - cpu =3D mips_cpu_create_with_clock(machine->cpu_type, cpuclk, - TARGET_BIG_ENDIAN); + cpu =3D mips_cpu_create_with_clock(machine->cpu_type, cpuclk, is_big_e= ndian); env =3D &cpu->env; qemu_register_reset(main_cpu_reset, cpu); =20 @@ -245,7 +243,8 @@ static void mips_jazz_init(MachineState *machine, memory_region_add_subregion(address_space, 0xfff00000LL, bios2); =20 /* load the BIOS image. */ - filename =3D qemu_find_file(QEMU_FILE_TYPE_BIOS, machine->firmware ?: = BIOS_FILENAME); + filename =3D qemu_find_file(QEMU_FILE_TYPE_BIOS, machine->firmware + ?: default_bios_filenam= e); if (filename) { bios_size =3D load_image_targphys(filename, 0xfff00000LL, MAGNUM_BIOS_SIZE); @@ -329,7 +328,7 @@ static void mips_jazz_init(MachineState *machine, } =20 /* 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); =20 /* SCSI adapter */ dev =3D qdev_new(TYPE_SYSBUS_ESP); --=20 2.47.1 From nobody Wed Apr 2 13:16:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1741189254; cv=none; d=zohomail.com; s=zohoarc; b=WUSznTr/ZZ9TMg2bqHwijnjV9Ngl6d6yocr+DGQd4SNK4tqPne4Zoqb5m9Vm+Cqe3eRVEj0fGHraOM1+21b7WMzpncjzCYGkGf68D4yAH/5S3IjIzAQbXxk5xwldqNxvt8foCYVXBR+pyQZhOn2AMylL0GnRjPETxrzeFM6OVsc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1741189254; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=KgCOVp2CKYNDhFT/FOf4qCf2zv7LZPk8S7w6YrhW+hs=; b=VctdEwhj5Zov3N6YWuIdAlpFEQTJX5bd+0cfZKzO3BnQv3ZUV0oRWrWkFm91CQzau7bGGan/QkWRQFyDRGl5DxWivyPfLaMnjW/gulDi5S1LSaNE5PeyUzlE/0CN7MRbSkHHo9dr33//t7BcHysPYHpAcVb+GjFSV0HmSNUQ7yQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1741189254141930.947031246603; Wed, 5 Mar 2025 07:40:54 -0800 (PST) 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) 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) 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-Google-Smtp-Source: AGHT+IFtTnpGJZhRlxgvjnVn6Po/DKZNrX2ZBL08LVLEjBpdLo8gSJ6bEWyY0hSTN4VgfupP19Uw+w== 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) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Richard Henderson , Pierrick Bouvier , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1741189255855019000 For legacy binaries, legacy_binary_is_big_endian() is equivalent of the compile time TARGET_BIG_ENDIAN definition. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 @@ =20 #define BIOS_SIZE (4 * MiB) =20 -#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; =20 -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 =3D legacy_binary_is_big_endian(); + const char *default_bios_filename =3D is_big_endian ? "mips_bios.bin" + : "mipsel_bios.bin"; unsigned clock_hz =3D (legacy_binary_is_64bit() ? 6 : 12) * 1000 * 100= 0; =20 cpuclk =3D clock_new(OBJECT(machine), "cpu-refclk"); clock_set_hz(cpuclk, clock_hz); =20 /* Init CPUs. */ - cpu =3D mips_cpu_create_with_clock(machine->cpu_type, cpuclk, - TARGET_BIG_ENDIAN); + cpu =3D mips_cpu_create_with_clock(machine->cpu_type, cpuclk, is_big_e= ndian); env =3D &cpu->env; =20 reset_info =3D 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 =3D qemu_find_file(QEMU_FILE_TYPE_BIOS, machine->firmware ?: = BIOS_FILENAME); + filename =3D qemu_find_file(QEMU_FILE_TYPE_BIOS, machine->firmware + ?: default_bios_filenam= e); if (filename) { bios_size =3D load_image_targphys(filename, 0x1fc00000LL, BIOS_SIZ= E); g_free(filename); @@ -199,7 +196,7 @@ mips_mipssim_init(MachineState *machine) loaderparams.kernel_filename =3D kernel_filename; loaderparams.kernel_cmdline =3D kernel_cmdline; loaderparams.initrd_filename =3D initrd_filename; - reset_info->vector =3D load_kernel(); + reset_info->vector =3D load_kernel(is_big_endian); } =20 /* Init CPU internal devices. */ --=20 2.47.1 From nobody Wed Apr 2 13:16:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1741189369; cv=none; d=zohomail.com; s=zohoarc; b=g01e2JgrX9OX6/fDAzX2A6xV/lP0EvNlkiDQdGNW3SyaxLesgNqHaxm1HJ3+4SRZEZgaf1kpKw9no/DZSS+C8v04JnGZXQxuvJXCr8kQTC9AKF8S3H5OL85OPbQlD8jrn/IJRVQ4pCUDroz1xnGpkKxXsAzJgR0eKEkJSZzrGMk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1741189369; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=4OC+PlyCRZLGzf6tvLjkEgzmve3rRTU2dVEb5T9eDDQ=; b=lUowodzxURsDsPawx9OyAv+xECDN+otuuSYdQHacJ6OWXjPrUNBGdk6bqLEvNRsBWmKq0oHZgVjhJR9VNbryUtzxmH1ZfkxrEmsBxFcyeEMuMmkB/okq+E8qbKTk/3k4FFiWeEDvqmVH+mBxttTJo8eJ1vN673rE9QQiaavbqdY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1741189369080242.62515298007713; Wed, 5 Mar 2025 07:42:49 -0800 (PST) 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) 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) 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-Google-Smtp-Source: AGHT+IEjJWIf/DBd+lPpvtVxhda1cp+bcr6SSnME4rm00JkqbKVNHrfkpUTqfwQf+rmX6xbgEsfjGQ== 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) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Richard Henderson , Pierrick Bouvier , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1741189372014019100 For legacy binaries, legacy_binary_is_big_endian() is equivalent of the compile time TARGET_BIG_ENDIAN definition. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 @@ */ =20 #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, MachineStat= e *machine) uint64_t elf_entry; int success =3D load_elf(kernel_filename, NULL, translate_phys_add= r, cpu, &elf_entry, NULL, NULL, NULL, - TARGET_BIG_ENDIAN ? ELFDATA2MSB : ELFDATA2L= SB, + legacy_binary_is_big_endian() ? ELFDATA2MSB + : ELFDATA2LSB, EM_XTENSA, 0, 0); =20 if (success > 0) { --=20 2.47.1 From nobody Wed Apr 2 13:16:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1741189418; cv=none; d=zohomail.com; s=zohoarc; b=EwVzW7j+IQ1BBJkEqCywNQIwZEfRzO3Upmv1MAUyNCAFCtUYx0HUxVaOaseXDRoc/7gIZgFXBbOfDx4BnMY0zSNnQE1hF0nKxdCe44vJiZCcVkWKNvbP+nV4KuWdlNwSU9lT+R+lyAqCAxx4E1xZK5CceMyPPIYJcY2hc9Yc9g8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1741189418; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=6yTWsYV7yfcZRB8fKtcjLgcDtoMSuGOlcV0M3TYNzGI=; b=Q4v1jG4yk7kJsWx2z0Puuqkloqtoxb9fooPgJCywwSJs0FwC/gUfNJ0uwnSkAO0yGt8M8C2DSoEVNY82Cw012hnqypprblCPT24RGWz0A08nNh1ejuC5htzLfRR41GbHINQyQVJJE3bVNMUy6O/lP47hyxfvHj+2iyCcl2QJKoA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 174118941861141.44736677898129; Wed, 5 Mar 2025 07:43:38 -0800 (PST) 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) 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) 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-Google-Smtp-Source: AGHT+IFOQhx56i9GhpkFWeMqO+r36ELBfvzHkZvTWBo5eoemy07OMx/V+xN1/4OZH2QfdKI9HmV6sQ== 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) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Richard Henderson , Pierrick Bouvier , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1741189420500019000 For legacy binaries, legacy_binary_is_big_endian() is equivalent of the compile time TARGET_BIG_ENDIAN definition. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 @@ =20 #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, M= achineState *machine) uint32_t freq =3D 10000000; int n; unsigned int smp_cpus =3D machine->smp.cpus; + bool is_big_endian =3D legacy_binary_is_big_endian(); =20 if (smp_cpus > 1) { mx_pic =3D xtensa_mx_pic_init(31); @@ -311,7 +313,7 @@ static void xtfpga_init(const XtfpgaBoardDesc *board, M= achineState *machine) =20 dinfo =3D drive_get(IF_PFLASH, 0, 0); if (dinfo) { - flash =3D xtfpga_flash_init(system_io, board, dinfo, TARGET_BIG_EN= DIAN); + flash =3D xtfpga_flash_init(system_io, board, dinfo, is_big_endian= ); } =20 /* Use presence of kernel file name as 'boot from SRAM' switch. */ @@ -399,7 +401,7 @@ static void xtfpga_init(const XtfpgaBoardDesc *board, M= achineState *machine) uint64_t elf_entry; int success =3D load_elf(kernel_filename, NULL, translate_phys_add= r, cpu, &elf_entry, NULL, NULL, NULL, - TARGET_BIG_ENDIAN ? ELFDATA2MSB : ELFDATA2L= SB, + is_big_endian ? ELFDATA2MSB : ELFDATA2LSB, EM_XTENSA, 0, 0); if (success > 0) { entry_point =3D elf_entry; @@ -437,9 +439,9 @@ static void xtfpga_init(const XtfpgaBoardDesc *board, M= achineState *machine) 0x21, 0xfe, 0xff, /* l32r a2, entry_a2 */ 0xa0, 0x00, 0x00, /* jx a0 */ }; - const size_t boot_sz =3D TARGET_BIG_ENDIAN ? sizeof(boot_be) - : sizeof(boot_le); - uint8_t *boot =3D TARGET_BIG_ENDIAN ? boot_be : boot_le; + const size_t boot_sz =3D is_big_endian ? sizeof(boot_be) + : sizeof(boot_le); + uint8_t *boot =3D is_big_endian ? boot_be : boot_le; uint32_t entry_pc =3D tswap32(entry_point); uint32_t entry_a2 =3D tswap32(tagptr); =20 --=20 2.47.1 From nobody Wed Apr 2 13:16:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1741189296; cv=none; d=zohomail.com; s=zohoarc; b=b4+Uh4auyoUu9W/lVygILpWvMLSDQIEwFvVuK2Sm8TZBEDEceED6oufnzb9JXlASjMhbveyJ0kwWeWVfkn/d6Efok/10BQj5qFzBkweQtVx9yM57OAQaAlFLHGcSuqFh6W3PJDpTPENmPv2xZKxhq/Bektbv7e+qFutv43v8LB0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1741189296; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=zCLXy/6Jr/0dTWXwfCWT0ZtMvCFd8v9iNYIKh2Xds74=; b=GEsEQs0hddfJqyPYT28FXBB1SjzkEc1Nn2HNQy1Qlz2Vz1QL318psy7T0v/CU0is6wA+l3tzwEQb5pkYJ7XcjAJg0p6vEF/VWnkbinHoXv8SQMloqUj/r5aZf6ryEN8U//ii7121Kfunop+hUh3P63LzOi5cB0CWQ9gNuun4C7w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 174118929659632.97707351370286; Wed, 5 Mar 2025 07:41:36 -0800 (PST) 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) 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) 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-Google-Smtp-Source: AGHT+IHEiBphRCdocbVqnHQgT/UnY6shrIcCANlIoob8I0XmTJJCBWeV1E92qmelqF6Ve7FsQLrpmw== 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) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Richard Henderson , Pierrick Bouvier , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1741189297682019100 For legacy binaries, legacy_binary_is_big_endian() is equivalent of the compile time TARGET_BIG_ENDIAN definition. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 @@ =20 #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 =3D g_new(MemoryRegion, 1); MemoryRegion *phys_ram =3D g_new(MemoryRegion, 1); qemu_irq irq[32]; - EndianMode endianness =3D TARGET_BIG_ENDIAN ? ENDIAN_MODE_BIG - : ENDIAN_MODE_LITTLE; + EndianMode endianness =3D legacy_binary_endianness(); =20 /* init CPUs */ cpu =3D MICROBLAZE_CPU(object_new(TYPE_MICROBLAZE_CPU)); --=20 2.47.1 From nobody Wed Apr 2 13:16:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1741189390; cv=none; d=zohomail.com; s=zohoarc; b=bymoVKnV7VCT3K8m/D1+I7yyzxznCYH6kpNH1PTTkGs5sCQV86evgxjcMgqJ6XjnsiRd4TQltd+ufJNzblweRk6fhOR4nrga2xDOcE5C19kh3Gq38Vl1MXS4oADIkLo/DC+HP4T2e5fyoSmCxCzcCUnzsueHAFgqD001CI1LWjQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1741189390; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=+vtQIxIHxpXveYUhgNWWXCgOpU/U9ptA2e3UaY3frqU=; b=cG6vLFxpIVzckpwy+FhkASOfxHKDYjR24oCz/AlDGNI7YP0oUDeHbSw9wg8TCyNAmdJObsegzShsTpU1M+eRMuyPrhKStdghGKouD/WIe87L2lPwru/3IeX3d9WH3WtXxCJx31SFrP1AceZLqHyieYsqHffOrtp1BeNwAnkyDkY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1741189390112650.9645925023488; Wed, 5 Mar 2025 07:43:10 -0800 (PST) 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) 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) 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-Google-Smtp-Source: AGHT+IGNuYMnXF6rBDXaLT19GqJ/gNbsa16vAYpnR8cczTS6BrISULUSR6Buy3vVTyHNK+Bwa7jrLw== 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) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Richard Henderson , Pierrick Bouvier , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1741189391966019100 For legacy binaries, legacy_binary_is_big_endian() is equivalent of the compile time TARGET_BIG_ENDIAN definition. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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/petal= ogix_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 @@ =20 #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 =3D g_new(MemoryRegion, 1); qemu_irq irq[32]; MemoryRegion *sysmem =3D get_system_memory(); - EndianMode endianness =3D TARGET_BIG_ENDIAN ? ENDIAN_MODE_BIG - : ENDIAN_MODE_LITTLE; + EndianMode endianness =3D legacy_binary_endianness(); =20 cpu =3D 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 =3D=3D ENDIAN_MODE_LITTLE, &error_= abort); qdev_realize(DEVICE(cpu), NULL, &error_abort); =20 /* Attach emulated BRAM through the LMB. */ @@ -135,7 +135,8 @@ petalogix_s3adsp1800_init(MachineState *machine) =20 create_unimplemented_device("xps_gpio", GPIO_BASEADDR, 0x10000); =20 - microblaze_load_kernel(cpu, !TARGET_BIG_ENDIAN, ddr_base, ram_size, + microblaze_load_kernel(cpu, endianness =3D=3D 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(Obj= ectClass *oc, void *data) { MachineClass *mc =3D MACHINE_CLASS(oc); =20 - mc->desc =3D "PetaLogix linux refdesign for xilinx Spartan 3ADSP1800"; + mc->desc =3D legacy_binary_endianness() =3D=3D ENDIAN_MODE_LITTLE + ? "PetaLogix linux refdesign for xilinx Spartan 3ADSP1800 (little = endian)" + : "PetaLogix linux refdesign for xilinx Spartan 3ADSP1800 (big end= ian)"; mc->init =3D petalogix_s3adsp1800_init; mc->is_default =3D true; } --=20 2.47.1 From nobody Wed Apr 2 13:16:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1741189369; cv=none; d=zohomail.com; s=zohoarc; b=f/BKVZaod7AN3Cz3Ik+wrIsl3wYxwPpKV+YIYHlpBKDhFcvLpKA+aneZJ+agfJtcoaIV+bK3l+IFz4dCj5RQZbl8U+EMNBiloJG2JKjtOSuhvmVp6wq/+8H9vl94vF8WT4SNeRrfuFwH/Jiy0qWzNXDB8NSSFwxS32XWy8gWu24= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1741189369; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=SAe89AKUiv2OCh4O9g61YeTeEn2jUwLCWPqWxHhFQsc=; b=O/8+fWM5bojx09Ccb3xmeCMotAZ6UjUjJZwFTh6UE9prhCqyhPg/ZInw4KJJCcVVdalI2r/EXrRhuKEFMqnBm2G/6jhAmiCjARbIa+ZqVas0FGnpLNbAu7oYNlU2jcpYIDVLmu+TdLa+38TN3WqBTHPYSB22HJH1Sys+tBaihhM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 174118936941418.843488285138164; Wed, 5 Mar 2025 07:42:49 -0800 (PST) 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) 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) 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-Google-Smtp-Source: AGHT+IEet80YioCTjWFChTMU6lbXTUrHxMelJ8el/dbnq/WucmOnc+XsebDWnxUyLyntDPDPTY+U6w== 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) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Richard Henderson , Pierrick Bouvier , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1741189372029019100 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=C3=A9 --- 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 =3D \ =20 ignored =3D [ 'TARGET_XML_FILES', 'TARGET_ABI_DIR', 'TARGET_ARCH' ] =20 +aliased_targets =3D [] +aliased_target =3D {} + default_targets =3D 'CONFIG_DEFAULT_TARGETS' in config_host actual_target_dirs =3D [] fdt_required =3D [] @@ -3273,6 +3276,9 @@ foreach target : target_dirs endif config_target +=3D { 'CONFIG_BSD_USER': 'y' } elif target.endswith('softmmu') + if config_target['TARGET_NAME'] in aliased_targets + continue + endif config_target +=3D { 'CONFIG_SYSTEM_ONLY': 'y' } config_target +=3D { 'CONFIG_SOFTMMU': 'y' } endif @@ -4307,6 +4313,16 @@ foreach target : target_dirs link_args: link_args, win_subsystem: exe['win_subsystem']) =20 + if target_name in aliased_target + exe_alias =3D 'qemu-system-' + aliased_target[target_name] + emulators +=3D {exe_alias : custom_target(exe_alias, + input: [emulator], + output: exe_alias, + command: ['ln', '-f', '@INPU= T@', '@OUTPUT@'], + install : true, + install_dir : get_option('bi= ndir'))} + endif + if host_os =3D=3D 'darwin' icon =3D 'pc-bios/qemu.rsrc' build_input =3D [emulator, files(icon)] --=20 2.47.1 From nobody Wed Apr 2 13:16:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1741189441; cv=none; d=zohomail.com; s=zohoarc; b=TWYtx0W3c3Uc6Rje9KQr0XkhtYJ4yCYKhF0AEGmq+W9oJ01LrlS2OnDOGnJtlvo6d+8bx2yUoEK4Ip4ymgX3ip1X4g0PEBEVdWpiRM03a3tM9h+pU+8FskaweJZb9EIo9B1xskZy30AcoipFXsaDezdwJZmAQoO7fOQGfIdG6pw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1741189441; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=fyaw8diXz251XjYJL/kNHyvPJKVoVonVHEPK8PU5vpE=; b=ExeuAjL2WIrit2RNLXZccFHbhWPpCcqjU4x21iEtjUxwVpp7KCQ02bXnmkLO3NW/9EcK3HXAEP/lTXx+iQH1Z75BmVRMrAwZ70+kYv9uTR4Av//YWHXdmFNEjm8hausXqvL8/UVY7XvIhDkvExZ9qULN6Nj2rOEHYwbD/xLsBmM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 174118944183148.39932829597274; Wed, 5 Mar 2025 07:44:01 -0800 (PST) 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) 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) 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-Google-Smtp-Source: AGHT+IGIVU3JXeqmrpCnTLOC89zGOLFztoxkDbuPQ9sbgQpVMsXRRusob9OkIFQyCDAz0Dw4mp4sJg== 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) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Richard Henderson , Pierrick Bouvier , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1741189442552019000 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=C3=A9 --- 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/mic= roblazeel-softmmu.mak deleted file mode 100644 index 52cdeae1a28..00000000000 --- a/configs/targets/microblazeel-softmmu.mak +++ /dev/null @@ -1,8 +0,0 @@ -TARGET_ARCH=3Dmicroblaze -TARGET_SUPPORTS_MTTCG=3Dy -# needed by boot.c -TARGET_NEED_FDT=3Dy -TARGET_XML_FILES=3Dgdb-xml/microblaze-core.xml gdb-xml/microblaze-stack-pr= otect.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=3D64 diff --git a/meson.build b/meson.build index c2b7ec57739..46f97b1b7a7 100644 --- a/meson.build +++ b/meson.build @@ -3251,8 +3251,8 @@ host_kconfig =3D \ =20 ignored =3D [ 'TARGET_XML_FILES', 'TARGET_ABI_DIR', 'TARGET_ARCH' ] =20 -aliased_targets =3D [] -aliased_target =3D {} +aliased_targets =3D ['microblazeel'] +aliased_target =3D {'microblaze': 'microblazeel'} =20 default_targets =3D 'CONFIG_DEFAULT_TARGETS' in config_host actual_target_dirs =3D [] --=20 2.47.1