From nobody Fri Nov 14 18:19:16 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=1761774190; cv=none; d=zohomail.com; s=zohoarc; b=KF8ZPgNfwJVmSIjJ3HdsxTSN2aPf5NVaHle+Hrb3tN5ASsGrol2na4MbojybJUibTJ/3RelWRQrl+O6qKVdCOHAjoYYonNwpFdeu/Ud1Fsd3V/Rz/NHFxo3UYkBM986kqO1gN4isdT+izgpX5nR+6c+LHhcZyhXyRqJXb4WfMjM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761774190; 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=vMg20FGEN3XAffg6y9kZVfeDy5BlDMnMkEI0JSirbJQ=; b=Bgoh6se1HJ2APhURWzN3qTUrXH/A1lzoN3jv0i/Bi3oce3XuBqlVYN/ESz/YCOkp+5Z31LWGzkbsxrtlV7j/rlhYHmPlmtQE6BeqorfDIOvRYXHy+YJDcDCfgg1JxDnwUeVRpNWu9LvPmC7qKcWpSsMys4ZLKe5k1MV5DWaAq8Q= 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 1761774190423301.810117777359; Wed, 29 Oct 2025 14:43:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vEDv7-0005Ms-06; Wed, 29 Oct 2025 17:41:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vEDv0-0005Ib-RL for qemu-devel@nongnu.org; Wed, 29 Oct 2025 17:41:22 -0400 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 1vEDur-0005mB-Pl for qemu-devel@nongnu.org; Wed, 29 Oct 2025 17:41:21 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-475ca9237c2so1873125e9.3 for ; Wed, 29 Oct 2025 14:41:09 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4772899fdfbsm4184555e9.4.2025.10.29.14.41.03 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 29 Oct 2025 14:41:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761774065; x=1762378865; 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=vMg20FGEN3XAffg6y9kZVfeDy5BlDMnMkEI0JSirbJQ=; b=VBmOQtfoAkGv+DxrYOXCW1hOpPwEWcT9cqXpsiaeQLZWANtGu2570ANJWg6lv7tQeK PDStrPGqf0PQT5mQj79DBkM1teTaQubK9ngxiD4PTyHzZjT5ycBgrMtJYdzDv89/SOwA c2fmCPVySab4zSCzk2nm+R5N1HGPGhA9Wfj0c5QsWJVjzIoeJdgms020S+n1fWviqqAP u8r7jG3e3dBayrIh0PeK1T7Ju2ybKsdBj+owyBBxdstzg1LYFiyq7vKx9UUyhhQuA8pg rg5yvDQzq98rH77sMN7lnxhKMOrtflNiMiNfxFNVGK/X8P0RdPaAxAyQgQamQizuq7YY 5BFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761774065; x=1762378865; 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=vMg20FGEN3XAffg6y9kZVfeDy5BlDMnMkEI0JSirbJQ=; b=tSnu4tI4eB3GpuC2+ysvT8+vSl2lVO29vVBJ2RQNyeW3JwcXZs/X1cgSkoswYDs2M/ yLNzgltehrURJ0s3iSKKwQkyaD1dd3aECSt30sXmgSqitXYfWslnMB2Qnz1Lo4ygDKOM HLM1WEDrKCqBEIJrEOPFFyHv32ZL7M3KGJuDJ2g8Dv7HCn/y6QXfKWKJh0dx36pRRmEA Di23W/eOi2Mj3gnRXCK6990Gyu9QIulyEJ3AhEDyoFTT6cQgGb8Z1Kye3kbCj5zDxf5v qLOkOEW2jUoifKXZC4lJtOAB14o1ozDH5GrbY4sXjHdqLXhn7mDMTAJGNfyQEbK/IxeO zuIQ== X-Gm-Message-State: AOJu0Yw+aOPkWCuL1dQ+fYN9A9/FDUt5BQl+Y31xq5s6i7T2JdvNJZZn ErwOrpWY/yQcfmoJc0bDmHuAhJMi0vT2XP+Vg5LTJPulGgfcODsHfZktmjG8GF5FKD0LwtGwZHA L49cO2dg= X-Gm-Gg: ASbGncvzNldOoDOPgbzR2a+3TtPmNGsFrzToY7jubbZfKngt+2sdrOmKQX/0QQGN0GA FXRk1HNM5gY+pzhcPtHRH7/gHoimw1TB0dxJJulYuFqlcutPaM/p+o0sxoV3KcyJzijw8ffD4VK Kv2AUrfQ0ptT3mQmge6hNQKMgFMcdjd9/M4W3MHmVbMirXp46ofldcRa6L+lIgfrqG1U28z4Rql ZGBrenmd2cX/3x4GNUPSj0J1WMOAAU+yS7SQcmBcgXK5q/l+Qc34HXstoYaucPPHqMh4fgRToUP jx5GrW15OKikPT/2Kbm/69x5pW4DPQedV+FOA56XKrOQ4CQYswXyFIvrUys2odkLGP5SMVPID+b HO2NKgPi73/uLxMQ+vFuSGT9wHBI75RQs8DpnRrUcQrNAmp9qSJjTAo+tVV93H6Tc9Jqo/5UOCs ZsY3hJ7gLkqMtwr9F7AHJYSmhUp8U2Bi/1BVg8wWOHcoE2cTM32w== X-Google-Smtp-Source: AGHT+IE7Lu3fGHzxbo/6N5YEa9X70DPvJIqq2b1ZhV/fEfuhXaleik+8opbS0kP8kIN8QkTDkqgGNQ== X-Received: by 2002:a05:600c:608b:b0:475:de12:d3b2 with SMTP id 5b1f17b1804b1-4771e1f1dc2mr44058035e9.36.1761774064708; Wed, 29 Oct 2025 14:41:04 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PULL 01/23] hw/arm: Register TYPE_TARGET_ARM/AARCH64_MACHINE QOM interfaces Date: Wed, 29 Oct 2025 22:39:38 +0100 Message-ID: <20251029214001.99824-2-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251029214001.99824-1-philmd@linaro.org> References: <20251029214001.99824-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: 1761774194447158500 Define the TYPE_TARGET_ARM_MACHINE and TYPE_TARGET_AARCH64_MACHINE QOM interface names to allow machines to implement them. Register these interfaces in common code in target_info-qom.c used by all binaries because QOM interfaces must be registered before being checked (see next commit with the 'none' machine). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson Acked-by: Peter Maydell Message-Id: <20251021205741.57109-2-philmd@linaro.org> --- meson.build | 1 + include/hw/arm/machines-qom.h | 18 ++++++++++++++++++ target-info-qom.c | 24 ++++++++++++++++++++++++ 3 files changed, 43 insertions(+) create mode 100644 include/hw/arm/machines-qom.h create mode 100644 target-info-qom.c diff --git a/meson.build b/meson.build index 8ad37c992b1..de95da32699 100644 --- a/meson.build +++ b/meson.build @@ -3911,6 +3911,7 @@ common_ss.add(pagevary) specific_ss.add(files('page-vary-target.c')) =20 common_ss.add(files('target-info.c')) +system_ss.add(files('target-info-qom.c')) specific_ss.add(files('target-info-stub.c')) =20 subdir('backends') diff --git a/include/hw/arm/machines-qom.h b/include/hw/arm/machines-qom.h new file mode 100644 index 00000000000..a17225f5f92 --- /dev/null +++ b/include/hw/arm/machines-qom.h @@ -0,0 +1,18 @@ +/* + * QOM type definitions for ARM / Aarch64 machines + * + * Copyright (c) Linaro + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#ifndef HW_ARM_MACHINES_QOM_H +#define HW_ARM_MACHINES_QOM_H + +#define TYPE_TARGET_ARM_MACHINE \ + "target-info-arm-machine" + +#define TYPE_TARGET_AARCH64_MACHINE \ + "target-info-aarch64-machine" + +#endif diff --git a/target-info-qom.c b/target-info-qom.c new file mode 100644 index 00000000000..7fd58d24818 --- /dev/null +++ b/target-info-qom.c @@ -0,0 +1,24 @@ +/* + * QEMU binary/target API (QOM types) + * + * Copyright (c) Linaro + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "qom/object.h" +#include "hw/arm/machines-qom.h" + +static const TypeInfo target_info_types[] =3D { + { + .name =3D TYPE_TARGET_ARM_MACHINE, + .parent =3D TYPE_INTERFACE, + }, + { + .name =3D TYPE_TARGET_AARCH64_MACHINE, + .parent =3D TYPE_INTERFACE, + }, +}; + +DEFINE_TYPES(target_info_types) --=20 2.51.0 From nobody Fri Nov 14 18:19:16 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=1761774256; cv=none; d=zohomail.com; s=zohoarc; b=cWtbcEp+f6BZQG+zn3J7c03BcraAAopxjVZboUeVLfmx6M6qUmYsR1+d/yZek/6ERc6xHG9+5ncgWaQ5IGPVjGbXb0mMKDG0Gi6OczFBCjsy2bNzCv9ZTyyDBgzAbgKSXheyj1n+ZAMf5xiTnAaV1ZZASN5jHI1ddzUkedE+Dlw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761774256; 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=2EB/+K+U50LOMq4VatDY59V/9bRPr5YkwDU8U96E3AE=; b=G5XRoDLl4yo68GTFmVwqKG0CrLVVg2cEJe2eoK48C4zuUwQULeOKgMKbU+FatyS5nHNv1zYc93V+BLF6JWGXHinqKsWDzpXOgH+WI+vE9LTwjbNA4ZSgJ4wQ5MTYdnNG1daVEWIS9UB0t8eo/S+YTsZb2YTb+9mbMbsZsDWxUZ0= 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 1761774256470796.8920014639344; Wed, 29 Oct 2025 14:44:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vEDwA-0005lb-Bp; Wed, 29 Oct 2025 17:42:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vEDw6-0005k5-Dm for qemu-devel@nongnu.org; Wed, 29 Oct 2025 17:42:30 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vEDvt-0005oh-Mv for qemu-devel@nongnu.org; Wed, 29 Oct 2025 17:42:29 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-426fc536b5dso202275f8f.3 for ; Wed, 29 Oct 2025 14:42:08 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4772899fdfbsm4216885e9.4.2025.10.29.14.42.05 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 29 Oct 2025 14:42:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761774126; x=1762378926; 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=2EB/+K+U50LOMq4VatDY59V/9bRPr5YkwDU8U96E3AE=; b=GGg64D5+sN98dXSmJVCWZwKILv7Im/MUjjsK9lulwSqP1yafWQYOFwfqpGDsp3V95h +v2Mon38suxs5U5QeWlqjtZX9WkHe3B51yetUtldp5+VHvwC36cChCNksth3vWEb6HhV LuJD9YZUHEV/pTzr8AZSu2B+/UvGAOG6ensPIJ6kI6tDRMFFd4Y0YkfABJcBCwMWBhpH NxePnjZ+y7qW+stNlZJo1lKOP3BBhhgvLInjLHADfB67g0Dd7E58aKwqWjwaycOIT17d Zc7SuVTmejFL2y+1pCzmJg8+Hsiad4lEl615QdgEW2SSgMx23TnaEuCgju57ROKrdtk9 6NrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761774126; x=1762378926; 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=2EB/+K+U50LOMq4VatDY59V/9bRPr5YkwDU8U96E3AE=; b=XKpOlvi+QDMRqPv3hcNm6NHnTV6xNO304rNUuBmcdgeQnWnI03j9Y1KgBsD3sHOEJx MMVhpwfi4bFvNqcClh28dFYqcBygJp5YJ1kCcOLr2krdn8ctw83YE7PCGpNSWY+mo9QC I0R0z85DWmeVpeIdQKvtJrHHS/NQnIEH3+DB+HD9lPzCBxH8G0+B688Jcpk53PbdMZNU vx5ubgdPDTMal7x3XIH7h41qWIfkrbQVdme90g3oAp6fupzg5ESXkrDFueONEzrfvU88 +1U5VE2JShbW2EIqVJ+fE4Bf/HjOw3rXq7s+SGTj5JaZBCMxc/D9PuCcF+g6HhqblgY3 N6Ng== X-Gm-Message-State: AOJu0YxRvg92sOzXmBu2q49BJlw4aR4MI5Cj+B6gpHqKJsT+n96hMvx6 zYmI31RJ1hInNZLQoSVU6nvpTmcwg11EAwCGWwkNRRPaYqB9nmqj0UhaAIfgkU5+8pFqhyao6sS n82D5VEE= X-Gm-Gg: ASbGncvfiplve+g9zEaXvFN97O4x591V/S6bbqp80tFOLmzhCw0JX7F7PjmNUl4OUhT YunKIBb4TBL2e/Sl261BVb/7nVF0qmIt4t2irQcdjf7ftOLUYQkR++KfD8GS+iXOzj0SmS3wqgs jTdTYrPkoBk7zuj3n/mbbDrxAbxMn3cuzYlnfJML/RKRdufRut9bGwWTEmN0SkkL2EWjNRg3oe7 j22K91DVDvGlhCItekFTen2Teh/C0f4YR0M1UuwIj0sxUzrj8OW54GcV6Y+At7T00q/O9zHQyfX zgdO5RE7z2IX+//EQbBZtpsn2+No2vdIRB7s93C3Fw5P21AhMKEa+Anomh9B4tdbcL4mjE8FiA7 OFcZU2owJ6Fs0LkL1utUYiQEzUmF3b95KMmbuxb3HcmFkmIf5vuZ5hd7q31xk9RLEzBbUzXeunJ uTQqv2qkwnI8m5a4nOacbVJUA9oIqrLcig22LwJVk9hgs1GRe2dg== X-Google-Smtp-Source: AGHT+IFgdRC+dWjPAYj7IlPWt837fcvkUI8b6+SA4PZQBAwhyXnhAYEqH7ph7TKI5k6QGpOx2FC2tQ== X-Received: by 2002:a05:6000:4211:b0:429:8c31:84b7 with SMTP id ffacd0b85a97d-429aefd6aa2mr3655666f8f.39.1761774126313; Wed, 29 Oct 2025 14:42:06 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PULL 02/23] hw/core: Allow ARM/Aarch64 binaries to use the 'none' machine Date: Wed, 29 Oct 2025 22:39:39 +0100 Message-ID: <20251029214001.99824-3-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251029214001.99824-1-philmd@linaro.org> References: <20251029214001.99824-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::434; envelope-from=philmd@linaro.org; helo=mail-wr1-x434.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=unavailable 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: 1761774258341154100 When we'll start to use target_machine_typename() to filter machines for the ARM/Aarch64 binaries, the 'none' machine would be filtered. Register the proper interfaces to keep it available. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Acked-by: Peter Maydell Message-Id: <20251021205741.57109-3-philmd@linaro.org> --- hw/core/null-machine.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/core/null-machine.c b/hw/core/null-machine.c index a6e477a2d88..67b769bd3e0 100644 --- a/hw/core/null-machine.c +++ b/hw/core/null-machine.c @@ -16,6 +16,7 @@ #include "hw/boards.h" #include "system/address-spaces.h" #include "hw/core/cpu.h" +#include "hw/arm/machines-qom.h" =20 static void machine_none_init(MachineState *mch) { @@ -55,4 +56,7 @@ static void machine_none_machine_init(MachineClass *mc) mc->no_cdrom =3D 1; } =20 -DEFINE_MACHINE("none", machine_none_machine_init) +DEFINE_MACHINE_WITH_INTERFACES("none", machine_none_machine_init, + { TYPE_TARGET_AARCH64_MACHINE }, + { TYPE_TARGET_ARM_MACHINE }, + { }) --=20 2.51.0 From nobody Fri Nov 14 18:19:16 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=1761774283; cv=none; d=zohomail.com; s=zohoarc; b=FtBcwVElu9J27Pvns+o/dYE45d5Mps+79YAP4bRJ0lLb3s1ze6zvdLz0tywEpoQ0ghjgKaz49D0mwefHTp+DrBs7pdu5oNfdDyyCSXsSwXvVdI8FPZTD4MPg0mf6o7C1AYyme2+bcATmVB0Z5EZrysLtGwRptcnOho8rF8mRzc8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761774283; 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=idKPFW9DNb94tsTYsft1e7s0DZqqwVrbPK/YrVaEB84=; b=X1O3aJYvI5ro3yIFn1T8lW7oHQ8DSclLlKYk0QadnDTbG68rqtjF9OGADZRWvv44mItlRV0NlzZe9OZ7RmcLR4ZZkmBhARPM9mS3Ymc3vp3DubE3fUXQQaT/ndkyM4NAJYIXka299EC7gfJNMJuHkRJGpgB1MtS6nRLbZKy5aRw= 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 1761774283734696.053838954666; Wed, 29 Oct 2025 14:44:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vEDxA-0006dU-TV; Wed, 29 Oct 2025 17:43:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vEDx7-0006ar-B8 for qemu-devel@nongnu.org; Wed, 29 Oct 2025 17:43:33 -0400 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 1vEDwu-0005vS-4C for qemu-devel@nongnu.org; Wed, 29 Oct 2025 17:43:33 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-475dd559b0bso4201605e9.1 for ; Wed, 29 Oct 2025 14:43:11 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-477289a5625sm4258775e9.5.2025.10.29.14.43.07 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 29 Oct 2025 14:43:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761774188; x=1762378988; 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=idKPFW9DNb94tsTYsft1e7s0DZqqwVrbPK/YrVaEB84=; b=meQm/PPu7QsvoIbC6cAQpoBB+u3ei6QtkZyzoOSrEJmq/KyhYoeI1rMj6QEu7yOR6i q2nuCrRlWjODQ2h+GbopuKCDmRtYIja2D+v7AGEUJ8kk27Rdj1DvIXCDvh1lmh+3cyfQ yofDPdjHsCz2syXOKLVlh/BKiIalyTSH3caYYmQa36ZPBXWe2RbmgoO4vXI555VMRSNM 4iROSie3xuDaB8UzTfnI57l4HtP29gQYdfuh880FGtnp3WcPsWLD0zrVtfxb+FCg+hEc GkvoFpvhhArhtngZEGn92T+u9UWlyx2NnWbBxpoN84Nz6rfHXx4SK53wIscyVbfgqbjw OwdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761774188; x=1762378988; 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=idKPFW9DNb94tsTYsft1e7s0DZqqwVrbPK/YrVaEB84=; b=eV6UHgskxhO4DJ/rOL9l9MItaZS3G0s9rYcqJ7S9ru5eB+uws/8AVpmihVaahXz0zq cKtrV6vTue2KowPO8IrgmB47MnReNCGViPUkYJuRamGxPlrhoQhzmKHfhC86dR0IhX4s DtSqE36ty14o5Szvq0GhooQa/oybQyqNeLYa2gLmmggkMVCTr5PrJFLHm3aQX+W4PpDS 4KpP/p4P+we2jJYhs73QS6Bw41I1KcLYSqFeuqonmSOSPKK1VkzWXHC5EoozP8Wa0iJm CF/GPEM+O2pua4lY3ij6Rzga5pdfSAEindk07cpzXn4eiKlVOkMwWe/Qj2fHnIlE4nOD Qx/w== X-Gm-Message-State: AOJu0YwWUt6/8JgsgjnyTjQS2GpJOxXRZT8NIpFW3MncyYWVxDvrZCAq VnNlec4p4lvp7MpYEHLeEmWDWh9TNkE8OH2hz87N9O+diQqmEFGEHuDBzaUIjhKhGkHkcSqfwBU blnXxhqc= X-Gm-Gg: ASbGncugVtrzvaLcXbsqUPtqHxlw4+xgkc8TB3Quqc7hYiWKE6VByvIbidOWwHZOpw+ 9WLf/mKMmPGIhRtxtxF03sCksL+y0j2und5jTbeb9+6R0tM+WORLKPCJqEu9wEvkhs5c6yGPuvE fp7odIBPmUxFuddLzauoqLvsOzyDFI41QstBhPrx/YQOByQsPVLy72XP4nDCN1HPrzW66FCT4Rv gYlNRJiQlg+3b9R86aDRoBmDLWTjaKdo34tokTpgclzkgvnXz0WqyZJI+JFOxpQm769mM9Kc1Ob VU1cL3RLSvWGjxXix9hKrSOCE2iVTfFrLHskJ3lz2dRrgqrqBHp2Q+YQI02gKkJUR/x/vsOjneo M+K1kXXMirLDxlQ/rw5dvTqk0EGE6hPDzGlG9EE2HcW13SH8+Wwuro+J3PQNQIoxxZwbziX+DiE Ruk8ad2y3M01MhOqjUjFGyRwLiYBs5aOas0OPeqWCQUtuB9MR9B2+Nfgp2DxhK X-Google-Smtp-Source: AGHT+IGPYe8+TsAzWt3PeFAWy5OcSA6+QmmYiUYpLYR9+7sl7OvK+zAYiXOLP6Lq5n3d8cMf5MgL8w== X-Received: by 2002:a05:600c:4ecb:b0:46d:b665:1d95 with SMTP id 5b1f17b1804b1-4771e1edb27mr41335165e9.32.1761774187879; Wed, 29 Oct 2025 14:43:07 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PULL 03/23] hw/arm: Add DEFINE_MACHINE_ARM() / DEFINE_MACHINE_AARCH64() macros Date: Wed, 29 Oct 2025 22:39:40 +0100 Message-ID: <20251029214001.99824-4-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251029214001.99824-1-philmd@linaro.org> References: <20251029214001.99824-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: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=0.01 autolearn=no 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: 1761774284611154100 A machine defined with the DEFINE_MACHINE_ARM() macro will be available in both qemu-system-arm and qemu-system-aarch64 binaries. One defined with DEFINE_MACHINE_AARCH64() will only be available in the qemu-system-aarch64 binary. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Acked-by: Peter Maydell Message-Id: <20251021205741.57109-4-philmd@linaro.org> --- include/hw/arm/machines-qom.h | 28 ++++++++++++++++++++++++++++ target/arm/machine.c | 18 ++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/include/hw/arm/machines-qom.h b/include/hw/arm/machines-qom.h index a17225f5f92..3f64d5eb024 100644 --- a/include/hw/arm/machines-qom.h +++ b/include/hw/arm/machines-qom.h @@ -9,10 +9,38 @@ #ifndef HW_ARM_MACHINES_QOM_H #define HW_ARM_MACHINES_QOM_H =20 +#include "hw/boards.h" + #define TYPE_TARGET_ARM_MACHINE \ "target-info-arm-machine" =20 #define TYPE_TARGET_AARCH64_MACHINE \ "target-info-aarch64-machine" =20 +/* + * A machine filtered with arm_machine_interfaces[] or + * arm_aarch64_machine_interfaces[] will be available + * in both qemu-system-arm and qemu-system-aarch64 binaries. + * + * One filtered with aarch64_machine_interfaces[] will only + * be available in the qemu-system-aarch64 binary. + */ +extern const InterfaceInfo arm_machine_interfaces[]; +extern const InterfaceInfo arm_aarch64_machine_interfaces[]; +extern const InterfaceInfo aarch64_machine_interfaces[]; + +/* + * A machine defined with the DEFINE_MACHINE_ARM() macro will be + * available in both qemu-system-arm and qemu-system-aarch64 binaries. + * + * One defined with DEFINE_MACHINE_AARCH64() will only be available in + * the qemu-system-aarch64 binary. + */ +#define DEFINE_MACHINE_ARM(namestr, machine_initfn) \ + DEFINE_MACHINE_WITH_INTERFACE_ARRAY(namestr, machine_initfn, \ + arm_machine_interfaces) +#define DEFINE_MACHINE_AARCH64(namestr, machine_initfn) \ + DEFINE_MACHINE_WITH_INTERFACE_ARRAY(namestr, machine_initfn, \ + aarch64_machine_interfaces) + #endif diff --git a/target/arm/machine.c b/target/arm/machine.c index 44a0cf844b0..0befdb0b28a 100644 --- a/target/arm/machine.c +++ b/target/arm/machine.c @@ -9,6 +9,7 @@ #include "migration/qemu-file-types.h" #include "migration/vmstate.h" #include "target/arm/gtimer.h" +#include "hw/arm/machines-qom.h" =20 static bool vfp_needed(void *opaque) { @@ -1212,3 +1213,20 @@ const VMStateDescription vmstate_arm_cpu =3D { NULL } }; + +const InterfaceInfo arm_machine_interfaces[] =3D { + { TYPE_TARGET_ARM_MACHINE }, + { TYPE_TARGET_AARCH64_MACHINE }, + { } +}; + +const InterfaceInfo arm_aarch64_machine_interfaces[] =3D { + { TYPE_TARGET_ARM_MACHINE }, + { TYPE_TARGET_AARCH64_MACHINE }, + { } +}; + +const InterfaceInfo aarch64_machine_interfaces[] =3D { + { TYPE_TARGET_AARCH64_MACHINE }, + { } +}; --=20 2.51.0 From nobody Fri Nov 14 18:19:16 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=1761774371; cv=none; d=zohomail.com; s=zohoarc; b=QtXarysVZQc7aaWt7mK/c2ZjQk8udqPW3jg4gob5LQ0TlaGJZc+rhyL1pdh2rWaBM3hdjOJEnJA3sFdY334ihQo51UuhOCPhlr+7enZ+RbF8OmLovkbnI42a/VxplfM6pVwA9b/Kr/KIaW6S6HmyFke9LCZkYSE0WIdvQ94DK64= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761774371; 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=Z3bFe53ILgXRNYL8/M5HE5ToXV1HLDbw7rH/swp1vpI=; b=PXZ0iuoYPKzDxvJr+TAY/B7Pyl8L/1HZYTgFyYV4EHO36JpU8BhnhaYxfvISuhHjbykERt2+fhOCL+RGlEOZSnULF3Dup7JX9V36RDLolb1peyi5ygeeGHPFd+r46IYheZG8UkW3caJ7SrZxG4Em2SbvdpbxxM0yVtkBvyFfZN0= 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 1761774371068891.4264559451636; Wed, 29 Oct 2025 14:46:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vEDyE-0007Zr-6H; Wed, 29 Oct 2025 17:44:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vEDyA-0007XL-RP for qemu-devel@nongnu.org; Wed, 29 Oct 2025 17:44:38 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vEDxt-00060Y-Fy for qemu-devel@nongnu.org; Wed, 29 Oct 2025 17:44:36 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-47112a73785so2513325e9.3 for ; Wed, 29 Oct 2025 14:44:17 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-429952de5f9sm28394851f8f.38.2025.10.29.14.44.08 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 29 Oct 2025 14:44:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761774250; x=1762379050; 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=Z3bFe53ILgXRNYL8/M5HE5ToXV1HLDbw7rH/swp1vpI=; b=yaB3ATknZ4QNeRinSxKGRTsYciePBwhhYgkWFOAjV9QlAoCHkPG35ZUQQmcuIGAikP MgsGj0QMknQ14u1m5RCJYOxph5r1PnwlqNZn9iJqnJaXrrCtr0lGPln6IPtPtGRhLMow TlEzr4mZrjyBtkSMV1Bxvz3aenV7J3wx9iiV6mbHCGcaDYwwhE3jKi4AziHpOZRyrTD6 wDpeslI9Gz3Bx79JWGTtGhFOxSjvqyaB3ELYAgRJ/zSZKUhezUNKgPDiNZvY3h9agTwi EFfKGwcOMBwaOAIgzcA1/USysiojxzcx9UT/Kq6UmNMfK4XWZkWnLNIc+Xr7K0vkn8/O T+BA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761774250; x=1762379050; 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=Z3bFe53ILgXRNYL8/M5HE5ToXV1HLDbw7rH/swp1vpI=; b=egCUEcU9YBCOUoD04WGr6thlwdeXyclTW4LsAHGf91c3348qlhVmUN8z3rk2kKAYFf wpDcZHeu85X6uHMEsNX5fOyY6ZRHZAiG3LV1DYPilRX7KIGny4nSwwI8H6t/F011PzEy fkZ2utprS3r1I65CQQCKr6cfY/17G1pEtesbWRpWEBDeG+tvbPuuD6S2kFWHhqqC4zPK Fb69brxTW+ttgJ+dFEo9X/Q4x59CFR6fQkxnmyd5yHW5gNhdiEm3kD1K2A52xFXHepbX 25S99z6EsehI0NNivjvY7YQmZBIwMR6+wGakTq4638CfgBFlwVfnqU4SPoit1SdifO5P CCnw== X-Gm-Message-State: AOJu0YxZoFk+lgwQz25epWqQFNO3am1og/O/o7fzom55v+wV2sP+5XAp 27UjE0RpZiOdy6gLoPorsccSlhWaVzCpVRDdIKHjar1Oy1RomwNWH7SfyHRT7I6jeY71Lh7h7Nt HC/ROw2M= X-Gm-Gg: ASbGncveZbVqakendzzOllABU37+KInsvUpQgG7xgvZsbaT1FxZfBJQMpQ7jAIhhv57 UeHhrvZKSuIqJkizDnMGKXNCQCaz93Bp3yA54c4M/n/S4ppOcBAA5mpNq5TiMH4LIAhnQqk+8+j HHzpEzMBGpggkeZe/VD6c41wHiHzI9EHm15n7Bcn/HgxwlzFRKqNAErW697acGEatBjhWri1Pn+ BbFIKRk+yBKWJZSNZvB33Sq30Gk22F0NF42vVoT+u1z+1rPFl+WksaEhc1jDOF0fEAmP8LWnmyg qBrp17QmOqg3NmHgyyQxQwZkiKpGp8VPTw2xSqAb3MeAv2JRr4/5RGY13kt0y8TbPsI3au3iQmA 3CDFqtrwj5+7bBFJLsRJx9aiNO9oU/9rdapgIKzooxke8bhZvAXJN1/mng/y2ZyLhMQCVg2aIpf q+zfRrH7EKjVNMVvCTJZm1cM4617tUil9RW7M67fad9YvcPjOhVw== X-Google-Smtp-Source: AGHT+IGffqUaZlNV1vosu2rEWIQfY58g6QFn4CDpfD/MG2Wbhz77+yBsdUQXkRuXc1tT66uZiVhPcQ== X-Received: by 2002:a05:600c:6748:b0:477:1622:7f78 with SMTP id 5b1f17b1804b1-4771e3bc0cbmr41075825e9.40.1761774249606; Wed, 29 Oct 2025 14:44:09 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PULL 04/23] hw/arm: Filter machine types for qemu-system-arm/aarch64 binaries Date: Wed, 29 Oct 2025 22:39:41 +0100 Message-ID: <20251029214001.99824-5-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251029214001.99824-1-philmd@linaro.org> References: <20251029214001.99824-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::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, T_SPF_HELO_TEMPERROR=0.01 autolearn=no 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: 1761774377561158500 Register machines to be able to run with the qemu-system-arm and qemu-system-aarch64 binaries, except few machines which are only available on the qemu-system-aarch64 binary: $ git grep TARGET_AARCH64 hw/arm/meson.build hw/arm/meson.build:31:arm_common_ss.add(when: ['CONFIG_RASPI', 'TARGET_AA= RCH64'], if_true: files('bcm2838.c', 'raspi4b.c')) hw/arm/meson.build:50:arm_common_ss.add(when: ['CONFIG_ASPEED_SOC', 'TARG= ET_AARCH64'], if_true: files('aspeed_ast27x0.c')) $ git grep -W AARCH64 hw/arm/Kconfig hw/arm/Kconfig=3D185=3Dconfig SBSA_REF hw/arm/Kconfig-186- bool hw/arm/Kconfig-187- default y hw/arm/Kconfig:188: depends on TCG && AARCH64 -- hw/arm/Kconfig=3D413=3Dconfig XLNX_ZYNQMP_ARM hw/arm/Kconfig-414- bool hw/arm/Kconfig-415- default y if PIXMAN hw/arm/Kconfig:416: depends on TCG && AARCH64 -- hw/arm/Kconfig=3D435=3Dconfig XLNX_VERSAL hw/arm/Kconfig-436- bool hw/arm/Kconfig-437- default y hw/arm/Kconfig:438: depends on TCG && AARCH64 -- hw/arm/Kconfig=3D475=3Dconfig NPCM8XX hw/arm/Kconfig-476- bool hw/arm/Kconfig-477- default y hw/arm/Kconfig:478: depends on TCG && AARCH64 -- hw/arm/Kconfig=3D605=3Dconfig FSL_IMX8MP_EVK hw/arm/Kconfig-606- bool hw/arm/Kconfig-607- default y hw/arm/Kconfig:608: depends on TCG && AARCH64 $ git grep -wW TARGET_AARCH64 hw/arm | fgrep -4 MACHINE_TYPE_NAME ... hw/arm/aspeed.c:1939:#ifdef TARGET_AARCH64 hw/arm/aspeed.c-1940- }, { hw/arm/aspeed.c-1941- .name =3D MACHINE_TYPE_NAME("ast270= 0a0-evb"), hw/arm/aspeed.c-1949- .name =3D MACHINE_TYPE_NAME("ast270= 0a1-evb"), hw/arm/raspi.c:420:#ifdef TARGET_AARCH64 hw/arm/raspi.c-421- }, { hw/arm/raspi.c-422- .name =3D MACHINE_TYPE_NAME("raspi3a= p"), hw/arm/raspi.c-429- }, { hw/arm/raspi.c-430- .name =3D MACHINE_TYPE_NAME("raspi3b= "), This can be verified as: $ diff -u0 <(qemu-system-arm -M help) <(qemu-system-aarch64 -M help) @@ -1,0 +2,3 @@ +xlnx-versal-virt AMD Versal Virtual development board (alias of amd-= versal-virt) +amd-versal-virt AMD Versal Virtual development board +amd-versal2-virt AMD Versal Gen 2 Virtual development board @@ -4,0 +8,5 @@ +ast2700a0-evb Aspeed AST2700 A0 EVB (Cortex-A35) +ast2700-evb Aspeed AST2700 A1 EVB (Cortex-A35) (alias of ast270= 0a1-evb) +ast2700a1-evb Aspeed AST2700 A1 EVB (Cortex-A35) +ast2700fc ast2700 full core support (alias of ast2700fc) +ast2700fc ast2700 full core support @@ -20,0 +29 @@ +imx8mp-evk NXP i.MX 8M Plus EVK Board @@ -47,0 +57 @@ +npcm845-evb Nuvoton NPCM845 Evaluation Board (Cortex-A35) @@ -60,0 +71,3 @@ +raspi3ap Raspberry Pi 3A+ (revision 1.0) +raspi3b Raspberry Pi 3B (revision 1.2) +raspi4b Raspberry Pi 4B (revision 1.5) @@ -66,0 +80 @@ +sbsa-ref QEMU 'SBSA Reference' ARM Virtual Machine @@ -99,0 +114 @@ +xlnx-zcu102 Xilinx ZynqMP ZCU102 board with 4xA53s and 2xR5Fs b= ased on the value of smp Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Acked-by: Peter Maydell Message-Id: <20251021205741.57109-5-philmd@linaro.org> --- hw/arm/aspeed.c | 27 ++++++++++++++++++++++++++- hw/arm/aspeed_ast27x0-fc.c | 2 ++ hw/arm/b-l475e-iot01a.c | 2 ++ hw/arm/bananapi_m2u.c | 3 ++- hw/arm/collie.c | 2 ++ hw/arm/cubieboard.c | 3 ++- hw/arm/digic_boards.c | 3 ++- hw/arm/exynos4_boards.c | 3 +++ hw/arm/fby35.c | 2 ++ hw/arm/highbank.c | 3 +++ hw/arm/imx25_pdk.c | 3 ++- hw/arm/imx8mp-evk.c | 4 +++- hw/arm/integratorcp.c | 3 ++- hw/arm/kzm.c | 3 ++- hw/arm/mcimx6ul-evk.c | 4 +++- hw/arm/mcimx7d-sabre.c | 4 +++- hw/arm/microbit.c | 2 ++ hw/arm/mps2-tz.c | 5 +++++ hw/arm/mps2.c | 5 +++++ hw/arm/mps3r.c | 2 ++ hw/arm/msf2-som.c | 3 ++- hw/arm/musca.c | 3 +++ hw/arm/musicpal.c | 3 ++- hw/arm/netduino2.c | 3 ++- hw/arm/netduinoplus2.c | 3 ++- hw/arm/npcm7xx_boards.c | 6 ++++++ hw/arm/npcm8xx_boards.c | 2 ++ hw/arm/olimex-stm32-h405.c | 3 ++- hw/arm/omap_sx1.c | 3 +++ hw/arm/orangepi.c | 3 ++- hw/arm/raspi.c | 6 ++++++ hw/arm/raspi4b.c | 2 ++ hw/arm/realview.c | 5 +++++ hw/arm/sabrelite.c | 3 ++- hw/arm/sbsa-ref.c | 2 ++ hw/arm/stellaris.c | 3 +++ hw/arm/stm32vldiscovery.c | 3 ++- hw/arm/versatilepb.c | 3 +++ hw/arm/vexpress.c | 3 +++ hw/arm/virt.c | 2 ++ hw/arm/xilinx_zynq.c | 2 ++ hw/arm/xlnx-versal-virt.c | 3 +++ hw/arm/xlnx-zcu102.c | 2 ++ 43 files changed, 138 insertions(+), 18 deletions(-) diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index 1bc9e534ba4..ecc7272e67c 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -15,6 +15,7 @@ #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" #include "hw/arm/aspeed_eeprom.h" +#include "hw/arm/machines-qom.h" #include "hw/block/flash.h" #include "hw/i2c/i2c_mux_pca954x.h" #include "hw/i2c/smbus_eeprom.h" @@ -1967,99 +1968,123 @@ static const TypeInfo aspeed_machine_types[] =3D { .name =3D MACHINE_TYPE_NAME("palmetto-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_palmetto_class_init, + .interfaces =3D arm_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("supermicrox11-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_supermicrox11_bmc_class_init, + .interfaces =3D arm_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("supermicro-x11spi-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_supermicro_x11spi_bmc_class_init, + .interfaces =3D arm_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("ast2500-evb"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_ast2500_evb_class_init, + .interfaces =3D arm_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("romulus-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_romulus_class_init, + .interfaces =3D arm_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("sonorapass-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_sonorapass_class_init, + .interfaces =3D arm_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("witherspoon-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_witherspoon_class_init, + .interfaces =3D arm_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("ast2600-evb"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_ast2600_evb_class_init, + .interfaces =3D arm_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("yosemitev2-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_yosemitev2_class_init, + .interfaces =3D arm_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("tiogapass-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_tiogapass_class_init, + .interfaces =3D arm_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("g220a-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_g220a_class_init, + .interfaces =3D arm_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("qcom-dc-scm-v1-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_qcom_dc_scm_v1_class_init, + .interfaces =3D arm_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("qcom-firework-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_qcom_firework_class_init, + .interfaces =3D arm_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("fp5280g2-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_fp5280g2_class_init, + .interfaces =3D arm_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("quanta-q71l-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_quanta_q71l_class_init, + .interfaces =3D arm_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("rainier-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_rainier_class_init, + .interfaces =3D arm_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("fuji-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_fuji_class_init, + .interfaces =3D arm_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("bletchley-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_bletchley_class_init, + .interfaces =3D arm_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("gb200nvl-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_gb200nvl_class_init, + .interfaces =3D arm_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("catalina-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_catalina_class_init, + .interfaces =3D arm_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("fby35-bmc"), .parent =3D MACHINE_TYPE_NAME("ast2600-evb"), .class_init =3D aspeed_machine_fby35_class_init, + .interfaces =3D arm_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("ast1030-evb"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_minibmc_machine_ast1030_evb_class_init, + .interfaces =3D arm_machine_interfaces, #ifdef TARGET_AARCH64 }, { .name =3D MACHINE_TYPE_NAME("ast2700a0-evb"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_ast2700a0_evb_class_init, - }, { + .interfaces =3D aarch64_machine_interfaces, + }, { .name =3D MACHINE_TYPE_NAME("ast2700a1-evb"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_ast2700a1_evb_class_init, + .interfaces =3D aarch64_machine_interfaces, #endif }, { .name =3D TYPE_ASPEED_MACHINE, diff --git a/hw/arm/aspeed_ast27x0-fc.c b/hw/arm/aspeed_ast27x0-fc.c index 580ac5f7a12..b96ef3f97ab 100644 --- a/hw/arm/aspeed_ast27x0-fc.c +++ b/hw/arm/aspeed_ast27x0-fc.c @@ -22,6 +22,7 @@ #include "hw/arm/boot.h" #include "hw/block/flash.h" #include "hw/arm/aspeed_coprocessor.h" +#include "hw/arm/machines-qom.h" =20 #define TYPE_AST2700A1FC MACHINE_TYPE_NAME("ast2700fc") OBJECT_DECLARE_SIMPLE_TYPE(Ast2700FCState, AST2700A1FC); @@ -220,6 +221,7 @@ static const TypeInfo ast2700fc_types[] =3D { .parent =3D TYPE_MACHINE, .class_init =3D ast2700fc_class_init, .instance_size =3D sizeof(Ast2700FCState), + .interfaces =3D aarch64_machine_interfaces, }, }; =20 diff --git a/hw/arm/b-l475e-iot01a.c b/hw/arm/b-l475e-iot01a.c index 34ed2e0851b..f1fbc774e52 100644 --- a/hw/arm/b-l475e-iot01a.c +++ b/hw/arm/b-l475e-iot01a.c @@ -29,6 +29,7 @@ #include "qemu/error-report.h" #include "hw/arm/boot.h" #include "hw/core/split-irq.h" +#include "hw/arm/machines-qom.h" #include "hw/arm/stm32l4x5_soc.h" #include "hw/gpio/stm32l4x5_gpio.h" #include "hw/display/dm163.h" @@ -131,6 +132,7 @@ static const TypeInfo bl475e_machine_type[] =3D { .parent =3D TYPE_MACHINE, .instance_size =3D sizeof(Bl475eMachineState), .class_init =3D bl475e_machine_init, + .interfaces =3D arm_machine_interfaces, } }; =20 diff --git a/hw/arm/bananapi_m2u.c b/hw/arm/bananapi_m2u.c index b750a575f72..b5070b46666 100644 --- a/hw/arm/bananapi_m2u.c +++ b/hw/arm/bananapi_m2u.c @@ -27,6 +27,7 @@ #include "hw/qdev-properties.h" #include "hw/arm/allwinner-r40.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" =20 static struct arm_boot_info bpim2u_binfo; =20 @@ -144,4 +145,4 @@ static void bpim2u_machine_init(MachineClass *mc) mc->auto_create_sdcard =3D true; } =20 -DEFINE_MACHINE("bpim2u", bpim2u_machine_init) +DEFINE_MACHINE_ARM("bpim2u-pdk", bpim2u_machine_init) diff --git a/hw/arm/collie.c b/hw/arm/collie.c index 93bb190f1f9..5a80b7a2238 100644 --- a/hw/arm/collie.c +++ b/hw/arm/collie.c @@ -15,6 +15,7 @@ #include "hw/boards.h" #include "strongarm.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" #include "hw/block/flash.h" #include "system/address-spaces.h" #include "qom/object.h" @@ -86,6 +87,7 @@ static const TypeInfo collie_machine_typeinfo =3D { .parent =3D TYPE_MACHINE, .class_init =3D collie_machine_class_init, .instance_size =3D sizeof(CollieMachineState), + .interfaces =3D arm_machine_interfaces, }; =20 static void collie_machine_register_types(void) diff --git a/hw/arm/cubieboard.c b/hw/arm/cubieboard.c index d665d4edd97..aa51c0a7034 100644 --- a/hw/arm/cubieboard.c +++ b/hw/arm/cubieboard.c @@ -22,6 +22,7 @@ #include "hw/qdev-properties.h" #include "hw/arm/allwinner-a10.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" #include "hw/i2c/i2c.h" =20 static struct arm_boot_info cubieboard_binfo =3D { @@ -125,4 +126,4 @@ static void cubieboard_machine_init(MachineClass *mc) mc->auto_create_sdcard =3D true; } =20 -DEFINE_MACHINE("cubieboard", cubieboard_machine_init) +DEFINE_MACHINE_ARM("cubieboard", cubieboard_machine_init) diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c index de56991baca..23b596d0c81 100644 --- a/hw/arm/digic_boards.c +++ b/hw/arm/digic_boards.c @@ -29,6 +29,7 @@ #include "hw/boards.h" #include "qemu/error-report.h" #include "hw/arm/digic.h" +#include "hw/arm/machines-qom.h" #include "hw/block/flash.h" #include "hw/loader.h" #include "system/qtest.h" @@ -145,4 +146,4 @@ static void canon_a1100_machine_init(MachineClass *mc) mc->default_ram_id =3D "ram"; } =20 -DEFINE_MACHINE("canon-a1100", canon_a1100_machine_init) +DEFINE_MACHINE_ARM("canon-a1100", canon_a1100_machine_init) diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c index 73049741312..89f0e944632 100644 --- a/hw/arm/exynos4_boards.c +++ b/hw/arm/exynos4_boards.c @@ -28,6 +28,7 @@ #include "hw/sysbus.h" #include "net/net.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" #include "system/address-spaces.h" #include "hw/arm/exynos4210.h" #include "hw/net/lan9118.h" @@ -172,6 +173,7 @@ static const TypeInfo nuri_type =3D { .name =3D MACHINE_TYPE_NAME("nuri"), .parent =3D TYPE_MACHINE, .class_init =3D nuri_class_init, + .interfaces =3D arm_machine_interfaces, }; =20 static void smdkc210_class_init(ObjectClass *oc, const void *data) @@ -192,6 +194,7 @@ static const TypeInfo smdkc210_type =3D { .name =3D MACHINE_TYPE_NAME("smdkc210"), .parent =3D TYPE_MACHINE, .class_init =3D smdkc210_class_init, + .interfaces =3D arm_machine_interfaces, }; =20 static void exynos4_machines_init(void) diff --git a/hw/arm/fby35.c b/hw/arm/fby35.c index 5a94c847d36..70d3a99d79e 100644 --- a/hw/arm/fby35.c +++ b/hw/arm/fby35.c @@ -14,6 +14,7 @@ #include "hw/qdev-clock.h" #include "hw/arm/aspeed_soc.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" =20 #define TYPE_FBY35 MACHINE_TYPE_NAME("fby35") OBJECT_DECLARE_SIMPLE_TYPE(Fby35State, FBY35); @@ -194,6 +195,7 @@ static const TypeInfo fby35_types[] =3D { .class_init =3D fby35_class_init, .instance_size =3D sizeof(Fby35State), .instance_init =3D fby35_instance_init, + .interfaces =3D arm_machine_interfaces, }, }; =20 diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c index ff987467a99..bd60ab26898 100644 --- a/hw/arm/highbank.c +++ b/hw/arm/highbank.c @@ -23,6 +23,7 @@ #include "hw/sysbus.h" #include "migration/vmstate.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" #include "hw/loader.h" #include "net/net.h" #include "system/runstate.h" @@ -365,6 +366,7 @@ static const TypeInfo highbank_type =3D { .name =3D MACHINE_TYPE_NAME("highbank"), .parent =3D TYPE_MACHINE, .class_init =3D highbank_class_init, + .interfaces =3D arm_machine_interfaces, }; =20 static void midway_class_init(ObjectClass *oc, const void *data) @@ -390,6 +392,7 @@ static const TypeInfo midway_type =3D { .name =3D MACHINE_TYPE_NAME("midway"), .parent =3D TYPE_MACHINE, .class_init =3D midway_class_init, + .interfaces =3D arm_machine_interfaces, }; =20 static void calxeda_machines_init(void) diff --git a/hw/arm/imx25_pdk.c b/hw/arm/imx25_pdk.c index e95ea5e4e18..71a46062032 100644 --- a/hw/arm/imx25_pdk.c +++ b/hw/arm/imx25_pdk.c @@ -28,6 +28,7 @@ #include "hw/qdev-properties.h" #include "hw/arm/fsl-imx25.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" #include "hw/boards.h" #include "qemu/error-report.h" #include "system/qtest.h" @@ -150,4 +151,4 @@ static void imx25_pdk_machine_init(MachineClass *mc) mc->auto_create_sdcard =3D true; } =20 -DEFINE_MACHINE("imx25-pdk", imx25_pdk_machine_init) +DEFINE_MACHINE_ARM("imx25-pdk", imx25_pdk_machine_init) diff --git a/hw/arm/imx8mp-evk.c b/hw/arm/imx8mp-evk.c index b3082fa60d8..a40443fb0a7 100644 --- a/hw/arm/imx8mp-evk.c +++ b/hw/arm/imx8mp-evk.c @@ -10,6 +10,7 @@ #include "system/address-spaces.h" #include "hw/arm/boot.h" #include "hw/arm/fsl-imx8mp.h" +#include "hw/arm/machines-qom.h" #include "hw/boards.h" #include "hw/qdev-properties.h" #include "system/qtest.h" @@ -100,4 +101,5 @@ static void imx8mp_evk_machine_init(MachineClass *mc) mc->max_cpus =3D FSL_IMX8MP_NUM_CPUS; mc->default_ram_id =3D "imx8mp-evk.ram"; } -DEFINE_MACHINE("imx8mp-evk", imx8mp_evk_machine_init) + +DEFINE_MACHINE_AARCH64("imx8mp", imx8mp_evk_machine_init) diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c index b1d8fbd470a..031380aada2 100644 --- a/hw/arm/integratorcp.c +++ b/hw/arm/integratorcp.c @@ -13,6 +13,7 @@ #include "migration/vmstate.h" #include "hw/boards.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" #include "hw/misc/arm_integrator_debug.h" #include "hw/net/smc91c111.h" #include "net/net.h" @@ -693,7 +694,7 @@ static void integratorcp_machine_init(MachineClass *mc) machine_add_audiodev_property(mc); } =20 -DEFINE_MACHINE("integratorcp", integratorcp_machine_init) +DEFINE_MACHINE_ARM("integratorcp", integratorcp_machine_init) =20 static const Property core_properties[] =3D { DEFINE_PROP_UINT32("memsz", IntegratorCMState, memsz, 0), diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c index 362c1454099..b446dc15470 100644 --- a/hw/arm/kzm.c +++ b/hw/arm/kzm.c @@ -17,6 +17,7 @@ #include "qapi/error.h" #include "hw/arm/fsl-imx31.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" #include "hw/boards.h" #include "qemu/error-report.h" #include "system/address-spaces.h" @@ -139,4 +140,4 @@ static void kzm_machine_init(MachineClass *mc) mc->default_ram_id =3D "kzm.ram"; } =20 -DEFINE_MACHINE("kzm", kzm_machine_init) +DEFINE_MACHINE_ARM("kzm", kzm_machine_init) diff --git a/hw/arm/mcimx6ul-evk.c b/hw/arm/mcimx6ul-evk.c index 86982cb0772..f47a265650e 100644 --- a/hw/arm/mcimx6ul-evk.c +++ b/hw/arm/mcimx6ul-evk.c @@ -14,6 +14,7 @@ #include "qapi/error.h" #include "hw/arm/fsl-imx6ul.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" #include "hw/boards.h" #include "hw/qdev-properties.h" #include "qemu/error-report.h" @@ -76,4 +77,5 @@ static void mcimx6ul_evk_machine_init(MachineClass *mc) mc->default_ram_id =3D "mcimx6ul-evk.ram"; mc->auto_create_sdcard =3D true; } -DEFINE_MACHINE("mcimx6ul-evk", mcimx6ul_evk_machine_init) + +DEFINE_MACHINE_ARM("mcimx6ul-evk", mcimx6ul_evk_machine_init) diff --git a/hw/arm/mcimx7d-sabre.c b/hw/arm/mcimx7d-sabre.c index 33119610113..fc8f35c5810 100644 --- a/hw/arm/mcimx7d-sabre.c +++ b/hw/arm/mcimx7d-sabre.c @@ -16,6 +16,7 @@ #include "qapi/error.h" #include "hw/arm/fsl-imx7.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" #include "hw/boards.h" #include "hw/qdev-properties.h" #include "qemu/error-report.h" @@ -76,4 +77,5 @@ static void mcimx7d_sabre_machine_init(MachineClass *mc) mc->default_ram_id =3D "mcimx7d-sabre.ram"; mc->auto_create_sdcard =3D true; } -DEFINE_MACHINE("mcimx7d-sabre", mcimx7d_sabre_machine_init) + +DEFINE_MACHINE_ARM("mcimx7d-sabre", mcimx7d_sabre_machine_init) diff --git a/hw/arm/microbit.c b/hw/arm/microbit.c index 525443fdb97..0f3161fd931 100644 --- a/hw/arm/microbit.c +++ b/hw/arm/microbit.c @@ -12,6 +12,7 @@ #include "qapi/error.h" #include "hw/boards.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" #include "system/system.h" #include "system/address-spaces.h" =20 @@ -74,6 +75,7 @@ static const TypeInfo microbit_info =3D { .parent =3D TYPE_MACHINE, .instance_size =3D sizeof(MicrobitMachineState), .class_init =3D microbit_machine_class_init, + .interfaces =3D arm_machine_interfaces, }; =20 static void microbit_machine_init(void) diff --git a/hw/arm/mps2-tz.c b/hw/arm/mps2-tz.c index 5dd87cc0281..55dd68c57e1 100644 --- a/hw/arm/mps2-tz.c +++ b/hw/arm/mps2-tz.c @@ -52,6 +52,7 @@ #include "qemu/error-report.h" #include "hw/arm/boot.h" #include "hw/arm/armv7m.h" +#include "hw/arm/machines-qom.h" #include "hw/or-irq.h" #include "hw/boards.h" #include "system/address-spaces.h" @@ -1463,24 +1464,28 @@ static const TypeInfo mps2tz_an505_info =3D { .name =3D TYPE_MPS2TZ_AN505_MACHINE, .parent =3D TYPE_MPS2TZ_MACHINE, .class_init =3D mps2tz_an505_class_init, + .interfaces =3D arm_machine_interfaces, }; =20 static const TypeInfo mps2tz_an521_info =3D { .name =3D TYPE_MPS2TZ_AN521_MACHINE, .parent =3D TYPE_MPS2TZ_MACHINE, .class_init =3D mps2tz_an521_class_init, + .interfaces =3D arm_machine_interfaces, }; =20 static const TypeInfo mps3tz_an524_info =3D { .name =3D TYPE_MPS3TZ_AN524_MACHINE, .parent =3D TYPE_MPS2TZ_MACHINE, .class_init =3D mps3tz_an524_class_init, + .interfaces =3D arm_machine_interfaces, }; =20 static const TypeInfo mps3tz_an547_info =3D { .name =3D TYPE_MPS3TZ_AN547_MACHINE, .parent =3D TYPE_MPS2TZ_MACHINE, .class_init =3D mps3tz_an547_class_init, + .interfaces =3D arm_machine_interfaces, }; =20 static void mps2tz_machine_init(void) diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c index bd378e360b0..fa4b200577f 100644 --- a/hw/arm/mps2.c +++ b/hw/arm/mps2.c @@ -31,6 +31,7 @@ #include "qemu/error-report.h" #include "hw/arm/boot.h" #include "hw/arm/armv7m.h" +#include "hw/arm/machines-qom.h" #include "hw/or-irq.h" #include "hw/boards.h" #include "system/address-spaces.h" @@ -567,24 +568,28 @@ static const TypeInfo mps2_an385_info =3D { .name =3D TYPE_MPS2_AN385_MACHINE, .parent =3D TYPE_MPS2_MACHINE, .class_init =3D mps2_an385_class_init, + .interfaces =3D arm_machine_interfaces, }; =20 static const TypeInfo mps2_an386_info =3D { .name =3D TYPE_MPS2_AN386_MACHINE, .parent =3D TYPE_MPS2_MACHINE, .class_init =3D mps2_an386_class_init, + .interfaces =3D arm_machine_interfaces, }; =20 static const TypeInfo mps2_an500_info =3D { .name =3D TYPE_MPS2_AN500_MACHINE, .parent =3D TYPE_MPS2_MACHINE, .class_init =3D mps2_an500_class_init, + .interfaces =3D arm_machine_interfaces, }; =20 static const TypeInfo mps2_an511_info =3D { .name =3D TYPE_MPS2_AN511_MACHINE, .parent =3D TYPE_MPS2_MACHINE, .class_init =3D mps2_an511_class_init, + .interfaces =3D arm_machine_interfaces, }; =20 static void mps2_machine_init(void) diff --git a/hw/arm/mps3r.c b/hw/arm/mps3r.c index 48c73acc62e..fcb8777cafd 100644 --- a/hw/arm/mps3r.c +++ b/hw/arm/mps3r.c @@ -37,6 +37,7 @@ #include "hw/qdev-properties.h" #include "hw/arm/boot.h" #include "hw/arm/bsa.h" +#include "hw/arm/machines-qom.h" #include "hw/char/cmsdk-apb-uart.h" #include "hw/i2c/arm_sbcon_i2c.h" #include "hw/intc/arm_gicv3.h" @@ -634,6 +635,7 @@ static const TypeInfo mps3r_machine_types[] =3D { .name =3D TYPE_MPS3R_AN536_MACHINE, .parent =3D TYPE_MPS3R_MACHINE, .class_init =3D mps3r_an536_class_init, + .interfaces =3D arm_machine_interfaces, }, }; =20 diff --git a/hw/arm/msf2-som.c b/hw/arm/msf2-som.c index 29c76c68605..c26feccb15b 100644 --- a/hw/arm/msf2-som.c +++ b/hw/arm/msf2-som.c @@ -32,6 +32,7 @@ #include "hw/boards.h" #include "hw/qdev-properties.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" #include "hw/qdev-clock.h" #include "system/address-spaces.h" #include "hw/arm/msf2-soc.h" @@ -108,4 +109,4 @@ static void emcraft_sf2_machine_init(MachineClass *mc) mc->valid_cpu_types =3D valid_cpu_types; } =20 -DEFINE_MACHINE("emcraft-sf2", emcraft_sf2_machine_init) +DEFINE_MACHINE_ARM("emcraft-sf2", emcraft_sf2_machine_init) diff --git a/hw/arm/musca.c b/hw/arm/musca.c index 250b3b5bf84..a3494c96bf4 100644 --- a/hw/arm/musca.c +++ b/hw/arm/musca.c @@ -26,6 +26,7 @@ #include "system/system.h" #include "hw/arm/boot.h" #include "hw/arm/armsse.h" +#include "hw/arm/machines-qom.h" #include "hw/boards.h" #include "hw/char/pl011.h" #include "hw/core/split-irq.h" @@ -657,12 +658,14 @@ static const TypeInfo musca_a_info =3D { .name =3D TYPE_MUSCA_A_MACHINE, .parent =3D TYPE_MUSCA_MACHINE, .class_init =3D musca_a_class_init, + .interfaces =3D arm_machine_interfaces, }; =20 static const TypeInfo musca_b1_info =3D { .name =3D TYPE_MUSCA_B1_MACHINE, .parent =3D TYPE_MUSCA_MACHINE, .class_init =3D musca_b1_class_init, + .interfaces =3D arm_machine_interfaces, }; =20 static void musca_machine_init(void) diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index 329b162eb20..1ae7cbd95c8 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -15,6 +15,7 @@ #include "hw/sysbus.h" #include "migration/vmstate.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" #include "net/net.h" #include "system/system.h" #include "hw/boards.h" @@ -1346,7 +1347,7 @@ static void musicpal_machine_init(MachineClass *mc) machine_add_audiodev_property(mc); } =20 -DEFINE_MACHINE("musicpal", musicpal_machine_init) +DEFINE_MACHINE_ARM("musicpal", musicpal_machine_init) =20 static void mv88w8618_wlan_class_init(ObjectClass *klass, const void *data) { diff --git a/hw/arm/netduino2.c b/hw/arm/netduino2.c index df793c77fe1..bce0d6f87a9 100644 --- a/hw/arm/netduino2.c +++ b/hw/arm/netduino2.c @@ -30,6 +30,7 @@ #include "qemu/error-report.h" #include "hw/arm/stm32f205_soc.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" =20 /* Main SYSCLK frequency in Hz (120MHz) */ #define SYSCLK_FRQ 120000000ULL @@ -65,4 +66,4 @@ static void netduino2_machine_init(MachineClass *mc) mc->ignore_memory_transaction_failures =3D true; } =20 -DEFINE_MACHINE("netduino2", netduino2_machine_init) +DEFINE_MACHINE_ARM("netduino2", netduino2_machine_init) diff --git a/hw/arm/netduinoplus2.c b/hw/arm/netduinoplus2.c index 81b6334cf72..8594081fe47 100644 --- a/hw/arm/netduinoplus2.c +++ b/hw/arm/netduinoplus2.c @@ -30,6 +30,7 @@ #include "qemu/error-report.h" #include "hw/arm/stm32f405_soc.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" =20 /* Main SYSCLK frequency in Hz (168MHz) */ #define SYSCLK_FRQ 168000000ULL @@ -65,4 +66,4 @@ static void netduinoplus2_machine_init(MachineClass *mc) mc->valid_cpu_types =3D valid_cpu_types; } =20 -DEFINE_MACHINE("netduinoplus2", netduinoplus2_machine_init) +DEFINE_MACHINE_ARM("netduinoplus2", netduinoplus2_machine_init) diff --git a/hw/arm/npcm7xx_boards.c b/hw/arm/npcm7xx_boards.c index 465a0e5acec..c1e100b1e48 100644 --- a/hw/arm/npcm7xx_boards.c +++ b/hw/arm/npcm7xx_boards.c @@ -17,6 +17,7 @@ #include "qemu/osdep.h" =20 #include "hw/arm/npcm7xx.h" +#include "hw/arm/machines-qom.h" #include "hw/core/cpu.h" #include "hw/i2c/i2c_mux_pca954x.h" #include "hw/i2c/smbus_eeprom.h" @@ -549,22 +550,27 @@ static const TypeInfo npcm7xx_machine_types[] =3D { .name =3D MACHINE_TYPE_NAME("npcm750-evb"), .parent =3D TYPE_NPCM7XX_MACHINE, .class_init =3D npcm750_evb_machine_class_init, + .interfaces =3D arm_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("quanta-gsj"), .parent =3D TYPE_NPCM7XX_MACHINE, .class_init =3D gsj_machine_class_init, + .interfaces =3D arm_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("quanta-gbs-bmc"), .parent =3D TYPE_NPCM7XX_MACHINE, .class_init =3D gbs_bmc_machine_class_init, + .interfaces =3D arm_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("kudo-bmc"), .parent =3D TYPE_NPCM7XX_MACHINE, .class_init =3D kudo_bmc_machine_class_init, + .interfaces =3D arm_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("mori-bmc"), .parent =3D TYPE_NPCM7XX_MACHINE, .class_init =3D mori_bmc_machine_class_init, + .interfaces =3D arm_machine_interfaces, }, }; =20 diff --git a/hw/arm/npcm8xx_boards.c b/hw/arm/npcm8xx_boards.c index 3bf3e1f8f16..b179eadef53 100644 --- a/hw/arm/npcm8xx_boards.c +++ b/hw/arm/npcm8xx_boards.c @@ -19,6 +19,7 @@ #include "chardev/char.h" #include "hw/boards.h" #include "hw/arm/npcm8xx.h" +#include "hw/arm/machines-qom.h" #include "hw/core/cpu.h" #include "hw/loader.h" #include "hw/qdev-core.h" @@ -248,6 +249,7 @@ static const TypeInfo npcm8xx_machine_types[] =3D { .name =3D MACHINE_TYPE_NAME("npcm845-evb"), .parent =3D TYPE_NPCM8XX_MACHINE, .class_init =3D npcm845_evb_machine_class_init, + .interfaces =3D aarch64_machine_interfaces, }, }; =20 diff --git a/hw/arm/olimex-stm32-h405.c b/hw/arm/olimex-stm32-h405.c index 1f15620f9fd..c5f60383335 100644 --- a/hw/arm/olimex-stm32-h405.c +++ b/hw/arm/olimex-stm32-h405.c @@ -31,6 +31,7 @@ #include "qemu/error-report.h" #include "hw/arm/stm32f405_soc.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" =20 /* olimex-stm32-h405 implementation is derived from netduinoplus2 */ =20 @@ -71,4 +72,4 @@ static void olimex_stm32_h405_machine_init(MachineClass *= mc) mc->default_ram_size =3D 0; } =20 -DEFINE_MACHINE("olimex-stm32-h405", olimex_stm32_h405_machine_init) +DEFINE_MACHINE_ARM("olimex-stm32-h405", olimex_stm32_h405_machine_init) diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c index 5d4a31b7aed..730525be2dc 100644 --- a/hw/arm/omap_sx1.c +++ b/hw/arm/omap_sx1.c @@ -32,6 +32,7 @@ #include "hw/arm/omap.h" #include "hw/boards.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" #include "hw/block/flash.h" #include "system/qtest.h" #include "system/address-spaces.h" @@ -219,6 +220,7 @@ static const TypeInfo sx1_machine_v2_type =3D { .name =3D MACHINE_TYPE_NAME("sx1"), .parent =3D TYPE_MACHINE, .class_init =3D sx1_machine_v2_class_init, + .interfaces =3D arm_machine_interfaces, }; =20 static void sx1_machine_v1_class_init(ObjectClass *oc, const void *data) @@ -238,6 +240,7 @@ static const TypeInfo sx1_machine_v1_type =3D { .name =3D MACHINE_TYPE_NAME("sx1-v1"), .parent =3D TYPE_MACHINE, .class_init =3D sx1_machine_v1_class_init, + .interfaces =3D arm_machine_interfaces, }; =20 static void sx1_machine_init(void) diff --git a/hw/arm/orangepi.c b/hw/arm/orangepi.c index e0956880d11..3e237e78fa1 100644 --- a/hw/arm/orangepi.c +++ b/hw/arm/orangepi.c @@ -26,6 +26,7 @@ #include "hw/qdev-properties.h" #include "hw/arm/allwinner-h3.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" =20 static struct arm_boot_info orangepi_binfo; =20 @@ -124,4 +125,4 @@ static void orangepi_machine_init(MachineClass *mc) mc->auto_create_sdcard =3D true; } =20 -DEFINE_MACHINE("orangepi-pc", orangepi_machine_init) +DEFINE_MACHINE_ARM("orangepi-pc", orangepi_machine_init) diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index fbf3e09c030..81d2fa1b67d 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -25,6 +25,7 @@ #include "hw/boards.h" #include "hw/loader.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" #include "qom/object.h" =20 #define TYPE_RASPI_MACHINE MACHINE_TYPE_NAME("raspi-common") @@ -394,23 +395,28 @@ static const TypeInfo raspi_machine_types[] =3D { .name =3D MACHINE_TYPE_NAME("raspi0"), .parent =3D TYPE_RASPI_MACHINE, .class_init =3D raspi0_machine_class_init, + .interfaces =3D arm_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("raspi1ap"), .parent =3D TYPE_RASPI_MACHINE, .class_init =3D raspi1ap_machine_class_init, + .interfaces =3D arm_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("raspi2b"), .parent =3D TYPE_RASPI_MACHINE, .class_init =3D raspi2b_machine_class_init, + .interfaces =3D arm_machine_interfaces, #ifdef TARGET_AARCH64 }, { .name =3D MACHINE_TYPE_NAME("raspi3ap"), .parent =3D TYPE_RASPI_MACHINE, .class_init =3D raspi3ap_machine_class_init, + .interfaces =3D aarch64_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("raspi3b"), .parent =3D TYPE_RASPI_MACHINE, .class_init =3D raspi3b_machine_class_init, + .interfaces =3D aarch64_machine_interfaces, #endif }, { .name =3D TYPE_RASPI_MACHINE, diff --git a/hw/arm/raspi4b.c b/hw/arm/raspi4b.c index 4df951a0d82..0422ae0f00b 100644 --- a/hw/arm/raspi4b.c +++ b/hw/arm/raspi4b.c @@ -11,6 +11,7 @@ #include "qemu/cutils.h" #include "qapi/error.h" #include "qapi/visitor.h" +#include "hw/arm/machines-qom.h" #include "hw/arm/raspi_platform.h" #include "hw/display/bcm2835_fb.h" #include "hw/registerfields.h" @@ -123,6 +124,7 @@ static const TypeInfo raspi4b_machine_type =3D { .parent =3D TYPE_RASPI_BASE_MACHINE, .instance_size =3D sizeof(Raspi4bMachineState), .class_init =3D raspi4b_machine_class_init, + .interfaces =3D aarch64_machine_interfaces, }; =20 static void raspi4b_machine_register_type(void) diff --git a/hw/arm/realview.c b/hw/arm/realview.c index 5c9050490b4..b940cbf2c11 100644 --- a/hw/arm/realview.c +++ b/hw/arm/realview.c @@ -13,6 +13,7 @@ #include "hw/sysbus.h" #include "hw/arm/boot.h" #include "hw/arm/primecell.h" +#include "hw/arm/machines-qom.h" #include "hw/core/split-irq.h" #include "hw/net/lan9118.h" #include "hw/net/smc91c111.h" @@ -431,6 +432,7 @@ static const TypeInfo realview_eb_type =3D { .name =3D MACHINE_TYPE_NAME("realview-eb"), .parent =3D TYPE_MACHINE, .class_init =3D realview_eb_class_init, + .interfaces =3D arm_machine_interfaces, }; =20 static void realview_eb_mpcore_class_init(ObjectClass *oc, const void *dat= a) @@ -452,6 +454,7 @@ static const TypeInfo realview_eb_mpcore_type =3D { .name =3D MACHINE_TYPE_NAME("realview-eb-mpcore"), .parent =3D TYPE_MACHINE, .class_init =3D realview_eb_mpcore_class_init, + .interfaces =3D arm_machine_interfaces, }; =20 static void realview_pb_a8_class_init(ObjectClass *oc, const void *data) @@ -471,6 +474,7 @@ static const TypeInfo realview_pb_a8_type =3D { .name =3D MACHINE_TYPE_NAME("realview-pb-a8"), .parent =3D TYPE_MACHINE, .class_init =3D realview_pb_a8_class_init, + .interfaces =3D arm_machine_interfaces, }; =20 static void realview_pbx_a9_class_init(ObjectClass *oc, const void *data) @@ -491,6 +495,7 @@ static const TypeInfo realview_pbx_a9_type =3D { .name =3D MACHINE_TYPE_NAME("realview-pbx-a9"), .parent =3D TYPE_MACHINE, .class_init =3D realview_pbx_a9_class_init, + .interfaces =3D arm_machine_interfaces, }; =20 static void realview_machine_init(void) diff --git a/hw/arm/sabrelite.c b/hw/arm/sabrelite.c index df60d47c6fd..5b4ab7d77a5 100644 --- a/hw/arm/sabrelite.c +++ b/hw/arm/sabrelite.c @@ -14,6 +14,7 @@ #include "qapi/error.h" #include "hw/arm/fsl-imx6.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" #include "hw/boards.h" #include "hw/qdev-properties.h" #include "qemu/error-report.h" @@ -113,4 +114,4 @@ static void sabrelite_machine_init(MachineClass *mc) mc->auto_create_sdcard =3D true; } =20 -DEFINE_MACHINE("sabrelite", sabrelite_machine_init) +DEFINE_MACHINE_ARM("sabrelite", sabrelite_machine_init) diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c index 15c1ff4b140..cf6e6eb208a 100644 --- a/hw/arm/sbsa-ref.c +++ b/hw/arm/sbsa-ref.c @@ -35,6 +35,7 @@ #include "hw/arm/bsa.h" #include "hw/arm/fdt.h" #include "hw/arm/smmuv3.h" +#include "hw/arm/machines-qom.h" #include "hw/block/flash.h" #include "hw/boards.h" #include "hw/ide/ide-bus.h" @@ -922,6 +923,7 @@ static const TypeInfo sbsa_ref_info =3D { .instance_init =3D sbsa_ref_instance_init, .class_init =3D sbsa_ref_class_init, .instance_size =3D sizeof(SBSAMachineState), + .interfaces =3D aarch64_machine_interfaces, }; =20 static void sbsa_ref_machine_init(void) diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c index 031ea3a24e7..8113bbd5d8b 100644 --- a/hw/arm/stellaris.c +++ b/hw/arm/stellaris.c @@ -15,6 +15,7 @@ #include "hw/sd/sd.h" #include "hw/ssi/ssi.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" #include "qemu/timer.h" #include "hw/i2c/i2c.h" #include "net/net.h" @@ -1427,6 +1428,7 @@ static const TypeInfo lm3s811evb_type =3D { .name =3D MACHINE_TYPE_NAME("lm3s811evb"), .parent =3D TYPE_MACHINE, .class_init =3D lm3s811evb_class_init, + .interfaces =3D arm_machine_interfaces, }; =20 /* @@ -1448,6 +1450,7 @@ static const TypeInfo lm3s6965evb_type =3D { .name =3D MACHINE_TYPE_NAME("lm3s6965evb"), .parent =3D TYPE_MACHINE, .class_init =3D lm3s6965evb_class_init, + .interfaces =3D arm_machine_interfaces, }; =20 static void stellaris_machine_init(void) diff --git a/hw/arm/stm32vldiscovery.c b/hw/arm/stm32vldiscovery.c index e6c1f5b8d7d..c11029f8bd4 100644 --- a/hw/arm/stm32vldiscovery.c +++ b/hw/arm/stm32vldiscovery.c @@ -31,6 +31,7 @@ #include "qemu/error-report.h" #include "hw/arm/stm32f100_soc.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" =20 /* stm32vldiscovery implementation is derived from netduinoplus2 */ =20 @@ -68,4 +69,4 @@ static void stm32vldiscovery_machine_init(MachineClass *m= c) mc->valid_cpu_types =3D valid_cpu_types; } =20 -DEFINE_MACHINE("stm32vldiscovery", stm32vldiscovery_machine_init) +DEFINE_MACHINE_ARM("stm32vldiscovery", stm32vldiscovery_machine_init) diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c index 5cf1a70d10d..6fc1e62789e 100644 --- a/hw/arm/versatilepb.c +++ b/hw/arm/versatilepb.c @@ -12,6 +12,7 @@ #include "hw/sysbus.h" #include "migration/vmstate.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" #include "hw/net/smc91c111.h" #include "net/net.h" #include "system/system.h" @@ -431,6 +432,7 @@ static const TypeInfo versatilepb_type =3D { .name =3D MACHINE_TYPE_NAME("versatilepb"), .parent =3D TYPE_MACHINE, .class_init =3D versatilepb_class_init, + .interfaces =3D arm_machine_interfaces, }; =20 static void versatileab_class_init(ObjectClass *oc, const void *data) @@ -452,6 +454,7 @@ static const TypeInfo versatileab_type =3D { .name =3D MACHINE_TYPE_NAME("versatileab"), .parent =3D TYPE_MACHINE, .class_init =3D versatileab_class_init, + .interfaces =3D arm_machine_interfaces, }; =20 static void versatile_machine_init(void) diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index 60cd375fe75..f30923a658c 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -27,6 +27,7 @@ #include "hw/sysbus.h" #include "hw/arm/boot.h" #include "hw/arm/primecell.h" +#include "hw/arm/machines-qom.h" #include "hw/net/lan9118.h" #include "hw/i2c/i2c.h" #include "net/net.h" @@ -850,6 +851,7 @@ static const TypeInfo vexpress_a9_info =3D { .parent =3D TYPE_VEXPRESS_MACHINE, .class_init =3D vexpress_a9_class_init, .instance_init =3D vexpress_a9_instance_init, + .interfaces =3D arm_machine_interfaces, }; =20 static const TypeInfo vexpress_a15_info =3D { @@ -857,6 +859,7 @@ static const TypeInfo vexpress_a15_info =3D { .parent =3D TYPE_VEXPRESS_MACHINE, .class_init =3D vexpress_a15_class_init, .instance_init =3D vexpress_a15_instance_init, + .interfaces =3D arm_machine_interfaces, }; =20 static void vexpress_machine_init(void) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 175023897a7..20e3f1094cb 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -37,6 +37,7 @@ #include "hw/arm/boot.h" #include "hw/arm/primecell.h" #include "hw/arm/virt.h" +#include "hw/arm/machines-qom.h" #include "hw/block/flash.h" #include "hw/display/ramfb.h" #include "net/net.h" @@ -127,6 +128,7 @@ static void arm_virt_compat_set(MachineClass *mc) .name =3D MACHINE_VER_TYPE_NAME("virt", __VA_ARGS__), \ .parent =3D TYPE_VIRT_MACHINE, \ .class_init =3D MACHINE_VER_SYM(class_init, virt, __VA_ARGS__), \ + .interfaces =3D arm_aarch64_machine_interfaces, \ }; \ static void MACHINE_VER_SYM(register, virt, __VA_ARGS__)(void) \ { \ diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index 0372cd0ac46..c82edd3bed1 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -20,6 +20,7 @@ #include "qapi/error.h" #include "hw/sysbus.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" #include "net/net.h" #include "system/system.h" #include "hw/boards.h" @@ -480,6 +481,7 @@ static const TypeInfo zynq_machine_type =3D { .parent =3D TYPE_MACHINE, .class_init =3D zynq_machine_class_init, .instance_size =3D sizeof(ZynqMachineState), + .interfaces =3D arm_machine_interfaces, }; =20 static void zynq_machine_register_types(void) diff --git a/hw/arm/xlnx-versal-virt.c b/hw/arm/xlnx-versal-virt.c index 149b448546e..5e05521a572 100644 --- a/hw/arm/xlnx-versal-virt.c +++ b/hw/arm/xlnx-versal-virt.c @@ -21,6 +21,7 @@ #include "hw/arm/fdt.h" #include "hw/arm/xlnx-versal.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" #include "qom/object.h" #include "target/arm/cpu.h" =20 @@ -401,12 +402,14 @@ static const TypeInfo versal_virt_machine_init_typein= fo =3D { .name =3D TYPE_XLNX_VERSAL_VIRT_MACHINE, .parent =3D TYPE_XLNX_VERSAL_VIRT_BASE_MACHINE, .class_init =3D versal_virt_machine_class_init, + .interfaces =3D aarch64_machine_interfaces, }; =20 static const TypeInfo versal2_virt_machine_init_typeinfo =3D { .name =3D TYPE_XLNX_VERSAL2_VIRT_MACHINE, .parent =3D TYPE_XLNX_VERSAL_VIRT_BASE_MACHINE, .class_init =3D versal2_virt_machine_class_init, + .interfaces =3D aarch64_machine_interfaces, }; =20 static void versal_virt_machine_init_register_types(void) diff --git a/hw/arm/xlnx-zcu102.c b/hw/arm/xlnx-zcu102.c index 14b6641a713..330f375f63a 100644 --- a/hw/arm/xlnx-zcu102.c +++ b/hw/arm/xlnx-zcu102.c @@ -19,6 +19,7 @@ #include "qapi/error.h" #include "hw/arm/xlnx-zynqmp.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" #include "hw/boards.h" #include "qemu/error-report.h" #include "qemu/log.h" @@ -303,6 +304,7 @@ static const TypeInfo xlnx_zcu102_machine_init_typeinfo= =3D { .class_init =3D xlnx_zcu102_machine_class_init, .instance_init =3D xlnx_zcu102_machine_instance_init, .instance_size =3D sizeof(XlnxZCU102), + .interfaces =3D aarch64_machine_interfaces, }; =20 static void xlnx_zcu102_machine_init_register_types(void) --=20 2.51.0 From nobody Fri Nov 14 18:19:16 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=1761774452; cv=none; d=zohomail.com; s=zohoarc; b=huVTsn03ckLrSAkI/W/kB6xjGLhGbZuUtz5RKpoAj/+j3RCVawUEhO4v65CThJ2VkjGCFBTs8S6EvTpdTfNExlwuo66b+9ErJX6MioJFAAQW/QLhcFClu3lOeC+3jkOGlH0rM0kl52Ct3ts/jw6nfshaPI22Q+RqxPuvBmUhpac= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761774452; 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=KyYtKOwHSiL8zG4F6RP7X5U6pXWzdyE6rU1IyLJB564=; b=MHDi47WK2DyVoaZm+hqb9ej1vDJbe/H4QsPeMaPm03BCJR70T3mmAQdmZP/4lJeyfVejnplaoYTevtspAI3gG/Pz8lU6UTISZ7knZxdX6t4bKHTGh5v8J9I1KW3wrEB5dFtTnZ7LjcEM252lPeu3eFTML//9Wr7sY20DoaEwEog= 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 1761774452692649.6176054020499; Wed, 29 Oct 2025 14:47:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vEDzP-000087-1V; Wed, 29 Oct 2025 17:45:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vEDz7-0008R0-AZ for qemu-devel@nongnu.org; Wed, 29 Oct 2025 17:45:40 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vEDys-0006Fu-5x for qemu-devel@nongnu.org; Wed, 29 Oct 2025 17:45:35 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-4711b95226dso4287805e9.0 for ; Wed, 29 Oct 2025 14:45:16 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-477184251c4sm55622275e9.1.2025.10.29.14.45.10 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 29 Oct 2025 14:45:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761774312; x=1762379112; 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=KyYtKOwHSiL8zG4F6RP7X5U6pXWzdyE6rU1IyLJB564=; b=EBLl8U0AWwrMQsgQ8hhARODVV7DFfO9YnYCVmSHZG4cxBI7lRWIjtdZ4ZVqnHIlbos phZgY+phFe3eEGXnWFSZam5U21ZeVplpGJzGj4h63mXgPIrWmwhCeBsXPwjKp2d0oO7i Qtbq30OwIWgdvX2HCXOtU7Yv6uB3d5vHvM4+eS6rJ9+kaTJYhGImbeM9qEO6O/aANtzF +nDjYHu+RTJL8VWlE83OvK0q3/OeCqKX8ST3wNJUlPtk0vyEi915eu//vMfzjcWg+fdw BVQg6PZz4Xgvx1KykXMx+8i2+qLclQvIjA0l35ztUU+Cwh1S5eqH9DIhQ8+EO/epe5bw FTfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761774312; x=1762379112; 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=KyYtKOwHSiL8zG4F6RP7X5U6pXWzdyE6rU1IyLJB564=; b=bzsMCNLILTEj9u0oc0UL4jMh2HFLqdtuGOfZ2nMbSqczUX6BRLsBKCrsl1a9kdWxGU eqsUYA/yVEGif5tCSI/l5u3HlDDIscMcf9E4evmZf2OASOlW4rebsxJoN6PNVhcn6ozt IuEfQO8ox1b6Je1Tta7H8K5xixuyUB8ovIZ9jXp+M97d2axgpSmN5cnRb7lQt2hrFKcA 58cNZ7mTRtBeCFbyh9IHhyQeY1fZpK76jaifjSYgJoravnukbYoifnQDGiyiKX3oyRDR uqTVZ9ghikJUQ5LjFgF6gwIIuO15zaOLGONmjHGRzMrCZtgFE75r2u0gA+7CK7CCSiGb PQqA== X-Gm-Message-State: AOJu0Yw6YJ0/feqoagDBKWlbfdvi0/DA8lSY4DaHGT9nvf9N8qI/w66g h/1oHw3ks5MGRv8f25BYBujdxi/z56igyw2c5yDRngFDIvgi6/E14rFW6HhF6/94XpzDG/SIrjH k95l+EZ4= X-Gm-Gg: ASbGnctP9rytkvFl1iEhMwcCPCbRIZIlrE5uO50eKnHFSSV1+ZuhIRmXZA2Z9i2TzW+ J8cflXyN6B6uXni3y7MOWt0BHh/eIT9BxXmdz+ccQOfcnbCL2gG3DkKLV42GwRizROhIjPY0dm2 6jW7WHU2ygmo0MuHVc7QNxSUHdHJ/Z6Jvelb0GM3qHKkE7ou4YQmlRAKJODXIBLpb3ClyvwI5yq kba3SDNrBMleFSdUZdsFdXkX/oRUf2flV3AVC5r5EatZeAtO0k4RrBQ6xB6xy/2qbuoFS+1JiuC ouDXQwGghpyX26wHYZKdZuve97RVNSLcaae+BiJppuKUW4GB8xD3BalNpQuSsMbz9+KMihOnUo1 RZeTjaSJfgHEMs2LcaQeedjC/HNja3/5t8Rredpy9uoPyWVeg074TmvMp593hs6B6URFJsXTC4v wwTxpOnYnI59Tr7b8q4HF62gmsRNes3usMbBrilGxiF9Q/3iWkyg== X-Google-Smtp-Source: AGHT+IEAOZ5VfCCKWi0odXrscMhJ4+9p3lgqTEO9tjC7BoKxs5E3q0lBlme4LomOfKdGsZEe2fDT7Q== X-Received: by 2002:a05:600c:4709:b0:46e:3f75:da49 with SMTP id 5b1f17b1804b1-4771e406a5bmr41437155e9.37.1761774312043; Wed, 29 Oct 2025 14:45:12 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PULL 05/23] meson: Prepare to accept per-binary TargetInfo structure implementation Date: Wed, 29 Oct 2025 22:39:42 +0100 Message-ID: <20251029214001.99824-6-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251029214001.99824-1-philmd@linaro.org> References: <20251029214001.99824-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::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.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: 1761774454503154100 If a file defining the binary TargetInfo structure is available, link with it. Otherwise keep using the stub. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson Acked-by: Peter Maydell Message-Id: <20251021205741.57109-6-philmd@linaro.org> --- MAINTAINERS | 1 + meson.build | 9 ++++++++- configs/targets/meson.build | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 configs/targets/meson.build diff --git a/MAINTAINERS b/MAINTAINERS index 64491c800c2..c7faa5672a4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2007,6 +2007,7 @@ M: Philippe Mathieu-Daud=C3=A9 S: Supported F: include/qemu/target-info*.h F: target-info*.c +F: configs/targets/*.c =20 Xtensa Machines --------------- diff --git a/meson.build b/meson.build index de95da32699..df876c72f06 100644 --- a/meson.build +++ b/meson.build @@ -3312,6 +3312,7 @@ config_devices_h =3D {} config_target_h =3D {} config_target_mak =3D {} config_base_arch_mak =3D {} +config_target_info =3D {} =20 disassemblers =3D { 'alpha' : ['CONFIG_ALPHA_DIS'], @@ -3912,9 +3913,9 @@ specific_ss.add(files('page-vary-target.c')) =20 common_ss.add(files('target-info.c')) system_ss.add(files('target-info-qom.c')) -specific_ss.add(files('target-info-stub.c')) =20 subdir('backends') +subdir('configs/targets') subdir('disas') subdir('migration') subdir('monitor') @@ -4365,6 +4366,12 @@ foreach target : target_dirs arch_srcs +=3D gdbstub_xml endif =20 + if target in config_target_info + arch_srcs +=3D config_target_info[target] + else + arch_srcs +=3D files('target-info-stub.c') + endif + t =3D target_arch[target_base_arch].apply(config_target, strict: false) arch_srcs +=3D t.sources() arch_deps +=3D t.dependencies() diff --git a/configs/targets/meson.build b/configs/targets/meson.build new file mode 100644 index 00000000000..a9f6b24ec01 --- /dev/null +++ b/configs/targets/meson.build @@ -0,0 +1,4 @@ +foreach target : [ + ] + config_target_info +=3D {target : files(target + '.c')} +endforeach --=20 2.51.0 From nobody Fri Nov 14 18:19:16 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=1761774458; cv=none; d=zohomail.com; s=zohoarc; b=DRj7wgGlWSOebs/arCrYrnQQh9CRcC/STkDpHjFVSBQUd+2V7P52DNSUpfuACvG5LlviJ1OOhAJp4UvCYPV0Vh4AQ0Zq7iFfN6OjYAnBqkBr+U6I1flIWN9QJ8QEQnfPg3tum0m99+Oe0HifdzPbCzn6m5IO62ugIDD8kMM1bMo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761774458; 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=DXKvVaxZH8lCY599mLKDq3KvFOHFWntba41CF+GSKak=; b=ZmEEbdbxY8exJPtMsCGWGEtYHA7g73mOQKlYCcExr97jdorMdyoB3VeV8s2sB4XECCbo5PAL3iKbnOlNuX3mb42HosZTYbOTBP7aYocLGXm6u4aKdXAmfs93AtmT0qmJn8iNT9yia0SHFw+yjxHRq+i9ZQ06igCb2PeWEmwrsMQ= 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 1761774458356773.6319992663255; Wed, 29 Oct 2025 14:47:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vEE06-0000u0-24; Wed, 29 Oct 2025 17:46:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vEE00-0000rQ-5A for qemu-devel@nongnu.org; Wed, 29 Oct 2025 17:46:32 -0400 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 1vEDzp-0006QD-5b for qemu-devel@nongnu.org; Wed, 29 Oct 2025 17:46:31 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-3ed20bdfdffso287614f8f.2 for ; Wed, 29 Oct 2025 14:46:16 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-429952b79cbsm28468721f8f.4.2025.10.29.14.46.13 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 29 Oct 2025 14:46:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761774374; x=1762379174; 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=DXKvVaxZH8lCY599mLKDq3KvFOHFWntba41CF+GSKak=; b=xZbSGafx7JqTts/stQOL/3YQYjBZPGRC8nWdY2Yiuidw2vR60ZZ42a8oKpmIPun9HE dTLy5Iikt3zhEQXunhMPAM0Ppv1vks9rr9pA8PYTjzwhJ/+T8TtZjKeHIezyS/K61BrG c2BwpPX3eZ3d0ImgFgaVKKwvR9L99eAvQvrZ3hT82cG1oJOJFcKVybz3sF6kHglj4POE aum0vWCMqsZIwVFhofaIn85+FAdKhHZu4pUi7Z9+uJFRcd4tpwlMQVIui4oEBs48Cvne 0hHkI++anLDJto5swUvf+idXvpVzuL4EY8AUdHkyV2pj1x0IGXz6DLMi18CROCKuWYSN wt5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761774374; x=1762379174; 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=DXKvVaxZH8lCY599mLKDq3KvFOHFWntba41CF+GSKak=; b=O8VTPL5U0OL/Nn+o5wc/pU1KUxM59rhkXl/SgfOG4Hd11XVSBj73lfTLfBK/Meslrm xEUv9tBbM0ouV9BHJWwPdR7NxI5Uaqx/PHcA74EKC7dcXRzobHf2U5hNikmIYBr70U6G IBz7bUPzKDJr2rbWMD3U+EiibCbZ5YZb5mIdGXzBq+JCxxtxNr/Xj09yA9i1lYWweQ0G K4KitM+oWcWPpRP5ejNqVrXM1wo9+8PKg6HHwLOU5+YTG7BrhqRWZ5ZSxir3CuaYa5Y5 vcb9liqJ9vkz7oU7e+/lIa6ZUMusJOaMBhjGjW9V06snyiDD8WR5S9EsKZ9cPsh95Soe d1Pg== X-Gm-Message-State: AOJu0YyZxZoBfxzNDCl8DFqFcrtSIsq0OrdAJn54bqgO6eCzwxctViuj +gH3YYqe/hP7Ia25nmYCdh4GHVVG+TmHfeXTbOOAjiJlIc+W77BYJEb9MLp3AX8pr38h/bjZA80 uSzSbgys= X-Gm-Gg: ASbGnctXIx8O7ifFZiqur+eb/jvoD7EGEhOiA2FgkX2bqv2Fi2J+z7RMr0xkH0BG7Px ZR3IsamHTS5uc3gqP/V2FrDdU2juP6u+mHirU6az1ANzYL0UJN3C7igLtrD936XJRNuhzHiaKoj 84z6DGcxfxSV2wa6iY5zIyre3RhovpgtZXCZrtNM0D3HCDuYzuVn/HK0TZkTWILEIzJRFuA6ur3 LAi5wMiXSSH1gxCqg71q4koZ9rKsRt3Vcw8zj6bJpQtOL27gi0Vq/wAsxiuuYuh9KrXgYEo1WOf 0U23WYDQo+u4krAC+qfSxFay73DtOc+wAIYGilaz6/ELhek3a3U3qFwmDdJhmZ5tUPfopLQFX4D PVogICQv3BY86nJeQX6lT2tUnlnOvC/VzLcaA0lS9J73PqBXB0FC03IckKIg9KGOIuygHHReqNd vMfWmidVbP9XRy4IBMPwiDkDZAJw44ifIjzv2DSbcq8dJJGjTVXw== X-Google-Smtp-Source: AGHT+IHe+IfTYe2xBLhwdAjDGtNPZ2WBoRFp7xzoRXkESS07W9aUm65o7uh9PPPYRjKnmkwunDUQ8w== X-Received: by 2002:a05:6000:4301:b0:425:86c8:c4ff with SMTP id ffacd0b85a97d-429aef8284emr3838013f8f.22.1761774374281; Wed, 29 Oct 2025 14:46:14 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PULL 06/23] config/target: Implement per-binary TargetInfo structure (ARM, AARCH64) Date: Wed, 29 Oct 2025 22:39:43 +0100 Message-ID: <20251029214001.99824-7-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251029214001.99824-1-philmd@linaro.org> References: <20251029214001.99824-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=unavailable 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: 1761774463202158500 Implement the TargetInfo structure for qemu-system-arm and qemu-system-aarch64 binaries. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson Acked-by: Peter Maydell Message-Id: <20251021205741.57109-7-philmd@linaro.org> --- configs/targets/aarch64-softmmu.c | 26 ++++++++++++++++++++++++++ configs/targets/arm-softmmu.c | 26 ++++++++++++++++++++++++++ configs/targets/meson.build | 1 + 3 files changed, 53 insertions(+) create mode 100644 configs/targets/aarch64-softmmu.c create mode 100644 configs/targets/arm-softmmu.c diff --git a/configs/targets/aarch64-softmmu.c b/configs/targets/aarch64-so= ftmmu.c new file mode 100644 index 00000000000..4e1e2f64da1 --- /dev/null +++ b/configs/targets/aarch64-softmmu.c @@ -0,0 +1,26 @@ +/* + * QEMU binary/target API (qemu-system-aarch64) + * + * Copyright (c) Linaro + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "qemu/target-info-impl.h" +#include "hw/arm/machines-qom.h" +#include "target/arm/cpu-qom.h" + +static const TargetInfo target_info_aarch64_system =3D { + .target_name =3D "aarch64", + .target_arch =3D SYS_EMU_TARGET_AARCH64, + .long_bits =3D 64, + .cpu_type =3D TYPE_ARM_CPU, + .machine_typename =3D TYPE_TARGET_AARCH64_MACHINE, + .endianness =3D ENDIAN_MODE_LITTLE, +}; + +const TargetInfo *target_info(void) +{ + return &target_info_aarch64_system; +} diff --git a/configs/targets/arm-softmmu.c b/configs/targets/arm-softmmu.c new file mode 100644 index 00000000000..9b3fdd2854a --- /dev/null +++ b/configs/targets/arm-softmmu.c @@ -0,0 +1,26 @@ +/* + * QEMU binary/target API (qemu-system-arm) + * + * Copyright (c) Linaro + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "qemu/target-info-impl.h" +#include "hw/arm/machines-qom.h" +#include "target/arm/cpu-qom.h" + +static const TargetInfo target_info_arm_system =3D { + .target_name =3D "arm", + .target_arch =3D SYS_EMU_TARGET_ARM, + .long_bits =3D 32, + .cpu_type =3D TYPE_ARM_CPU, + .machine_typename =3D TYPE_TARGET_ARM_MACHINE, + .endianness =3D ENDIAN_MODE_LITTLE, +}; + +const TargetInfo *target_info(void) +{ + return &target_info_arm_system; +} diff --git a/configs/targets/meson.build b/configs/targets/meson.build index a9f6b24ec01..cca2514eb51 100644 --- a/configs/targets/meson.build +++ b/configs/targets/meson.build @@ -1,4 +1,5 @@ foreach target : [ + 'arm-softmmu', 'aarch64-softmmu', ] config_target_info +=3D {target : files(target + '.c')} endforeach --=20 2.51.0 From nobody Fri Nov 14 18:19:16 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=1761774512; cv=none; d=zohomail.com; s=zohoarc; b=EWWQIn76QB7hIbZV8xO7PF3BH2OIm4/EAt6KRgmje0NxBGbcVBn0+vxg7R8c4NXxrybsDN1U0m6E16yKl8eOFy0pS/Tghh2IWMMSArjexMwalHD1XOVAGSVKRth94yDQf8FeRbO7A/gfPCvRo7KQNPBKNaxSe2mpQSYpOYy5MjI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761774512; 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=0F9dkqnaiLK5i79x81WOHwn6K6egaqNgTaEtafHPCr0=; b=Zw+iRCn0OR6tnOWVijcAKPsaK5injQmfJXzOs1YtkYIfMOPbtbW6K7+y3fkqxw4TW4jDYpLr70p98spkVHZKXIOWFMM9AEY6GvjWts+d8QuQLXEKCOJ/yp4cX+ClK0QLduRVyrPzSBkmTp7bx+x2rPYwsymMAnAdrSgTWAgI63k= 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 1761774512991233.50062216783613; Wed, 29 Oct 2025 14:48:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vEE17-0001sD-Cn; Wed, 29 Oct 2025 17:47:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vEE11-0001q8-Tr for qemu-devel@nongnu.org; Wed, 29 Oct 2025 17:47:36 -0400 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 1vEE0s-0006f9-HV for qemu-devel@nongnu.org; Wed, 29 Oct 2025 17:47:35 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-3f99ac9acc4so355429f8f.3 for ; Wed, 29 Oct 2025 14:47:23 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-477289b3956sm4427905e9.10.2025.10.29.14.47.15 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 29 Oct 2025 14:47:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761774436; x=1762379236; 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=0F9dkqnaiLK5i79x81WOHwn6K6egaqNgTaEtafHPCr0=; b=CUcbxd0VmdCEGMXEGe9+kFkiNY5/1kDB98HMmjRm1z4wCyz+/SXXLgInFotyppCapB R3amJOX34OYH2y/DfMtSGIxhSenNSMpuoaH1QT9Ht/gzzRLwbwEe3oy5HFNIZvETdgAF mUSYFSibvnuZ54+P5SqbiRKpejoVYuXbe9hzYEH2Ei54vtrp0uOR2g1GGGGIpfHnhtM1 7vCtT853hetfj19/4lewGS6w8WHkEG4fZBdf8EHO5RnVnekolrDadxQWAITnNdcpOdNb ZHymE/KF6z6DhW14iAXjwbUr2vy/9SWRcjJxXy3SYvu1dCzS3XeXDcb46tg2RjK8mGR0 V+mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761774436; x=1762379236; 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=0F9dkqnaiLK5i79x81WOHwn6K6egaqNgTaEtafHPCr0=; b=LJm/eMeRQJK0B8UHXfj4WH7XM9YFmZHMQQZluf54hkzLdUOoZ4DCzg+9cGmg/Ho1ks /EFf1G7osiTK9VPY8H9SGn6jSiCGOeX5/SpEb7u0WMDL+6jNs/Hyeq/XPcNPDhmr8XQ/ LX+/wwCeV5ts+GjmxCueqYMvwy5DruW4vqRzJLhfs3D1/nOHGIFtaOq5rlKRni4B8d+d mLBVuTgPkjJsbdc5qcDYJs3XZ+h5J3h0/F+/az619dcm4qFZ6TpqOXGXAErwi8mR6sRy LK4SUqPuGSbFvmV7irX0WuG82j1DqX6pE3dZd+8xc0Xm2RMatPP8gE6FULujjUGjtZYr rlBQ== X-Gm-Message-State: AOJu0YzeCAoJ+YH3BQE47lXtv/HigxJ0oJCnFbNRFTaPrOvtPSDXUzev Rh5Y1a0IfMQlfDHoJ0cukjKBG/SCF49+PrdHYW5YdmsQo+G0bwY0GeT1I03pIrnudAaMtfbompz lLVmNov0= X-Gm-Gg: ASbGnct0UVLpddoKOrOJdB0vXbbWiwOXTaMO6rIcTd1jiwPLVwVjtnAABo4a+/CDlCe PaTzFQVowXStvK3fscJD1bm8/RAdSluPPkGSXxrkxDByFBSXJnkOJSDR2PrWWsl2F3eV1FWZud2 JTxT+bfmgajlA3hgqvmtFJuInncQHZtVo2R1z8VrbH3HL0AtROvluOhsOgso7bqT73nvK162qAM PtRHkPXR6+e6Fqaf73+dOqCj/7vKeE/4SRmd9RZN8NEszYv5niXvNM5ZYoWx4lx/+1oWSMou214 X/J+ubWmIdLmikfMjG2fn1N/WrdJov4WF1tiMNegvRevUyH2Zen3rUHzFj7du6wbwIXr9hboiqD UX0PG2XhDhOuE84tarakxW5NJLpMJcf7CkhmVUEeFf74JSz9Ac+WhsKt1AMmFw2FZjX8Zz30iIA nX98f3dz0kc4cwO/JPCNKPkLcRqWE7naP5xRDQpuRr9agkekeE3homlR92Dddx X-Google-Smtp-Source: AGHT+IGqU9counotP5u54GGujGRLojSBOi9LQfM5EnPd82R3Ph39GT9k8UzuoF1WJgfRtRZTGHql/w== X-Received: by 2002:a05:6000:2f85:b0:3ff:17ac:a34b with SMTP id ffacd0b85a97d-429aefc03f0mr3717688f8f.42.1761774435935; Wed, 29 Oct 2025 14:47:15 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PULL 07/23] hw/arm/virt: Register valid CPU types dynamically Date: Wed, 29 Oct 2025 22:39:44 +0100 Message-ID: <20251029214001.99824-8-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251029214001.99824-1-philmd@linaro.org> References: <20251029214001.99824-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, T_SPF_TEMPERROR=0.01 autolearn=unavailable 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: 1761774513740158500 Replace the static array returned as MachineClass::valid_cpu_types[] by a runtime one generated by MachineClass::get_valid_cpu_types() once the machine is created (its options being processed). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Acked-by: Peter Maydell Message-Id: <20251021211135.61179-1-philmd@linaro.org> --- hw/arm/virt.c | 59 ++++++++++++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 27 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 20e3f1094cb..e19da6fd901 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3256,36 +3256,41 @@ static int virt_hvf_get_physical_address_range(Mach= ineState *ms) return requested_ipa_size; } =20 +static GPtrArray *virt_get_valid_cpu_types(const MachineState *ms) +{ + GPtrArray *vct =3D g_ptr_array_new_with_free_func(g_free); + +#ifdef CONFIG_TCG + g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a7"))); + g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a15"))); +#ifdef TARGET_AARCH64 + g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a35"))); + g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a55"))); + g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a72"))); + g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a76"))); + g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a710"))); + g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("a64fx"))); + g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("neoverse-n1"))); + g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("neoverse-v1"))); + g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("neoverse-n2"))); +#endif /* TARGET_AARCH64 */ +#endif /* CONFIG_TCG */ +#ifdef TARGET_AARCH64 + g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a53"))); + g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a57"))); +#if defined(CONFIG_KVM) || defined(CONFIG_HVF) + g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("host"))); +#endif /* CONFIG_KVM || CONFIG_HVF */ +#endif /* TARGET_AARCH64 */ + g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("max"))); + + return vct; +} + static void virt_machine_class_init(ObjectClass *oc, const void *data) { MachineClass *mc =3D MACHINE_CLASS(oc); HotplugHandlerClass *hc =3D HOTPLUG_HANDLER_CLASS(oc); - static const char * const valid_cpu_types[] =3D { -#ifdef CONFIG_TCG - ARM_CPU_TYPE_NAME("cortex-a7"), - ARM_CPU_TYPE_NAME("cortex-a15"), -#ifdef TARGET_AARCH64 - ARM_CPU_TYPE_NAME("cortex-a35"), - ARM_CPU_TYPE_NAME("cortex-a55"), - ARM_CPU_TYPE_NAME("cortex-a72"), - ARM_CPU_TYPE_NAME("cortex-a76"), - ARM_CPU_TYPE_NAME("cortex-a710"), - ARM_CPU_TYPE_NAME("a64fx"), - ARM_CPU_TYPE_NAME("neoverse-n1"), - ARM_CPU_TYPE_NAME("neoverse-v1"), - ARM_CPU_TYPE_NAME("neoverse-n2"), -#endif /* TARGET_AARCH64 */ -#endif /* CONFIG_TCG */ -#ifdef TARGET_AARCH64 - ARM_CPU_TYPE_NAME("cortex-a53"), - ARM_CPU_TYPE_NAME("cortex-a57"), -#if defined(CONFIG_KVM) || defined(CONFIG_HVF) - ARM_CPU_TYPE_NAME("host"), -#endif /* CONFIG_KVM || CONFIG_HVF */ -#endif /* TARGET_AARCH64 */ - ARM_CPU_TYPE_NAME("max"), - NULL - }; =20 mc->init =3D machvirt_init; /* Start with max_cpus set to 512, which is the maximum supported by K= VM. @@ -3311,7 +3316,7 @@ static void virt_machine_class_init(ObjectClass *oc, = const void *data) #else mc->default_cpu_type =3D ARM_CPU_TYPE_NAME("max"); #endif - mc->valid_cpu_types =3D valid_cpu_types; + mc->get_valid_cpu_types =3D virt_get_valid_cpu_types; mc->get_default_cpu_node_id =3D virt_get_default_cpu_node_id; mc->kvm_type =3D virt_kvm_type; mc->hvf_get_physical_address_range =3D virt_hvf_get_physical_address_r= ange; --=20 2.51.0 From nobody Fri Nov 14 18:19:16 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=1761774594; cv=none; d=zohomail.com; s=zohoarc; b=I0Ru6fWg6LsufECQpDtFk3ORmQ4Bc2nxGnfDyG029cl7h6646iqTuIm6E97L7rRgLpV3zgiUPygat5/KK4+RSliBsDYmdPna6TO/ljALEMRYRgaIVQw982t+WndREZtZr5b7tvwLtFI9gL8jQjYW+DXQv/DAYAsxr4YvghsQXj0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761774594; 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=ScX5jHXkPCfHiRHa3/7k2dJ6cTMKBNtK3/vaUFB2OeQ=; b=iWaURkzymgqlB4kZjvfzq2hpIOH1FyrX42j0+5eh/o7kGViifO4z0QFQVgO9nm8aw/gyzeIzO4EcV7Djfa0LlflE5zxI/tno+hQT8TXqsnommGP54BTzJNysAUzuC0XTmGWEQDy/2dwSmySrL0pPBkTC4keJsVv5nAoT6tWHRA4= 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 1761774594226795.4510954003703; Wed, 29 Oct 2025 14:49:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vEE2F-00030E-8W; Wed, 29 Oct 2025 17:48:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vEE1u-0002rG-RT for qemu-devel@nongnu.org; Wed, 29 Oct 2025 17:48:32 -0400 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 1vEE1q-0006vS-Ng for qemu-devel@nongnu.org; Wed, 29 Oct 2025 17:48:30 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-427084a641aso290131f8f.1 for ; Wed, 29 Oct 2025 14:48:21 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-429952db99asm28506026f8f.32.2025.10.29.14.48.16 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 29 Oct 2025 14:48:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761774499; x=1762379299; 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=ScX5jHXkPCfHiRHa3/7k2dJ6cTMKBNtK3/vaUFB2OeQ=; b=oVgKoV3rz48NwsmebP+lTtFqbKIuPcaqk0Gv2hjY/e2fjKQNWwpUXUmIDqDmptIo29 MB5A2dW/Rf92YMKBpLfjJO57bWQo91yxjy+tUIDyY0yKUwbNqjuhMlTwSA6mephzChzf SQPxHyN1U3KE3cXgN+D0rZdSMz47sX3gN568ePwhl6KuBAjEsWhneU67dGkS1aKARNeM Zrg6p00T4sHCbgazbvT8MQ95vFtP7eSNl22P0yF7OcJfmjYMP1dpZRIrrHjlOZa08PLG r9eSLaa+3aWiDRvMLR4IPYSJ2wifVM08u1OPhTmyeZWecp0zMS7iPYoHcfJPPjUCBeeC 2pdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761774499; x=1762379299; 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=ScX5jHXkPCfHiRHa3/7k2dJ6cTMKBNtK3/vaUFB2OeQ=; b=LGbEApg2Ch8Fk/PtVMxrzrOwpU4D7GGe9eNMj4o7hjiLk3wJfPojv7L5pfKb+heyRW +g+6PcVbK8wyOuzs6perEvpS9eDg2a0o7pL7QN20G9DiVpK+xkeGFeO5Lg1xWJlHudpH YoFmkRtqa5cG429Gq7RJMsua7Fxc+nlFouTc65zhOeKtzB8gwGx6T08HF6gwhFuX7btX mQx7Gp2ZojQUtroRpi1oHE6cROs1Ujwi9Lhc6f8Ba+Gr4Pe+XjANnF+icabrnTlDnRw/ mEeU3did0FGSe6DukS0FjMg780fSie9kIz63hTfT8kJ/YyxreHXqPQx3L9carMVLWD3z aFQg== X-Gm-Message-State: AOJu0Yxs7w9xIDkc3Ob1zowmKJSnXbpBckC/SLyd8GmQgQJR0J9RjJz8 0Km/cFSFvxVIuid4m4eJILnUMgysnn99Wm80YE85ohStJ9KVOZ1RI7eZVbjeGPUBUYcOx5H01jw S/+5h2Uw= X-Gm-Gg: ASbGnctqliQe/wvldKN1GbzPnI4kBMcdqVfyXCBB/SlSM0DLjnKRMyZMV5u6dxhOqif wvN/p3HPTDotATb+9CO1kjfQRZy8nF6CvWGKZBGRuvCxwOWUhp16D5vfZ1xY5qHCbvqchFidczC voILzDhW5zLoiCC8UnLI9UzHpprvKLCIjFzWwDcO4P1CyvYWwdoB6oaaVk+tixP1zSvh4TfNFmz 1R+FpykBVKdgyW3GAW17L5YXE4AX98HChQ4kv5cc8rGtqsGJEGrfFjyiTzqNi0I9H6HaGlNOAUQ 1J7FACO52iTtVeqyMVvsroQE0E+8QbdbpRQFC11awVD86zytiDT0TehpuS/KaiBRa+6REUr+wHl 7/PJQMg2vpnjmJRsTWQaF4tigGbqw9l4sYBNBSRdj66UtMTwou2YqwJz+QuATXMUCdhKKuN1dlv AdJ7LzU7vZiJbULE0+MR0k32FIwA6oFGN6unsF8jkcntr1wVTjJFzLc248cLOI X-Google-Smtp-Source: AGHT+IFOUMbfkddgnKumzQ9hcae4vW+5GaUyJXzVdBdODD2pm54cktBkgz56wlSn80mF+gsLZOS8aw== X-Received: by 2002:a05:6000:40cb:b0:427:241:91c2 with SMTP id ffacd0b85a97d-429b4c97bbbmr745180f8f.30.1761774499223; Wed, 29 Oct 2025 14:48:19 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PULL 08/23] hw/arm/virt: Check accelerator availability at runtime Date: Wed, 29 Oct 2025 22:39:45 +0100 Message-ID: <20251029214001.99824-9-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251029214001.99824-1-philmd@linaro.org> References: <20251029214001.99824-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: 1761774596060154100 It is not possible to call accelerator runtime helpers when QOM types are registered, because they depend on the parsing of the '-accel FOO' command line option, which happens after main(). Now than get_valid_cpu_types() is called after accelerator initializations, it is safe to call the accelerator helpers: main + configure_accelerators + qmp_x_exit_preconfig + qemu_init_board + machine_run_board_init + is_cpu_type_supported Replace compile-time check on CONFIG_{ACCEL} by runtime check on {accel}_enabled() helpers. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Pierrick Bouvier Acked-by: Peter Maydell Message-Id: <20251021210840.60112-1-philmd@linaro.org> --- hw/arm/virt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index e19da6fd901..d3809754460 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3260,7 +3260,7 @@ static GPtrArray *virt_get_valid_cpu_types(const Mach= ineState *ms) { GPtrArray *vct =3D g_ptr_array_new_with_free_func(g_free); =20 -#ifdef CONFIG_TCG + if (tcg_enabled()) { g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a7"))); g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a15"))); #ifdef TARGET_AARCH64 @@ -3274,13 +3274,13 @@ static GPtrArray *virt_get_valid_cpu_types(const Ma= chineState *ms) g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("neoverse-v1"))); g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("neoverse-n2"))); #endif /* TARGET_AARCH64 */ -#endif /* CONFIG_TCG */ + } #ifdef TARGET_AARCH64 g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a53"))); g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a57"))); -#if defined(CONFIG_KVM) || defined(CONFIG_HVF) + if (kvm_enabled() || hvf_enabled()) { g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("host"))); -#endif /* CONFIG_KVM || CONFIG_HVF */ + } #endif /* TARGET_AARCH64 */ g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("max"))); =20 --=20 2.51.0 From nobody Fri Nov 14 18:19:16 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=1761774627; cv=none; d=zohomail.com; s=zohoarc; b=Xy0Fz8Aqyp1sVVtMkQOGDlMFwWLEj2FR+JBxIT0XavMHj6t/WLRsEEcQvCVtxpQFNxx10xvGPoyu5OuDa1qyh2BxDPynMHWOVDbANi0mto6CK9oM90dsAmu73xls/mPXZegmGHkU4ZMumV/mqznBt1WsyXwr2SVQa0aKtpY8pT4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761774627; 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=feo8FQEGOqzAXoyKXsNivpWnArCzPABZfbbNYQk863w=; b=ezD55kcoZOwYSSIlDFEd01f4Hhz9rE6NeGv7dD99seyE2stPtCKuucL9LisOHnsevB/+x6zQ6fJjTY2PKFF88y6jX4rkogM0Oy9u9ec5kpiCZz844wPFCIVo1HeZ6rl98VA4ETFIERB7zpP2Q74n+mUjVdXiCrDDRe8Fx1frkX0= 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 1761774627215523.4458438497869; Wed, 29 Oct 2025 14:50:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vEE3C-0004NN-6u; Wed, 29 Oct 2025 17:49:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vEE33-0004Ke-5Z for qemu-devel@nongnu.org; Wed, 29 Oct 2025 17:49:41 -0400 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 1vEE2t-00079B-7G for qemu-devel@nongnu.org; Wed, 29 Oct 2025 17:49:40 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-475c9881821so10021275e9.0 for ; Wed, 29 Oct 2025 14:49:25 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-429952de971sm27977643f8f.39.2025.10.29.14.49.20 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 29 Oct 2025 14:49:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761774561; x=1762379361; 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=feo8FQEGOqzAXoyKXsNivpWnArCzPABZfbbNYQk863w=; b=byQmvuuLfQ8GP5CNcW964E3ax3bJMxGY365lNcKumH+w7T9iXD7jo1J5p3z7KxFfUo woNbbhCc+BLwR16V4bcbsg90K2GJgJ59g4nJ+eG/wtg0BXGvLfO3nN8brO73Sa+4Gwp4 phpj4ccI28vHNzIlPzKyxCi+zRxQwDCizqX01cVZT0byMEF+FfSrye1gwvWvfv/nUcG1 tnvvSXjtXuZqgMviC9AlWEGZskpN3rykjk8Sxb0BNsP/SmTFloUm1w/0oFlEqFd37SaN 5MtXvSsHrwlRWUiwlGXqEE8R9R5NHnlujwOEDamMk/wDun5v/PfERPdI++TEvHGq/3Ae oBag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761774561; x=1762379361; 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=feo8FQEGOqzAXoyKXsNivpWnArCzPABZfbbNYQk863w=; b=qDFTljGRWWBz4Sm7J4HLCQ3L4/sO+NLEISffwS3ZcSkrwiawiV+YczgtYeuq1r9cx2 evOyn39D9ySOC0B0b0r2o6heyyyk14GzfLhtHO+DMR2ZvRdR60Qz74KBETV+agCXgKbM R7F7z1SYaKsORSdogCVFY6lgoufIMOV/lnRzzJH4St8nuFODHZKvqnIXVd0tgaNCQeUT gvB6rH1vSPb/4hrPV/uY3qpNucg+s8vs03jBGSA+47PfJ/XUB9Oe1pq4rLT2yRdUF28q 1NtEi/MirIJ+qqA8dqGwJZDkdGqUADUCTch8jCkr9mhI5tfegoWn8l55FWPkc0i/hklj hAEg== X-Gm-Message-State: AOJu0YwEseFPHqDi5ayoV23oCF9JjMTNPUiREZAedII8rC7cg4DCOx7D xbgZrRmXwXCLuuyGHA6HfTPv6dkn5LKzrUcvpWq6sR01MNKSEwYpAWskhY43EswW3m8/zU/uCyU 1/vzWH8Q= X-Gm-Gg: ASbGncvzQg3CdqD/97UwPfOgowOy5QdA1WwPEElcZ/WXp2z81bzPzP0zvo5j4cYhMqg 7ELLtJCyhGJVekGLQcqoaRuue1m2lwIdNKaN4a3JvckD2d9RibcUJ66BqE5oEmBCN5xEkvUFKBj tTxog3pBusICYiPNnucK+N8Y9yZWXK6fUZfXS1Xhbn5+rwp14B9nztJfVhKeENzNPrFj6lUV4Wd vjaml1b9OZsUEarpyOXGCXGT4lJyt3S1D31nyMJIalcwpV+O1Kx0i1bP/pEPPH//JI3xf7Us+32 m3wKfJinAI4H4hnfxcZfDTQuMuVJuPEmxUnjid2hS0nUyFzRO5G6o4F22l8+O2ICp7H4rCs0ltI So26xKLe6droqwTPUgXNApfvI6OfhCiQkLYRPOebCBOel5Pd1QT0U3B8vfgAvA1elbTFyiYLDPO 8sFB5kn+W7cveNzd/huX+saNgGJi0Ech8jKMIlIzBRiHUzt+naXw== X-Google-Smtp-Source: AGHT+IF+4/nFuvC4cJuytWiWe+H7AZ4+Eyp1KQg0BMmif9wXeFHWWHlo/AvfI0PJ99gtsbJeXZhSfA== X-Received: by 2002:a05:600c:a4b:b0:46e:6339:79c5 with SMTP id 5b1f17b1804b1-4772626120dmr12343685e9.5.1761774560927; Wed, 29 Oct 2025 14:49:20 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PULL 09/23] qemu/target_info: Add target_arm() helper Date: Wed, 29 Oct 2025 22:39:46 +0100 Message-ID: <20251029214001.99824-10-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251029214001.99824-1-philmd@linaro.org> References: <20251029214001.99824-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_PASS=-0.001, T_SPF_HELO_TEMPERROR=0.01 autolearn=unavailable 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: 1761774631177158500 Add a helper to distinct whether the binary is targetting ARM (32-bit only) or not. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Acked-by: Peter Maydell Message-Id: <20251021210144.58108-1-philmd@linaro.org> --- include/qemu/target-info.h | 7 +++++++ target-info.c | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/include/qemu/target-info.h b/include/qemu/target-info.h index abcf25db6fa..984fba3f42d 100644 --- a/include/qemu/target-info.h +++ b/include/qemu/target-info.h @@ -50,4 +50,11 @@ const char *target_cpu_type(void); */ bool target_big_endian(void); =20 +/** + * target_arm: + * + * Returns whether the target architecture is ARM (32-bit, not Aarch64). + */ +bool target_arm(void); + #endif diff --git a/target-info.c b/target-info.c index 3110ab32f75..40716bf4051 100644 --- a/target-info.c +++ b/target-info.c @@ -52,3 +52,8 @@ bool target_big_endian(void) { return target_endian_mode() =3D=3D ENDIAN_MODE_BIG; } + +bool target_arm(void) +{ + return target_arch() =3D=3D SYS_EMU_TARGET_ARM; +} --=20 2.51.0 From nobody Fri Nov 14 18:19:16 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=1761774726; cv=none; d=zohomail.com; s=zohoarc; b=CKvUvFN57pffaAnCh1sfpbHZNxxlW+l2grV3NDAtVwEJiaAZpNNkT4a/59dV7+Egsj9P3vo8TNz72Vc84/uAz4Ey2WN/hlfrcuyb3jUJTokiY6pD4Mwt/OHQpk8ueKZe7OPJ+Eo3A1N9L2+5hjBUGnnOUqG23ZY0oTcqRYHKg2M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761774726; 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=LbKQE7qm6IKS1msYSrsdvM6/yFqMo5M5BB1u87CRFX0=; b=YuwOhyhRawNt2Myl8ZfDyizbHjZTQMjO1/bDNHDhAcSdIInvt7jcFz7MBG0W+oqAnoDr2ySKNERJqkgnb4E6RmNknbBkjD1yOe59ySWCiO7tvf1TCynW9W26k5etKkUb8g+YrZrrHkCYKJ6GUvOdivh6Ng/Dvz0qul56vk8O0bg= 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 1761774726657753.2497721264276; Wed, 29 Oct 2025 14:52:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vEE4B-0005N4-N5; Wed, 29 Oct 2025 17:50:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vEE48-0005M8-JB for qemu-devel@nongnu.org; Wed, 29 Oct 2025 17:50:48 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vEE3r-0007ap-I1 for qemu-devel@nongnu.org; Wed, 29 Oct 2025 17:50:47 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-475dbb524e4so1965445e9.2 for ; Wed, 29 Oct 2025 14:50:25 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-477285df825sm4921395e9.0.2025.10.29.14.50.21 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 29 Oct 2025 14:50:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761774623; x=1762379423; 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=LbKQE7qm6IKS1msYSrsdvM6/yFqMo5M5BB1u87CRFX0=; b=wJrchxNauDqyR6JwhoabgQhzgGNlBkG+6I+wWPylocoosmCmxJ77wvhxNQrzCdFh2c YosOrZKThdvDifZwYz3Lf8pAFG8kvUASjdy8PacNSavFlG8nAnc2OnIVavgPUvV+BHlu 64OSlkBp7JmC1LkkpzZOzvjv2JA2WRAYIl0AHH7F5OToD5IUdXLYvYfAWdWlwKry4Ymt ciLdFx9IQ2Wc+Ti2k115T+R6LAz2B+vWnMWuzuFvlnG5Ymwnd580csdJHBTE7EJ/LKCE FqJ0ajHon0QQGm+uZ/m6/dxD6zr8t8VuoCAYEpmkh32AjyPl5y474PwB99erKfRSB4fb voIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761774623; x=1762379423; 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=LbKQE7qm6IKS1msYSrsdvM6/yFqMo5M5BB1u87CRFX0=; b=YC7XicuCG3Jjp5mCxhT5rfkDHd0D6Nvp08ZCjraBoietYdI2fwfR6iQ/Xt+smU8zyH X4wpce4bAQLDIJrgqcYq+if4sbEoegluG8F1owes/t0b36XSthVY0qKz0mJ4sUvdhqxz J98FkEkLxDQao8qFZXCkwDW2l8w8fdUYAPAmC3aqiBR2FEgC2TfmpbOfbI3uMJsvDHCV eTLd8OdTA+Nc0yMjO10q/cP8HMx5UxyNFpCAh3QyufvaskoemYR5xUSC4BVNpfZ5ETsk 9SheiDk1T1aabP6KU5flpLYKrUtuoSF0qTAClg+c+VSFsHlQEgE9oBbTl1HQWwBJT4ey v4HQ== X-Gm-Message-State: AOJu0Yz+CmFMSmHprCzSA4xwK4arldv3ubI4yg+zUPNv1LC3E2Q88f2O mbawWh9CpS2U8dVFhYgZbUf+eFeA365oZEo4QDV55pPnhoUEim/RE0iPR0ti/bfw1r579f5xF54 0p+Ry7OQ= X-Gm-Gg: ASbGnct9OWv/0v58gMD2zXlQtetq9pxGTzuriTs+u3giseU8ICtPAMukinYHabTqz7Y ZtYXy7et4u31bOjBnVJIHASXFhNjgbK7thexxnaFhM+YO71lSDXTvIMvf0erDYKNK4CWzz7zxEq Fdwzs5bu7WQLycBBjB79mbwfiRzDtR8crDkjXTwgkry9xrURh6zPZUwzj/Grw5TRUFhDTucGDOE ghs4v7Oyc+U00zazQEKiJBuhFoOMgQN4jAc8CsEWEwBtcw1OJTwqZn7Fcslltzx+6vDA2av2IeU IMEznvqMJxBhBqYkwwR+gXBPPbr00h/YZrbYtwdLjQgcdsyQCvb2xYjGtf4m3bN5AZ8BPxhLqrx mvZEw5Hld80aR6XmB01ccaZC1BJdExTLvngYHPOTHI0fcbWdZw6NORpk7TfT/WNz0KPhO9qafth Wwr10pHxX0hDgv34y+MB1xv5ZwaQXq2YjsZkhjWjyZIc+oNh3Wcw== X-Google-Smtp-Source: AGHT+IHTSwKOMFv0RaZtT2IQ/+PmQSFEK0hhc41Z4oKaL7KKgqcOFYejd02ZoERiD+R5YJKMT2Igng== X-Received: by 2002:a05:600c:4ed1:b0:456:1a69:94fa with SMTP id 5b1f17b1804b1-4771e177c4amr40857215e9.13.1761774622623; Wed, 29 Oct 2025 14:50:22 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PULL 10/23] qemu/target_info: Add target_aarch64() helper Date: Wed, 29 Oct 2025 22:39:47 +0100 Message-ID: <20251029214001.99824-11-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251029214001.99824-1-philmd@linaro.org> References: <20251029214001.99824-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::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.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: 1761774730208158500 Add a helper to distinct whether the binary is targetting Aarch64 or not. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Pierrick Bouvier Acked-by: Peter Maydell Message-Id: <20251021210144.58108-2-philmd@linaro.org> --- include/qemu/target-info.h | 7 +++++++ target-info.c | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/include/qemu/target-info.h b/include/qemu/target-info.h index 984fba3f42d..e8fbdf19d53 100644 --- a/include/qemu/target-info.h +++ b/include/qemu/target-info.h @@ -57,4 +57,11 @@ bool target_big_endian(void); */ bool target_arm(void); =20 +/** + * target_aarch64: + * + * Returns whether the target architecture is Aarch64. + */ +bool target_aarch64(void); + #endif diff --git a/target-info.c b/target-info.c index 40716bf4051..e567cb4c40a 100644 --- a/target-info.c +++ b/target-info.c @@ -57,3 +57,8 @@ bool target_arm(void) { return target_arch() =3D=3D SYS_EMU_TARGET_ARM; } + +bool target_aarch64(void) +{ + return target_arch() =3D=3D SYS_EMU_TARGET_AARCH64; +} --=20 2.51.0 From nobody Fri Nov 14 18:19:16 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=1761774765; cv=none; d=zohomail.com; s=zohoarc; b=XAXUsqhTaGhzFDL6xr1PmeS6PQMxsTKbWUb5AHGXXnqM3B3XbssZkP5mcQlA1n2XErN08KQ0TB9pucTKIxsnMYGX0hMnWFmYlwAfwPX6wS97yobjuL2pbtfF4Q1GszTc3DTDQhnWGYTnaC0YXXbXiMYC/wORBMumOj16uq9b59o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761774765; 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=VF6T+XLbTiLYka39LvghXibf6nOWNgxaucYWDHScU80=; b=ZtfkPXpFp4pMjdQqQQ6rnRWm+S/tHg51CA4Rc5zhyyvVFtnwgFplp1VpauZGt/3a/0D/sgQc/DeaY82PpqlDVpHAS3jqO/i47i3bZJ1gIHRmbc4mk3NwCDzkTd4MNT13FV94onfxvok+xhQs7hB/1kdXL8hz888PPMXuMPoRrDg= 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 1761774765264172.01508987762895; Wed, 29 Oct 2025 14:52:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vEE53-00068q-Qx; Wed, 29 Oct 2025 17:51:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vEE51-00067h-UF for qemu-devel@nongnu.org; Wed, 29 Oct 2025 17:51:44 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vEE4s-0007oI-5f for qemu-devel@nongnu.org; Wed, 29 Oct 2025 17:51:42 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-47710acf715so1691135e9.1 for ; Wed, 29 Oct 2025 14:51:28 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-477289e7ceasm4510895e9.13.2025.10.29.14.51.23 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 29 Oct 2025 14:51:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761774684; x=1762379484; 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=VF6T+XLbTiLYka39LvghXibf6nOWNgxaucYWDHScU80=; b=fJ/s+Gehu+q+SbRgZG9QndGgNadqbenu6zxbCP13ZTesILHJgSfIScobluCW/Qav11 EEMRpi7x3WPI52ESEV9SCZ/5pOjI3zD5lPqo1hQqQPcAlProdLdxCXUPNzbAtUiWElYC eNsnjB8s/PQF8l4X1E9+/9fubalQlBH4bl8B3tYbdMIXUPPtuLRcgBou5S4VzQ1il8SN 4aE+3ZxWIzyvA9GR0nvx7S/A0YOg+wI1hH1wxibmfPSp9rGxvQtwG4IO5e5z+ZjyOtnJ D8MGol+gRPUgHPEhJthhkmIid9xrxK8n4wj3tl2p61ZPcmIaMzVWo2qNiTXpzGQK+5M7 p/pQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761774684; x=1762379484; 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=VF6T+XLbTiLYka39LvghXibf6nOWNgxaucYWDHScU80=; b=gSuNvfKn3pHMWXcqX594dU4+ibreCYq0fm49t4T4t7DTsdFEeAcXFZasAMHo616I1X GdMv6ampZs4LAzMtdsaZRxv2+9Vzc8gfim1p1gVPZ2+QOKX4o5WlCxPJOO9JDsB2o1tr F7X0MCVtcjQLxlBQQ92uE61Xd0TV1feNdI7++pLgKAs8TalhYkchg8RGLs2i7XYt8Dx1 mutw4UqiC5qTzK9Y//RE4VY7u3vopsSMZYLQWmJjT63BeHtaWKPodLuuaw76MiTL02Ql LGCJUGG/TYeyo0bI0384FPiIfsNQnYvWXn1yY9jYK/1g2pRYZNP1VHCAqwWziso/JjKO 9yug== X-Gm-Message-State: AOJu0Yw/63/B6y7mSqeDcBgXsWtLAozSkdzOjhxCvNjVSJJYnKsGuOUp BIy3A9VU69B+Ppv2PWVS+882Sz23BQZSo23q49F2VEisK6bKC+qr4ByyHBJ0OYjV33hCgFWKnR2 4Q9GKnEE= X-Gm-Gg: ASbGnctqYl906Zlcg3omP1y7mWxE6V5cV7UlFrzN4KMbFDjtojUSU4E4a6XjXQT6mAr aog5QuDcKJlWWvRv78ftvlVuUw9IEi/AjqXDPW1PmIhRoobePhYgpMjh8jEknyg7Dkr2xqMYoej 9mIhZvMaACm9uwTKmWTrJRBqDT8l+W5qqopG8XHlQL/s35b7nsof+bUDO99qg8QWTmIam8Q/Eks pHXOui94lDbwPIUD8F8wsnNX0iGOZQQ+NSmlFbnIQ2Qa33H6pbiy6G+7dLlkF2padjfU4JQkVpg YkqUhakIdVxFzf+N9XLGuMqgcHFDglHE+Je415u4GFTYW7mu5ozuG5cAy5qPXJy3+aLybonxlQj jKdaXAe5dOKZOgkO6ROlXjTABe9Fnn+uKZ7IS9BLPX8VxA1gaPMCxZHE8nyOPNeFm7F0bdgm33C /CCCnAiTlFlk5VQdO6Mv9RCo/8AaZOQygGRAS+D2GhigCnYmayRA== X-Google-Smtp-Source: AGHT+IFiKaVhur9fLuRyMkLTbTbioPhvuTbUKvoJM274VHjz6E/+phYwnKoizGiLlN6cqpMB0N1o4A== X-Received: by 2002:a05:600c:1ca5:b0:471:6f4:601f with SMTP id 5b1f17b1804b1-4772686efeemr9424655e9.19.1761774684231; Wed, 29 Oct 2025 14:51:24 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PULL 11/23] qemu/target_info: Add target_base_arm() helper Date: Wed, 29 Oct 2025 22:39:48 +0100 Message-ID: <20251029214001.99824-12-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251029214001.99824-1-philmd@linaro.org> References: <20251029214001.99824-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::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.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=unavailable 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: 1761774765954154100 Add a helper to check whether the target base architecture is ARM (either 32-bit or 64-bit). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Acked-by: Peter Maydell Message-Id: <20251021210144.58108-3-philmd@linaro.org> --- include/qemu/target-info.h | 7 +++++++ target-info.c | 11 +++++++++++ 2 files changed, 18 insertions(+) diff --git a/include/qemu/target-info.h b/include/qemu/target-info.h index e8fbdf19d53..62359622232 100644 --- a/include/qemu/target-info.h +++ b/include/qemu/target-info.h @@ -50,6 +50,13 @@ const char *target_cpu_type(void); */ bool target_big_endian(void); =20 +/** + * target_base_arm: + * + * Returns whether the target architecture is ARM or Aarch64. + */ +bool target_base_arm(void); + /** * target_arm: * diff --git a/target-info.c b/target-info.c index e567cb4c40a..24696ff4111 100644 --- a/target-info.c +++ b/target-info.c @@ -53,6 +53,17 @@ bool target_big_endian(void) return target_endian_mode() =3D=3D ENDIAN_MODE_BIG; } =20 +bool target_base_arm(void) +{ + switch (target_arch()) { + case SYS_EMU_TARGET_ARM: + case SYS_EMU_TARGET_AARCH64: + return true; + default: + return false; + } +} + bool target_arm(void) { return target_arch() =3D=3D SYS_EMU_TARGET_ARM; --=20 2.51.0 From nobody Fri Nov 14 18:19:16 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=1761774822; cv=none; d=zohomail.com; s=zohoarc; b=ZyrqSetVh7mWgeuz7jh8PVYowlRT5mFxs5lAKGU4G1L4nfmVeovB35d7esAcNnVnFC0nu+bgUD4ASSQqGs9vVDq2rpDC8B13+nZ8InQzGItmQ+nDzECNVTuyfEvUH7wM2Q2NKLqr9Wfy1719sMKY88VFKlQE/dr8hwdHxV/ScXo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761774822; 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=WnP83I4Pbpr8sS9CrOTJFfkYpAE0M6v2XmUQlH30ozc=; b=cAPI0f5V1IcsC8idJ2zPgzUxlPRQZa4rrMqfQsQAXKi9y9I3gNhRoOfOfSLL4SqTQKw1RNTxcUrlFg8YALZl0B8mnH2cBiXjkXKHkDjp+s56OTkR4bmUsilYpPGKfcN/WaR0DxIBB+3s+Zyfmv6II6/mPCcoqtemqRHpdg4Pl2A= 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 1761774822706187.30206361116882; Wed, 29 Oct 2025 14:53:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vEE69-000704-2y; Wed, 29 Oct 2025 17:52:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vEE64-0006xC-5h for qemu-devel@nongnu.org; Wed, 29 Oct 2025 17:52:49 -0400 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 1vEE5u-0007rv-JH for qemu-devel@nongnu.org; Wed, 29 Oct 2025 17:52:46 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-475dc0ed8aeso2327105e9.2 for ; Wed, 29 Oct 2025 14:52:32 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47718493c61sm52654575e9.4.2025.10.29.14.52.25 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 29 Oct 2025 14:52:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761774747; x=1762379547; 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=WnP83I4Pbpr8sS9CrOTJFfkYpAE0M6v2XmUQlH30ozc=; b=wNv6fBoH5NN0txuVk/lQxwlmZ4oCYELve6TRP66DRFT6wI50Uf4VOqm5F0i0yoTxc2 qfycrMjKCjh59+NHig6aQ4tR9qjrfOtMl9AWvT2EoOxU/86JMSam0Dc53G4acDLHInFr nKbCEqfqgkObB9aTEgX/Dh9m7nKqPL42HPSVzqZ0Dcwpecsa+ZUbZBHz6w0y5QFC9jsp qTLfZhdToyeTtG0h/LGbnQD0MVbmNjWSAi+xrdEeX5WDPYp9B+ug9s1AknrS3t/UaVSl /Y/Ei2WvgW1KxhiIPo63Hxr5Qr8j9Nt7HC0ezcMWFLcWKdyAqRICXeWmmnY60XF//lpg xi9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761774747; x=1762379547; 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=WnP83I4Pbpr8sS9CrOTJFfkYpAE0M6v2XmUQlH30ozc=; b=w0bPBUas9wToKMB+py01ymNiIOlLwaph4OjlGSYsHv4Th5OFaJLXMnRN/tWoy3HGhG 8XR+SEQmQC1c5xrA83YTH8bu/hHr1eWF7vGWCMm7vwRzWvrKmZX3iGU+gT3SCbCReqF1 i+hc0p/IkxzWUzxcmdZrRIlHmLn1V6NiC5MYgNESzXUcXLf80Vz8b7W4M3uF0W73q0cd Fu+htzOM5FWgpXlQ3EGkp+nwKaFIG1tX68OHN80FMhO3kNTyO/iF3lZZvRYzuFckrosF 1kZz0VkrXWtCzsog0LjBpKIejWNNc2NC1r2Jm/M6LcXvfSdVhpBB/wqN2fK/u/i3JdCO avmg== X-Gm-Message-State: AOJu0Yzbel0bZ/kmxcWM11FeWfOBhSo5KESMbbqQZ3gIakJXm/U6D/VR ZnbDvW5AiDvhnNIL5zdchhe+2wWbyngyNxgul1WXc54szdYIsvsifGtVVAKZ232lrv5wNcLHuVy zQzzG1jQ= X-Gm-Gg: ASbGnculvgSotyAwsTgESycxZ55JqJLeNogeX/dhCSiTGLeUNCeQjkkVDilab34adU6 W4bAOTTfPwmzbVzIL5Ag6HMlako7JZhhQkMvDK/BaYkrminjxhA3kfegzX0z5mQkKl94GnEbzmD 1aKLIk2ZyNqRfsBl5pWcK1f9/1/ex+0z1w1Gy4bIJMlH4tmmQ8uQDngss2UeD21QDqpKxaTihhQ zvbZXbS9mBvv1f6qrXmO8mRwhHvXKJ+jMm57dnqee3kCkW8J5NsA6TwEBlW8mtfellyr9wLjfaG +BFZRj9QoQPir1mq1P6bKArLGTfirgmk20yddbXQO/LiQgOpWjJQs/DwbeE79gFp0Urqa2NUNpR gJq4/eRSkt/sfTqOQrCjE0rPIOqvh+DDgYR/9OJpLeMszmHgjWnnZylG0XmrMudC+qEY+Kxe4ZB 9+P3ct19v/c8Iwn7YLBV8QBxC5TbHCGTx5HlZ31GIDtwAQbJaO9w== X-Google-Smtp-Source: AGHT+IFcd6kRynCCxxcZRTAiEZ3OdFwV9UPoUU8KHKUZBm3/Dcd0dDlwAd2G33/Db715ibOYStxFMA== X-Received: by 2002:adf:e19d:0:b0:429:b55d:25e with SMTP id ffacd0b85a97d-429b55d20bemr422317f8f.19.1761774746969; Wed, 29 Oct 2025 14:52:26 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PULL 12/23] hw/arm/virt: Replace TARGET_AARCH64 -> target_aarch64() Date: Wed, 29 Oct 2025 22:39:49 +0100 Message-ID: <20251029214001.99824-13-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251029214001.99824-1-philmd@linaro.org> References: <20251029214001.99824-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=unavailable 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: 1761774824615154100 Replace the target-specific TARGET_AARCH64 definition by a call to the generic target_aarch64() helper. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Pierrick Bouvier Acked-by: Peter Maydell Message-Id: <20251021210144.58108-4-philmd@linaro.org> --- hw/arm/virt.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index d3809754460..dda8edb2745 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -32,6 +32,7 @@ #include "qemu/datadir.h" #include "qemu/units.h" #include "qemu/option.h" +#include "qemu/target-info.h" #include "monitor/qdev.h" #include "hw/sysbus.h" #include "hw/arm/boot.h" @@ -3263,7 +3264,8 @@ static GPtrArray *virt_get_valid_cpu_types(const Mach= ineState *ms) if (tcg_enabled()) { g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a7"))); g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a15"))); -#ifdef TARGET_AARCH64 + } + if (tcg_enabled() && target_aarch64()) { g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a35"))); g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a55"))); g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a72"))); @@ -3273,15 +3275,14 @@ static GPtrArray *virt_get_valid_cpu_types(const Ma= chineState *ms) g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("neoverse-n1"))); g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("neoverse-v1"))); g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("neoverse-n2"))); -#endif /* TARGET_AARCH64 */ } -#ifdef TARGET_AARCH64 + if (target_aarch64()) { g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a53"))); g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a57"))); if (kvm_enabled() || hvf_enabled()) { g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("host"))); } -#endif /* TARGET_AARCH64 */ + } g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("max"))); =20 return vct; --=20 2.51.0 From nobody Fri Nov 14 18:19:16 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=1761774905; cv=none; d=zohomail.com; s=zohoarc; b=FL8istKNC3GAfuB8jH6ZFfkyuC2gw2hPOABhMFFaoPtAXn4FJSJP7M3fcxgoHQ3ZrMHz2BwDdmPLuQr12h/klZ/O8rD7pMjtiEqylSEWnL5WqGL36cSa+49G2z/VKkUY0dfl7gQqICbNFENa9XhvjaMt5HkBk/rPw/CV6Mi7APk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761774905; 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=8IuzXfYtFtGeolSJyrOSQ3n8KrRKZEFt8FOM0hiORo4=; b=PH5GJShw7+6k/I1EX2Ge6jwagScMmUr2S+bYlJzM9VM1ZDMtEYMmRQ43GbbEI/LS+05qRmaizFP9u91slPO82aUw4B2LkSswRnuCC+wRe1Vo0K+DlL0Mvmuuu08jcUw/cRYlMsGU/ZAtB5+wFxxc5csyniZmKBoTIfpJ9QBN7Us= 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 1761774905691991.4772058728347; Wed, 29 Oct 2025 14:55:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vEE7I-0008Ib-FP; Wed, 29 Oct 2025 17:54:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vEE7G-0008HV-Kw for qemu-devel@nongnu.org; Wed, 29 Oct 2025 17:54:02 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vEE6t-0007uK-Dv for qemu-devel@nongnu.org; Wed, 29 Oct 2025 17:54:02 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-475dc6029b6so3633865e9.0 for ; Wed, 29 Oct 2025 14:53:32 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47719004d79sm52860015e9.5.2025.10.29.14.53.27 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 29 Oct 2025 14:53:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761774809; x=1762379609; 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=8IuzXfYtFtGeolSJyrOSQ3n8KrRKZEFt8FOM0hiORo4=; b=ydDyWXK51Esb3SqVpBbkh9UWoURg/AqFGUuWhEVuWKMuh9n8rZUwPeTwfHfEb+gbKK 8W2DCR2m7Sc0r9zbA0ysO3xUjwgGTrji3FoyStk2cFvU8aJGVe8A2wH6Me8iDuXtjNr1 jDMxgM5/N7JB5Wb5ZmcBmKEOYk0HviIvVQAMG/021RTmyPi+GTChzXFNjS95kmJxel7V dyBPhCxPRMhW442PQvx81o3CBnNN1O7bATwewZMwdQi09ZIWGFWMmYZZIvp81a/bnvEE n34L66upcj/5PjpAGHalhrM5R7Apg+2w//iYPeCsLLOts0ctUcd3tkG6R0Z7Vat6Erg1 n30g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761774809; x=1762379609; 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=8IuzXfYtFtGeolSJyrOSQ3n8KrRKZEFt8FOM0hiORo4=; b=hSEPORRVX4xXnnK5AelZz4MPTv9Id5kUSv+l0vnI77q6hnRyr8bLr8iMdzhg2BCY/a Tk7dgHe7sAkX9Zo+f2Fw1gbM66mi+M58KISr75roaNLQ4EFaD4OZomxZZB9E+fUHbeO0 YnCE/fzaMaQ0D/0TZytow7oM8UpWkKdg3zbkfI/1R1afcFTtcZiLcwbNDeezEVKEXxGV kTutyHAsnmtdHOx8DtL/uEzK+euHPx5WDnGwAzmSqco5x1qxMw8Bd1AOcdvvgFxWGHq6 L+YIPk/XFMmuB8ZUTgeY2E6bYWkYbw+G4irGWwGJM9+jpqW4N7x11l+T4+u7RIrw7xOz n4uQ== X-Gm-Message-State: AOJu0YyVUEFzkfNNMYlJLwSdLkIVDZWctqTUvY1g6IwZN1R7CX9Onf7H zMVJeDVEkXpgMmGyLoHP294lzu/VOZHXF4PkUNBVEpLQ/EOSauayLR7X7jYBVpjDGEfUiCeoPmT QAWzZaRY= X-Gm-Gg: ASbGncvuBr80d/Uem+se2oWR6PnP9J4kspmiXrzqQDIcpu3mCXy/ERSkFgbD9fAv6uW HSYr+BNNaZDNxQKoSjQkpoHpzb5IgkiLfCjWqeKCYnXSOqHERhC5jB1j9PpDgbsEnHqTYMIWkUv UDagh8Lp+jwsNmOdqATYSwD1gru6gZHTeLZ227uWbPrXzqOC+DEfnlKk70CkrZhuQ4TuPup2YKW Zm0YG41o8X/nW807htvs7ZwMgxpINzJQGNsbWmwVI759R3LUFLyMM1RG69dU+yQ8NGAdAhDSmBq uj/LWcXkp0zIrMwLu7FvWyprv6QGQCCCKYIb3o9QMHuLCoiDTst0L2bBiir3bihFRJWws77V1Jw fXWAQGWvZXTum0aDWrxWa1wlR6AqZ3pnzcvuSUJmxUXahAiBcj1C5FWAA+LVRzdpcDxKPPVkWPs 2c1H+7LJltdgydXCFlj1uDXkBI5i2JsSb1MHfnozJoKZKehWI2pA== X-Google-Smtp-Source: AGHT+IEbCv9u46QjKnA4rQkkvi3GpFj/ow6eoLMh3K0PHF3wh6oDrcUw1YVhVtjAlpwb6ICi2ZtJIQ== X-Received: by 2002:a05:600c:4ecc:b0:46f:b42e:e360 with SMTP id 5b1f17b1804b1-4771e1f3e35mr37477755e9.40.1761774808573; Wed, 29 Oct 2025 14:53:28 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PULL 13/23] hw/arm/virt: Get default CPU type at runtime Date: Wed, 29 Oct 2025 22:39:50 +0100 Message-ID: <20251029214001.99824-14-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251029214001.99824-1-philmd@linaro.org> References: <20251029214001.99824-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::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.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, T_SPF_TEMPERROR=0.01 autolearn=unavailable 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: 1761774907548154100 Prefer MachineClass::get_default_cpu_type() over MachineClass::default_cpu_type to get CPU type, evaluating TCG availability at runtime calling tcg_enabled(). It's worth noting that this is a behavior change: - Previously only ./configure --disable-tcg --enable-kvm ./qemu-system-aarch64 -M virt -accel kvm would default to 'max' and ./configure --enable-tcg --enable-kvm ./qemu-system-aarch64 -M virt -accel kvm would default to 'cortex-a15'. - Afterward, -accel kvm will always default to 'max'. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Zhang Chen Reviewed-by: Pierrick Bouvier Acked-by: Peter Maydell Message-Id: <20251021210144.58108-5-philmd@linaro.org> --- hw/arm/virt.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index dda8edb2745..d07cfe16512 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3257,6 +3257,12 @@ static int virt_hvf_get_physical_address_range(Machi= neState *ms) return requested_ipa_size; } =20 +static const char *virt_get_default_cpu_type(const MachineState *ms) +{ + return tcg_enabled() ? ARM_CPU_TYPE_NAME("cortex-a15") + : ARM_CPU_TYPE_NAME("max"); +} + static GPtrArray *virt_get_valid_cpu_types(const MachineState *ms) { GPtrArray *vct =3D g_ptr_array_new_with_free_func(g_free); @@ -3312,11 +3318,7 @@ static void virt_machine_class_init(ObjectClass *oc,= const void *data) mc->minimum_page_bits =3D 12; mc->possible_cpu_arch_ids =3D virt_possible_cpu_arch_ids; mc->cpu_index_to_instance_props =3D virt_cpu_index_to_props; -#ifdef CONFIG_TCG - mc->default_cpu_type =3D ARM_CPU_TYPE_NAME("cortex-a15"); -#else - mc->default_cpu_type =3D ARM_CPU_TYPE_NAME("max"); -#endif + mc->get_default_cpu_type =3D virt_get_default_cpu_type; mc->get_valid_cpu_types =3D virt_get_valid_cpu_types; mc->get_default_cpu_node_id =3D virt_get_default_cpu_node_id; mc->kvm_type =3D virt_kvm_type; --=20 2.51.0 From nobody Fri Nov 14 18:19:16 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=1761774931; cv=none; d=zohomail.com; s=zohoarc; b=UghXpesIPCCkML8UjOcONftrYrP/GanBlW1Jn081UWqZnKYb23L2kp4nk05WnxdsUnJipI80Q59K1Ev/qO6gPNq7DGNVLMgsjF5Uz6e9AbR4wwOaxhL5Tk82T+kV154fJRUpoFhrvuslyU/VGNhDO6aKAJjowmyUpAM/+UtNmso= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761774931; 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=a651872IckFxyI4zFPyEsBWF3frcPZiE7HAcMIqgSHY=; b=FjQmpO4TGTcmys3jONcRLu93mmBh9CG2GYnN1kK9nmWV3FsXZMC+27IMY+O7LoSHrsJJcNG32a5+Kzr1axpWK/5wxPkKcq2dRAKlk73i1gj5tv2ocM16kH61wGycvOMg5Ns6ONgfnK60KpGIDucozI+bDFqxCETTvgi5hUTbAMM= 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 176177493185860.350342579276685; Wed, 29 Oct 2025 14:55:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vEE86-0000Tu-RW; Wed, 29 Oct 2025 17:54:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vEE85-0000T7-7i for qemu-devel@nongnu.org; Wed, 29 Oct 2025 17:54:53 -0400 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 1vEE7s-0007xp-Dr for qemu-devel@nongnu.org; Wed, 29 Oct 2025 17:54:52 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-475e01db75aso2090225e9.1 for ; Wed, 29 Oct 2025 14:54:33 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47718493c61sm52680805e9.4.2025.10.29.14.54.29 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 29 Oct 2025 14:54:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761774870; x=1762379670; 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=a651872IckFxyI4zFPyEsBWF3frcPZiE7HAcMIqgSHY=; b=Xd3k857WNl0FVoyH3w8zVoyzGCa83YL/gjsEz0yzD7i4GK7zGBWrfV/XhXEvpJ2F1k juHcQXgAfNt1hTs6B2lbrC93TiMIWeHSxnSl+XUiWS6x/c1s9xYFKmbl1Q5YPnRxrNVj 3Cenhqv+Ba9OegZEsi3dE1IjS7xHTwuqK7aou4rMBwqGI8hZs/LGGXYFfWsvz7Xw6JIW lPUfYDG3kG9QEL1reUBnW/DVa/E9iYu1LX6h4sZ7YIh8KNDNTBPNDo4KPjgwdagD8A07 UjN+/jXrWE/+xDWE3YbTTSgia+atpsb2Rsk7wRWlvQF0vOFDMHu5TjpSA4uYiIUgLxW5 LEiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761774870; x=1762379670; 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=a651872IckFxyI4zFPyEsBWF3frcPZiE7HAcMIqgSHY=; b=TysLN/ffB/UkUCdTGOUvZ0qCNdhIKd9/eFyH2+xL47y9rXicCWOJfgYkQbAkK+ZSXR AOTN/AXFQkO5lAqE9hH5gNF3aKDrO70IievGK7PdE7Yr1fyltfpmNBPdrorPZQ15pwoB 3wXh6Oq8VgMTdsJLd8TKm+qwDMHesfsDLpM0xJZHqi72MvElLpXKIXjocbV/2/CHkutd sWb9Kk99+e70SsoIH2FxSq2EbGY9g8FLrlq1ATMx7bR9YgCNiTEovV9JJksBHzgK6GSt 0tr7wLtY8KX3SkGG5X41QvRG5NcST2QJBs3sNoObWKijX6QCLswL5TggTZ3fm8Yg4nKv VoWQ== X-Gm-Message-State: AOJu0YynUveZBRjTTFGutEZnE6KDGdtpDz0tdcZdMspn/u+PeJqVY17d F8dnEWOZYkAuCnyKIift+GtiG/OlyHXm4pqJad5FBzMCWLjWKUYGi5TwbepRie+T2OfV13AoFEO gOn4lBF4= X-Gm-Gg: ASbGnct9MkmdyjwETDOLJMPUAwseo2cH5nSgAoMZTzdw9u6DFaohl8fK3+Xuv5d/8eN MlOnjo6hiZJxou2eIkb7H0VQEyEKqjQEjEjpayoAixaIUPa2PtfAES06zfYI23KmvQUR1Vc0xdK flhzIA5XyoOyN0QiiM2Li4obgLkg999kmyBgKGAanxuVROjqFIRace0YET4pQt101TnlssMAg0d itF4lxNza9XyvI3rB5Go0yGSQwXtHs+rc9Hn8Xeo7qf/qdTtRDobWgiETSo5D3VAbVxRt+PsfZ5 KQX3ejwr/O59rhqsrvvf/kTKSKCIB5aluFVOrZdnXf6ROMYXuw4AQcq/LYMojsIJ0wtiNeQIp+S Z5tcg3V63OzVTTJ7azipbchSDeWOQ2CHLUfwKt4YdrfCyGApOGeSvn1Hiq+tFlgg7rEALJ/+aKV yi+BjwseMAguhjGv1A9UoVue0JN0oJuZJZZIFqowcx2VcFmVn7HQ== X-Google-Smtp-Source: AGHT+IFHimm9eBbWvD/BAcs81SRDcF7UJ8k+1Hf6mJ2tc24EXAVR9UTMqj5twiCCVEznWQcHT+fGBg== X-Received: by 2002:a05:600c:3548:b0:46e:46c7:b79a with SMTP id 5b1f17b1804b1-4771e33045cmr48811955e9.2.1761774870243; Wed, 29 Oct 2025 14:54:30 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PULL 14/23] hw/arm/sbsa-ref: Include missing 'cpu.h' header Date: Wed, 29 Oct 2025 22:39:51 +0100 Message-ID: <20251029214001.99824-15-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251029214001.99824-1-philmd@linaro.org> References: <20251029214001.99824-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, T_SPF_TEMPERROR=0.01 autolearn=unavailable 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: 1761774933740154100 "cpu.h" is indirectly pulled in by another header. Include it explicitly in order to avoid when changing default CPPFLAGS path: hw/arm/sbsa-ref.c:162:25: error: use of undeclared identifier 'ARM_DEFAUL= T_CPUS_PER_CLUSTER' 162 | uint8_t clustersz =3D ARM_DEFAULT_CPUS_PER_CLUSTER; | ^ hw/arm/sbsa-ref.c:163:12: error: call to undeclared function 'arm_build_m= p_affinity' 163 | return arm_build_mp_affinity(idx, clustersz); | ^ hw/arm/sbsa-ref.c:746:25: error: use of undeclared identifier 'QEMU_PSCI_= CONDUIT_DISABLED' 746 | sms->psci_conduit =3D QEMU_PSCI_CONDUIT_DISABLED; | ^ Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Acked-by: Peter Maydell Message-Id: <20251021210144.58108-6-philmd@linaro.org> --- hw/arm/sbsa-ref.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c index cf6e6eb208a..2205500a8da 100644 --- a/hw/arm/sbsa-ref.c +++ b/hw/arm/sbsa-ref.c @@ -52,6 +52,7 @@ #include "net/net.h" #include "qobject/qlist.h" #include "qom/object.h" +#include "target/arm/cpu.h" #include "target/arm/cpu-qom.h" #include "target/arm/gtimer.h" =20 --=20 2.51.0 From nobody Fri Nov 14 18:19:16 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=1761775034; cv=none; d=zohomail.com; s=zohoarc; b=TE+w90Hb3ouxOsvY/fE8Hf8bgY5yJIQPCnOXNoMWSd4/lM4Y0EIMeSZ+3ZaxQuVCnx01NDrxqkk0Ic4tq83GgV+wx/Ug1QRmeSsNraz+Fmtqycp53dnB3+jwvZBcvsp4kCg/DMf/qFeDQOpWheff+NguY4MzugfZq4pqefhJTKY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761775034; 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=EOPF1zFpZ0IVButgmQFJplfYa1Vz8SXRSfLGOFADvUA=; b=dSioG1YPEZ/uOM6IrSNS3WjqjHvUO7rQW94Mb5/JHgY/YPhcgBlQFNCbIymMrTs0DhB61TpaqE/nW6KxEFEydXEAZ69khE+c+afEKrZWr4isiUD8wRQPU6gSc0QZUWhgTtS6kX+0HK28L/glQvhNhQgHvn6jkQ6vofLrK/tNGrU= 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 1761775033998570.4514423427306; Wed, 29 Oct 2025 14:57:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vEE99-0001Tb-DQ; Wed, 29 Oct 2025 17:55:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vEE97-0001SW-HR for qemu-devel@nongnu.org; Wed, 29 Oct 2025 17:55:57 -0400 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 1vEE8p-0008Fz-VA for qemu-devel@nongnu.org; Wed, 29 Oct 2025 17:55:57 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-4770e7062b5so2388725e9.2 for ; Wed, 29 Oct 2025 14:55:35 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47728a97656sm3936615e9.9.2025.10.29.14.55.30 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 29 Oct 2025 14:55:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761774932; x=1762379732; 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=EOPF1zFpZ0IVButgmQFJplfYa1Vz8SXRSfLGOFADvUA=; b=tgGHM3mGmJyVwgKqVCCWWtIUOLmpFS/PaieEZwfgVj9hqyjhadtu/zP/9an//y4nls OSI7PEKPFDT9KshToiKCKMXjgwcpJmtdKUYBz65DQmHLY7EZzUR8sXOWfHHnIFK85jaL 7DguQGGfy1H+pJNBRgyl1nRhyBuaGfQLE2bXmCtgQu6jK5eE1b7l+gBSuK2E61fOmRki c8+Rr8xaZxoabKV2C23sEiDNBnFRs1sOA8pYF7N+0aRexZ+J1ok/V0dMLeP8kHD5lnsy 4mq+UX/6aC7jFBsJps8AWbkSmpPibJq8R/eJvllQQ5W0SlEnj7jqeBB5YuoryIR9AQds ZH6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761774932; x=1762379732; 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=EOPF1zFpZ0IVButgmQFJplfYa1Vz8SXRSfLGOFADvUA=; b=wV3j0PpP+piOBwae2QHkzupmS/rygm9b3R/4AOj+6yTSdp8zGhkiRbsugNhitOl7yz o1noq60Rc9LI/A0YVpKXK63c8LHCpXCS4ls27SYS0uylb+yTDQ6g7BhW/rxMaEACI3lU gMy+umNxWgu/puQsuDiEx4hx5h0KQP3ltIz2SU2VoX3pIHyACBGTbuaavQM7MvLWzPiW D7oVA+scqzPyf18kkjbSgMWaS5x5yOWul7GjOYMRuanLmoyLjiUCByu/zHVF9DvLrX+g Kn0mKEQTWhyEstWKRmJD6zICkYNcKPm9nTzo0X7GuN9dCsjc3z4S3WnfgnDExeTmnX/v YLiQ== X-Gm-Message-State: AOJu0Yw42XkLt2cKCPYLka4kPdgbMr/wR8tmS2k5GyBMcyaghQnH00Pp ZGpY6nMbVTDb1R1wgUTOalg0Scc+vFh4hJKxx242J2oW2S3s2sgEnKs1qpCeVUvFAyB7g16kQrl SYB7joHM= X-Gm-Gg: ASbGncuRQAr2HhoLx9aPegwqfbYk81n8KVcwUW8WbZDI6FCwHXNhwpys0C4FYz8JkiK j+Rr8kxwlt2IQDF4uzzLic6I2BME7abe3Euf5q5XTR2qvFQTRg4ZaKyfPyQs+i+P3+XeuBD3yDc L81Wckf49ZWU5MGDijpLM8RG1znG4Wy3VNIm00pX99/tiQkYchDP6RhMARBbRmBWPzoCuSTeV6V p9RrCZugdT4UAQPo/+YJ4zgVgpguxOqj6zFh9/0qv2fWRBRLChNjTptv2Jpib1vjhLSziz4JJBA 9MwM2PDXnplwsjEgEMCAd1mtt4UAHa+Fq78UEw/pwAMxpz/HsOoumG8Vp6VKDLQq3l6zANQ35rM bNmWHnArXX4ppauGmEmtG5eERK/2rILqQxi49m+Wnnmh4H2wcCdLYKkzXr0KYG6b+yAuOIEl1DF QiZiE56NOB5DFQW6IWNtQIVTVUZh5380MFDqRj+hPkIaWl2xK4oA== X-Google-Smtp-Source: AGHT+IEl4nUv2n4I+KrswPcLjQvm2w+xDSmJHfLBFVN5aeuMLEmDwo3pmxbxmfUOW76fgzkvzkSriA== X-Received: by 2002:a05:6000:2307:b0:429:8d28:4079 with SMTP id ffacd0b85a97d-429af002489mr4416430f8f.62.1761774931664; Wed, 29 Oct 2025 14:55:31 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PULL 15/23] hw/arm/sbsa-ref: Build only once Date: Wed, 29 Oct 2025 22:39:52 +0100 Message-ID: <20251029214001.99824-16-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251029214001.99824-1-philmd@linaro.org> References: <20251029214001.99824-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: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, T_SPF_HELO_TEMPERROR=0.01 autolearn=no 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: 1761775034980154100 Since previous commit allowed the use of accelerator definitions in common code, we can now move sbsa-ref.c to arm_common_ss[]. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Acked-by: Peter Maydell Message-Id: <20251021210144.58108-7-philmd@linaro.org> --- hw/arm/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/arm/meson.build b/hw/arm/meson.build index b88b5b06d7e..531a635936a 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -14,7 +14,7 @@ arm_common_ss.add(when: 'CONFIG_OLIMEX_STM32_H405', if_tr= ue: files('olimex-stm32 arm_common_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx.c', 'npc= m7xx_boards.c')) arm_common_ss.add(when: 'CONFIG_NPCM8XX', if_true: files('npcm8xx.c', 'npc= m8xx_boards.c')) arm_common_ss.add(when: 'CONFIG_REALVIEW', if_true: files('realview.c')) -arm_ss.add(when: 'CONFIG_SBSA_REF', if_true: files('sbsa-ref.c')) +arm_common_ss.add(when: 'CONFIG_SBSA_REF', if_true: files('sbsa-ref.c')) arm_common_ss.add(when: 'CONFIG_STELLARIS', if_true: files('stellaris.c')) arm_common_ss.add(when: 'CONFIG_STM32VLDISCOVERY', if_true: files('stm32vl= discovery.c')) arm_common_ss.add(when: 'CONFIG_ZYNQ', if_true: files('xilinx_zynq.c')) --=20 2.51.0 From nobody Fri Nov 14 18:19:16 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=1761775058; cv=none; d=zohomail.com; s=zohoarc; b=YoYUGtPbcmROiGlhrd5+9mjGkpuKyn8a2m1dTRtXiKxsvWWZMJ3BoioX4jvlzp/64BiADBlxW9yx6ZmxT93IzzvGjw5/E+pXWW+22YaUmCoAar35lH6n4n3fhqImpQdXa0U3eIWopBW5fBl55YcVbnMOyPx7Eng+87SYM7AdH6U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761775058; 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=zG/Qnb38xympFyj6CMDqOivPUjIexpytFtgM6ZeeyWk=; b=HT2T4cE3yjml85YUmWyt7FsEkvHWIxgB+bAJbNgfqokJR9Aa+Dsa1v5aUEPlgcUEuHHyrTICBbsJ2/RH2HaBSxgdm2JZNT009PvYI88Ay7z09IM1vuF1fD7tYJXae7f7LGCXbZghCFAOcSakOwFtdVQZbUiNMoqKEcexiB+XbE8= 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 1761775058485865.1349865664934; Wed, 29 Oct 2025 14:57:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vEE9w-0001rA-Fn; Wed, 29 Oct 2025 17:56:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vEE9t-0001nu-UJ for qemu-devel@nongnu.org; Wed, 29 Oct 2025 17:56:46 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vEE9l-0008JS-T5 for qemu-devel@nongnu.org; Wed, 29 Oct 2025 17:56:44 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-470ffbf2150so9067545e9.1 for ; Wed, 29 Oct 2025 14:56:36 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-429952b7b2dsm28162128f8f.2.2025.10.29.14.56.32 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 29 Oct 2025 14:56:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761774993; x=1762379793; 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=zG/Qnb38xympFyj6CMDqOivPUjIexpytFtgM6ZeeyWk=; b=rnXSLzcyGQFGDOlaHAPbJLUqxb/BjprQe2ljPTKEouKXB68gNoAiNGjHPqru5zsQMg HQO3QhQauOfDMBYAdW6usZ0EtUadMoo3vunlUp52BMgH2VkVqRp+VyfSUeCGSp0A3miN jDSBhEHiWICmc7IrDGurslWkOXThgXw0OvVt9nVnb8eRYDIdsRZtXBfq9CgOj6Zw2/Go wT6/CwHwNGi5pjvk5k9wITdsR258VQtYfne8TcTsWdfoiPeIB1SKAkM5F5XFk39FWzmr VJYV0eNwNAItfQJEYfHz1UCVVF3BKKtw0o9ccP0cAAoaiTtnG9VU5HMzgw/50WRXy0+U gRLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761774993; x=1762379793; 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=zG/Qnb38xympFyj6CMDqOivPUjIexpytFtgM6ZeeyWk=; b=oHibLQBEwfSIrsGfe88dieYjOeR/P1CKeZmYhVkT9VmpkmRMjrL7X5Nl6nQk5CwyAG oJW3EvHrwdZrEnkxVelK+CLbCoNSTg8qxvvWdiWqM5CoclADUjbdASNwloK2lLSJ/X2j QRT2VXitRpYJIwxuWcd8cWPHs5lKBjyIkSakp6R5BtsrZ6FPT/EGvIc1yAzQ2HYq6RQ8 rZDunxwxopPaaH9kUNu1dWIw8bK0wuuDHX2FFNHagGqt1lVmW8xqR+uip5/xX+/SyuaZ m7fNBhX/Zt3SmM5Di1x6+CJaPb5MhvFH3jnCaUfIYl1PL1gO/fW2sbmN157cP+gGr3NC Aqqw== X-Gm-Message-State: AOJu0Yzifer2CPRbgxG9HrhFfZy2wjgAXf1JvADKTGKirxGP+tAlgHFs +2yLq/n8C7xNnXivBJR6aFrdYdKrjGMQkpFqqvQZMQmuXvr5KK7YWMf/36/mjpXFys8pzNs8eer WdqZnD/g= X-Gm-Gg: ASbGncth1F9pTMVqjlhCiYx7Yg8nHPuAggO/q+qJ99JdtUw+93/epNCUVeNMLLk/amq bBfEzWK4eUTkKTZVOVdeFcbtXgubn5qCtjUV7eWzGbHtTsbxzKOBZXzXC6xDBAvH0vlWzHp9DNw 8hcTXId30gZk05WbP52QmLVhNY/IN1QT7ZPYnu+YJQpAB2eMApmaX4yIE4HndRzkEf0RZ4AkhoR 6u8h56mzAPIZMb+L2wWxBnunhbcaFcGbd0pAd4VxBnVz+lB2PQUJcQOmh7DI2heeaRa19KyHfCE cr9kRJmy0FHQnAiD2mAVu717fNtcTmDHPjWw6W2ev453lvN5Kok7mpoMw39Ma3Vzr7AaZWe9YxX yWzOtVfuh1HhgWGiMsn8xSsRxV944ZqemTqhtOrO+fFbPmBqNs04xMn2vrJzEGNVPYp1J37P/w9 ykRctPytXt9f9vCtCncl29MEQs0x6DVA4lwWwEzdQ5vRBT97QWRQ== X-Google-Smtp-Source: AGHT+IEgYXAiNqbgrYwZxHxjm0MWEUHv/nwLsIkcUaY8N0ly4tQPUx/xK+zoagSb96myG2MM2QSJ/A== X-Received: by 2002:a05:6000:24c4:b0:429:8d74:4b16 with SMTP id ffacd0b85a97d-429b4c81dc6mr919430f8f.20.1761774993159; Wed, 29 Oct 2025 14:56:33 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PULL 16/23] hw/arm/virt-acpi-build: Include missing 'cpu.h' header Date: Wed, 29 Oct 2025 22:39:53 +0100 Message-ID: <20251029214001.99824-17-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251029214001.99824-1-philmd@linaro.org> References: <20251029214001.99824-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::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.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: 1761775063930158500 "cpu.h" is indirectly pulled in by another header. Include it explicitly in order to avoid when changing default CPPFLAGS path: hw/arm/virt-acpi-build.c:903:34: error: call to undeclared function 'arm_= feature'; 903 | uint32_t pmu_interrupt =3D arm_feature(&armcpu->env, ARM_= FEATURE_PMU) ? | ^ hw/arm/virt-acpi-build.c:903:53: error: incomplete definition of type 'AR= MCPU' (aka 'struct ArchCPU') 903 | uint32_t pmu_interrupt =3D arm_feature(&armcpu->env, ARM_= FEATURE_PMU) ? | ~~~~~~^ include/qemu/typedefs.h:30:16: note: forward declaration of 'struct ArchC= PU' 30 | typedef struct ArchCPU ArchCPU; | ^ hw/arm/virt-acpi-build.c:903:60: error: use of undeclared identifier 'ARM= _FEATURE_PMU' 903 | uint32_t pmu_interrupt =3D arm_feature(&armcpu->env, ARM_= FEATURE_PMU) ? | ^ hw/arm/virt-acpi-build.c:993:10: error: use of undeclared identifier 'QEM= U_PSCI_CONDUIT_DISABLED' 993 | case QEMU_PSCI_CONDUIT_DISABLED: | ^ hw/arm/virt-acpi-build.c:996:10: error: use of undeclared identifier 'QEM= U_PSCI_CONDUIT_HVC' 996 | case QEMU_PSCI_CONDUIT_HVC: | ^ hw/arm/virt-acpi-build.c:1000:10: error: use of undeclared identifier 'QE= MU_PSCI_CONDUIT_SMC' 1000 | case QEMU_PSCI_CONDUIT_SMC: | ^ Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Acked-by: Peter Maydell Message-Id: <20251021210144.58108-8-philmd@linaro.org> --- hw/arm/virt-acpi-build.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 8bb6b605154..200e2a1da70 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -62,6 +62,7 @@ #include "hw/acpi/ghes.h" #include "hw/acpi/viot.h" #include "hw/virtio/virtio-acpi.h" +#include "target/arm/cpu.h" #include "target/arm/multiprocessing.h" =20 #define ARM_SPI_BASE 32 --=20 2.51.0 From nobody Fri Nov 14 18:19:16 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=1761775165; cv=none; d=zohomail.com; s=zohoarc; b=PXbyYROlI0DiXPPNmy6cfIG8KYmSz0F83MoeptttVgeZhbnhl8wlJDWfsHSAYNhdwwes1p9Q1kiSZpdRIZ13jk/a2G/IeTbvBZ0jW4fCLZxFTsvYIZILapSW3nCBwFd2ItMkWfr0jX5xLctrT+3yn7XW14J0BTiYUCJ2NVeqClY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761775165; 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=S/Qn0QwFRC01wWBNNPvlK2cZsOIvY8UHWwsuTo+FxbI=; b=QVJcEri0rOvkaaMm7x0MEysTHgrwHRLoVUrWHECfvxLDLrZWePSgmX2xeMnD5qWaLpNnol8B6Dgs91GBEkcIvZXco5IZdzpMaSKbi3IGjXwa8qdqM145xQ3sLHEIZetAohGoIFV+xFLfIdEUegBJhaoFR/By6X4AHCqAKyQtgwI= 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 1761775165609480.5339236160812; Wed, 29 Oct 2025 14:59:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vEEBX-0002yO-FY; Wed, 29 Oct 2025 17:58:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vEEB8-0002mz-Jz for qemu-devel@nongnu.org; Wed, 29 Oct 2025 17:58:02 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vEEAu-0008Lb-4M for qemu-devel@nongnu.org; Wed, 29 Oct 2025 17:58:00 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-3ece0e4c5faso314830f8f.1 for ; Wed, 29 Oct 2025 14:57:39 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-429952d3532sm29188554f8f.20.2025.10.29.14.57.33 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 29 Oct 2025 14:57:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761775055; x=1762379855; 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=S/Qn0QwFRC01wWBNNPvlK2cZsOIvY8UHWwsuTo+FxbI=; b=ghGmu9lEqAPF6nxRSvCZR04c3eeVvajHQxCbvVHF+gChrsk0qeYN5znBfKGZWdPaRM YJn78h5/LFROj/U6/hju9gseQ5C0UtTkyqCc9W4PVh0CS6dxM1IJmjlNBuSVLz2cqJdj IZxVOD00Xy7A/ECwpIKeCy6JvKorZ3QDSsNaRBXJZKLTJq2Cg2k1BnjiRuL69XcM2+HW C6Xaeb/kkQjZK4Je5kgQY969PaslcQHbNpi2eyzLKxzrAGLWNVsT5JgCOXUxRXG0I674 Adea80uvmaNSQNFx6ZCiigNz4egGJ4nWYzB9cbePi05temAVHwMtJNrCzeqda/7khxCa pLcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761775055; x=1762379855; 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=S/Qn0QwFRC01wWBNNPvlK2cZsOIvY8UHWwsuTo+FxbI=; b=EoiY0T3QzE1qPnEII28wEoLlrqM6TN7RUZeYyX8x/wzPqA6NMY7AQx9i2PVYCmZP/q DTrDBMKgmNyVhQC63dxlrelye4O3uVaVpl5V8/fWJ5kzesnd605MSH/gy1QxdisYF97e o7c2dlMxEDyjdyCsMcAOy+PJvIWvH6KgZUXyMKr5UXhKt6ZaXK9ssJQ7cUZfmMY1ISWw uan7ISVfZE6tfss1aV6rrC6CzoPCrFkCTRT0wShnAUIrGJIGn0QkzBILgf9oTsp9R68p mC7UX237p7CvoZu5LPVd5zElVJGUgf+MarzYg4zHDgmgN97jQZHmNjKLfhl36BLMvgZB hmvg== X-Gm-Message-State: AOJu0YyZAbaVaOLz6OvZ6NYVSO/+wGUYhzp2nk2NHa+S09ycoT/HJqKI Hjbz+vIP4KsJc0UD8VVd3O3R7+qSOX0zA9Z3dUeurcUqn/xTQrYhVesBt6ExMhC2LauNrUqxHT6 PqKpQfF0= X-Gm-Gg: ASbGncus0mvcbSSgYRuCL1XKFxGoTassX1y/Y4vWf12OcFiGbdqHAjOBBKsMUjQAWq4 zj2IZyezkIAixyJSocDuYF4vZzPBnyVmAzOxquz2oBJpt4w9pi0NS7oghg0x1oz6QGgp1HOtSqj ghNlNfmnGyxWDN5johW/iuBSqH8lpKpoKcOjpXb9w7VrN/65FbmU08sOCSX5DqTRCqXMqxqxkDF AbsqJ5boMPa3xfd8DJhjlCVqAHS7n54VSZpKYuuAmHrQU2WCqJgGqPJi6EKtYfz5lq8QqNDwtnb JMQDCEbSngbNatOURggbfojgRdRwqhh7C3gpxu2evG9aCv7il6qd52hbkqzc3pr+bK5QzHliL7U KAVGFK0Wt883wF1sU7dwhRYzhHawdu/pVLKbdugWRI7EbR7P9ku4E08UrceevIUI7JdDFSr6/a5 g9ZzOdxaOPULXWSFKbCzvTgVMUElOK5Sj6yI6qfZN60C+77UGkzg== X-Google-Smtp-Source: AGHT+IHCgvhyjgB2qm2tEQcTA8zbTlJRdmVI+7s2FTKNJ9yE47qiCM1rLswz/RaAdrl+3Cl/FF1cDw== X-Received: by 2002:a05:6000:402b:b0:429:9272:c1ae with SMTP id ffacd0b85a97d-429b4c9afaemr810549f8f.30.1761775055469; Wed, 29 Oct 2025 14:57:35 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PULL 17/23] hw/arm/virt-acpi-build: Build only once Date: Wed, 29 Oct 2025 22:39:54 +0100 Message-ID: <20251029214001.99824-18-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251029214001.99824-1-philmd@linaro.org> References: <20251029214001.99824-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::429; envelope-from=philmd@linaro.org; helo=mail-wr1-x429.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: 1761775169278158500 Previous commits removed the target-specificities, we can now move virt-acpi-build.c to arm_common_ss[]. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Acked-by: Peter Maydell Message-Id: <20251021210144.58108-9-philmd@linaro.org> --- hw/arm/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/arm/meson.build b/hw/arm/meson.build index 531a635936a..df4c1be3b3b 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -1,7 +1,7 @@ arm_ss =3D ss.source_set() arm_common_ss =3D ss.source_set() arm_ss.add(when: 'CONFIG_ARM_VIRT', if_true: files('virt.c')) -arm_ss.add(when: 'CONFIG_ACPI', if_true: files('virt-acpi-build.c')) +arm_common_ss.add(when: 'CONFIG_ACPI', if_true: files('virt-acpi-build.c')) arm_common_ss.add(when: 'CONFIG_DIGIC', if_true: files('digic_boards.c')) arm_common_ss.add(when: 'CONFIG_EMCRAFT_SF2', if_true: files('msf2-som.c')) arm_common_ss.add(when: 'CONFIG_HIGHBANK', if_true: files('highbank.c')) --=20 2.51.0 From nobody Fri Nov 14 18:19:16 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=1761775193; cv=none; d=zohomail.com; s=zohoarc; b=Nede5ZJ2QM3VF4ueDZah4aouwXqreKY89zjPhFPdBK3FopSFIJvi2wcf8VVns+Se//nP63K7vrinpxIVhfX6PFGzOZdj80Iltfrtf2Rq3J9fTeRvJ5KGroJawR3lkYQ7qemHGg5HGgCTxt2HdNzy7XNzMaZMW3h2JO85wwyn+Z4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761775193; 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=8eEsVHqOoEuKegp85lNFkyrHkW4OqV5ZQ6TYlgOCxUk=; b=GurzByJnpeUwp1iEYyV86oGNo+FzMAxOoX2w7QlYd3Q7Z0VnnD1dY658i+faeJ9Dsy8KK5NF6iQTdwRYAXH7cjqx8+GJVMKVj2mPCc9i2oiDOou3sxCDdSg8FZy0JaJRdzARU9XmQSMLoXHhB5DQPIKO0yNCwfUjt1rCTscZMpo= 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 1761775193585911.486136316596; Wed, 29 Oct 2025 14:59:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vEEBx-0003Nu-K7; Wed, 29 Oct 2025 17:58:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vEEBv-0003Ma-O7 for qemu-devel@nongnu.org; Wed, 29 Oct 2025 17:58:51 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vEEBp-0008R2-6D for qemu-devel@nongnu.org; Wed, 29 Oct 2025 17:58:49 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-3f0ae439bc3so184123f8f.1 for ; Wed, 29 Oct 2025 14:58:39 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-429952b7b43sm28667863f8f.6.2025.10.29.14.58.36 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 29 Oct 2025 14:58:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761775117; x=1762379917; 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=8eEsVHqOoEuKegp85lNFkyrHkW4OqV5ZQ6TYlgOCxUk=; b=wk+7dI9AflIhul4ws4z+mQ/xvnsrzoiAvIaIPkCMaTjBL0K1pAv0Ryakxsd+wp2n20 bycZjWRW6qK6Lt0bx01Mt3ljBcXYwbfC+w04n2LEawbPF9uqYfINRzohqVS/uxee/agx QsUXJAGgBwzfWrExmN6edDWpxgQiqqvGdRhYRtvC/hRWaDxqxEtV9WeQX/XC7bO6NYSb U7Zt4DUpJvtmYU3QY2l4wUmDz/b5C8WmH6xHD7vH0Y6Wtz8nUIX6Y+KV5bgLMphmPakQ yIVDrGQmOAbIXDs83kPvpCfcPuAr5SNJ6/TPnTm4CqRbZ7C5HdouZGd0+dIgweTSJVD+ wjIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761775117; x=1762379917; 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=8eEsVHqOoEuKegp85lNFkyrHkW4OqV5ZQ6TYlgOCxUk=; b=ry/Vry0e7cR44RUCZmM97gxZmkQRs5wuElk2bspJIrFoJYIC/O7eUdo16CgzHatIrE 8X0ZsKrGXAIICUDqcFW6bUZ7XU280xXObWDk/Xs7vyls1T7t9bRgefpsrr6ABNrWDtMg T0T8GPovLF7UsrmYOhoGUGywjMK9cxeqOzfot16sEsXJU+R/pM/hbuN1jsVhSrw3CXPE NgyeU/l0fchS9c98neWVS6uEPl9HafChRoZK7htrF1P0392JSZ4ZAstJSSpwBvUMgkdk F7fIH2WmU0mfNCDYJtlB7FciaN30U6gch9jCm8DY3XZkZB1btajULa1+LNWByRmISYFE Uhlw== X-Gm-Message-State: AOJu0YzzortvDsKlTDqrysTLoESAJ5p6vl3KJs2CoSnatB4KJgIfdLCK hI0A6EzT84QLCEg0QlDZSp6IPVSgP2cDfm9caENJ6ScdCGXuoSjLgBZGJr2q0cKNXIob2Rv+UHQ ZAmlXd1s= X-Gm-Gg: ASbGnctNZCiQL2nf4DtHmR1oRrcCNYdXPxvkOT3OHAj8GsXSsLa8e7XDp/g9H7UjveK ljy31AWbjz43/Y8OfOOhGVeFl8CJFfbLKHK7D5fH9GWIM7G7V55x6YEyj31Tmpe/vlvKnOVCIuF Db+gfi4wSqGDfNWGI4/Z5WiAehNBHT3sMesS6Bga1CREtfcBGz1TKblwsb/nUCNLtWcfkhT5AGx 2RlWiPnu/xsV2hwm2t0kd84lAoF2ZpqE0Q2/H1H0869Q/M3bu21Uv7gN1S926v9GKrjnHgaJQgF yf43x3p9BXVEy3BNdl49cL+rddrtDsML/mxO61XI52xPkGRSaI6tNC/C+XOucork1uDCw/sPwty l05mseNnKljU6DdL4pAxw8gmH1+N1GMNcwSX9S8qX2TTVjm3+cPncBgzgbz4E8Myb4jmYboy8Jq 8UhTL8wdJp5HS+oHRZJnEIvP157rSvJGNs7dHrPAYcs+q/HgMXUg== X-Google-Smtp-Source: AGHT+IHvf5gvu7jx1uWaoX2MnBF4KCAmPXv641va880tko1rx7Oxwfevik5Rr3U1uF0aOyIOIF9BTg== X-Received: by 2002:a05:6000:186d:b0:426:d57a:da9d with SMTP id ffacd0b85a97d-429aefda908mr3827502f8f.59.1761775117017; Wed, 29 Oct 2025 14:58:37 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PULL 18/23] hw/arm/virt: Build only once Date: Wed, 29 Oct 2025 22:39:55 +0100 Message-ID: <20251029214001.99824-19-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251029214001.99824-1-philmd@linaro.org> References: <20251029214001.99824-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::434; envelope-from=philmd@linaro.org; helo=mail-wr1-x434.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: 1761775194908154100 Previous commits removed the TARGET_AARCH64 uses in virt.c, we can now move it to arm_common_ss[] and build it once. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Acked-by: Peter Maydell Message-Id: <20251021210934.60483-1-philmd@linaro.org> --- hw/arm/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/arm/meson.build b/hw/arm/meson.build index df4c1be3b3b..9fbbbc9a6fe 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -1,6 +1,6 @@ arm_ss =3D ss.source_set() arm_common_ss =3D ss.source_set() -arm_ss.add(when: 'CONFIG_ARM_VIRT', if_true: files('virt.c')) +arm_common_ss.add(when: 'CONFIG_ARM_VIRT', if_true: files('virt.c')) arm_common_ss.add(when: 'CONFIG_ACPI', if_true: files('virt-acpi-build.c')) arm_common_ss.add(when: 'CONFIG_DIGIC', if_true: files('digic_boards.c')) arm_common_ss.add(when: 'CONFIG_EMCRAFT_SF2', if_true: files('msf2-som.c')) --=20 2.51.0 From nobody Fri Nov 14 18:19:16 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=1761775260; cv=none; d=zohomail.com; s=zohoarc; b=mTB/jMQ2ow6gPm4B7q73ZbKBRW80/5mD/oVBKLAwNFvFYSl6EF9kyTUGSycWP4DTM9LKVKt+Z8rnPK5PhPHG+Ynyae/H+8zBOfYnm+7jUcBwF7eFY/Gv8N30grJ6ax5s+6NOs5K1e1XS55WEZWFBowPEjjrb4AkhUDyXJK4Byak= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761775260; 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=Om77k056XpbEIuSnFj8sNIzaZIBQ5Vhk3FyzV1fN32k=; b=aWV6kl7ytxz2ynhGU4DzIsOBpvtDdw0PRjRFPQ99seW/HbHysRVK7TolWvU40tsgBOGWNMwEzNBuqChI+ilVK2JfZl7LmOg5zfhkHTz5B+uGwFqqc6kzVFff9o7fFkjhHBkI2TyhJikrW+M91nzDnlg2/Q6FRVFekDoww5srX90= 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 1761775260205412.25766983642575; Wed, 29 Oct 2025 15:01:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vEED1-0004LG-A5; Wed, 29 Oct 2025 17:59:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vEECx-0004JH-7V for qemu-devel@nongnu.org; Wed, 29 Oct 2025 17:59:55 -0400 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 1vEECo-00005X-OA for qemu-devel@nongnu.org; Wed, 29 Oct 2025 17:59:53 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-471191ac79dso3618545e9.3 for ; Wed, 29 Oct 2025 14:59:42 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-477289a5932sm4827725e9.6.2025.10.29.14.59.37 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 29 Oct 2025 14:59:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761775178; x=1762379978; 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=Om77k056XpbEIuSnFj8sNIzaZIBQ5Vhk3FyzV1fN32k=; b=yHd2VHFwgPg4GgFLhCusbsNGPMgvauRUyLu8J/TPCwcl7bQTiodPlUZ+ZHPsxBduQt XeYwcdZux3ombwhA5by0C3n4k4zy1Hfr55Ad977bfWDauBjbLFUxZy5GLNYf3Qe3136s H8jzIRNgDtiK3msckJfnAyMbwbKMVgI7AP7+T3L2t1Q6UAbTLeMPDweEYkxfVDLFuWgV 8Ch/6wLx8Fc3azo/4QYcoi8EEhmKQpW9WafOcJP9aQd+NCiauirm+aMW8ZQj7acE6ff6 rHqJlUChtDAnZWznpdSM3M220gLI18KBbjckrKSS0BbWBC3uUIIInrIb7g4JZ3bXV96z wcEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761775178; x=1762379978; 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=Om77k056XpbEIuSnFj8sNIzaZIBQ5Vhk3FyzV1fN32k=; b=Ftttk+tlq4LJxtaN3ueGbepK8SLjGWOnm8VVLfd/buIGkDG444bmm7cV4GuXvKZOzZ UZCcbTwT6W6XnQGz/Ioe1xKq7APdULnk9HpvMmnHHVksvdlJcAnnwrsEYo5J55OTy8z4 SMzzurNfBA8TopS1dgqOXEVK7pxswL7QdrLhUisksHpe04Uy0uVNGl9KM/ebuhrhfFd+ p/e2ERUFyPLol7OT0Wz1OfQD2gzwMb5/aRIiVo/s5YacorYjBlDdWlbZ8ZG6ujd9bwVW fSjPPWpmU9IwAvmTFAe8XwgHoSMvjmZTxberotpwLwXlANdb16RwU7EyhaWQSQOHPq7k 3VAg== X-Gm-Message-State: AOJu0YwKOPGjxzJDkYn3O0XiEhoY+C7fzPR3hUbhutpE4T1hrptFXebf YG3S7tdImJ5Cz38o6EQXGSJdu92XT4lMvDM95jbU650YcHDzjMQcx61j9IrZpjAKQFb8FHzWjg1 acuGO4uo= X-Gm-Gg: ASbGncv6eR3nXeocw0ngiSJKGwnsfeqraVtdYjxpkumTNFyBK3/zcQ/tEYv81eGHImn lNwMBFOD+f0kxCqEdxRw3WWmNvUxniUxUh1SOU8MeANJGz+seL666kXy9vE3YafncpgqTHouPEL 1Aiw1SVhJiTo0Jo124XVoAzznNJ2czmRg0h3IE5I1akraAwNX5zKN/BbSYR5w1T/CEyv5kkId6Q N4S3aUo9INKylV4DiU5zZhFD+jlhBPW3X6gudml8EJudnT1y93/YawEuzJi0WnhhMo9cQ7PGR+4 jk9GHZvyqGa78oBC4MgKBuOVXzAqBLXKyZOVOGXHPPxV9v1qiwPtOfvaluEZtlkpP4KJYT5klY1 OK/bck5t/7jTf2vamyt6VJEp6XZWm5YXDYm/w0h6IOd8RrY3jJxK2PpQreGklS6zw3H8LRYwsvX 6Ocind+BXNTvxUxXNxawYBaf/XGZDiCioeUc3y1rTBDT5Yi8Nt9A== X-Google-Smtp-Source: AGHT+IEWk0+NwkbvYXS4vcOXkXrHkKtBCtQiFW790Ow8S2NcP7Quu/vxgFXw9rYjI/g4XqIi6rXaQw== X-Received: by 2002:a05:600c:474f:b0:477:df3:1453 with SMTP id 5b1f17b1804b1-4771e1ed170mr45259665e9.28.1761775178572; Wed, 29 Oct 2025 14:59:38 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PULL 19/23] hw/arm/meson: Move Xen files to arm_common_ss[] Date: Wed, 29 Oct 2025 22:39:56 +0100 Message-ID: <20251029214001.99824-20-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251029214001.99824-1-philmd@linaro.org> References: <20251029214001.99824-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: 1761775261667154100 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Acked-by: Peter Maydell Message-Id: <20251021210655.59278-1-philmd@linaro.org> --- hw/arm/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/arm/meson.build b/hw/arm/meson.build index 9fbbbc9a6fe..61c66ee2d0b 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -65,7 +65,7 @@ arm_common_ss.add(when: 'CONFIG_FSL_IMX8MP_EVK', if_true:= files('imx8mp-evk.c')) arm_common_ss.add(when: 'CONFIG_ARM_SMMUV3', if_true: files('smmuv3.c')) arm_common_ss.add(when: 'CONFIG_FSL_IMX6UL', if_true: files('fsl-imx6ul.c'= , 'mcimx6ul-evk.c')) arm_common_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_soc.c')) -arm_ss.add(when: 'CONFIG_XEN', if_true: files( +arm_common_ss.add(when: 'CONFIG_XEN', if_true: files( 'xen-stubs.c', 'xen-pvh.c', )) --=20 2.51.0 From nobody Fri Nov 14 18:19:16 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=1761775335; cv=none; d=zohomail.com; s=zohoarc; b=UTuJrh6hjdl7zFNS1/dNCqATi7DW6Ua/xaK0h0qNyv5lD/Gil5ZG7UfYBYdwNscea49m1v9ZXNaQe+bHh4xjOYMxATh26eeZcT7VvAF6GKQ2ucfYni7MTU8lBFR4QnTQAwZL93h+C7gNY55t55VODDVCq7cfKb7oIoMb1/l1NrE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761775335; 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=duuy25QCgDexk3mrUIcN43kXo2ogvu1PpVOfOdefns0=; b=BUGJ43uppXDiJUZf0mjRhdvYYE95oM71XvCrMLK4wctlEbloX0AkPmWHAVkT+XQ3xA2W5IQnv/i6l6QqtRdIy0FD8y+ftq/3Jabjmq3O8mnyGh+zW43epoC6lpa1BpyNRYuVYEZLI0S7TrEP29sa+Fb5M/NHSQeJJrQQ++7ridM= 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 1761775335558745.9022485177624; Wed, 29 Oct 2025 15:02:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vEEE5-0005IY-T1; Wed, 29 Oct 2025 18:01:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vEEE3-00056H-4p for qemu-devel@nongnu.org; Wed, 29 Oct 2025 18:01:03 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vEEDp-0000P6-Rd for qemu-devel@nongnu.org; Wed, 29 Oct 2025 18:00:57 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-47112edf9f7so2635295e9.0 for ; Wed, 29 Oct 2025 15:00:45 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47718ffa42bsm52858005e9.4.2025.10.29.15.00.40 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 29 Oct 2025 15:00:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761775241; x=1762380041; 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=duuy25QCgDexk3mrUIcN43kXo2ogvu1PpVOfOdefns0=; b=DmVbyDNXkSUqYW/jrbWXtyk6sPC/6gEujmVf4DbvOgZ6511DpB93MT00qvWlnRoTuD 7HbQT9Njb/FTIL9rmLRrGi4Re3JIpZd3YM0zYTmXlJfy+w8gq92k+5HNzgZwMZAxBJH+ 0Sv7BtWwkoVTAGpUtwtLrAKPifNxMFXZWH5PVgMf6XBVsjIDObImoll6KFclxraoitoN kRXEO90Q0WHDkis4IMuxMAGGwVUDLcw0EisE+UG318V2GTJRWmxVPibwJEmj7ZR/adAI NFYPngQYy9nbtOvCSX17Dn/o0w7cTLC97h9EWe/xwTnieu/iy3paRO7bWl6M1SO4K69A c7dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761775241; x=1762380041; 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=duuy25QCgDexk3mrUIcN43kXo2ogvu1PpVOfOdefns0=; b=rh4w1nbqHFCwwZtsjaXfXCanElETGqeJj/i4HcplnEEsDd89cgXx9k6fTnoW78iAYZ 4iHwMZVHRR7pAhm9rCZlLXKde3uhP459BisYcpheAgYEx8qn38sdzOoPCW+k/qRBpxRO KssYEnM9rN+GI1qHvzVWIAb25t97EH8w4/tdGpil+mRp+bqCQq7V/ytYV18fuZVszVPh MMHYjIrx8XM+dE7XWG4x3Q5gnPoLbjsSrDSqFmLA9rmgy9fQXuGohz4s8OkKC26/+2Dw Os2fDcgHDTcnzj0isEw+YeaVNIh4fNePSshbirw1Uy2zKaXeoF39mDnQ77aPrx09z+Kj QdMg== X-Gm-Message-State: AOJu0YxgeTV2j5DOwe8hKNVcp2Piw+LtyUcoI+iSwRTrgiYPdZHk9nOO ZLlZc/MImf1J+8/dj376biBU7rjI0/+TRwc+GyPr2bFLilmtIeQtwiOo+WCg/nDC5ANXNLxx/kC jqIDWZ5w= X-Gm-Gg: ASbGnctWqXa7bq13tRju3YkqxIZngcbDsuW903bQvloeox19BTR+FQ7YghjnEc5VeDa 5T+ow85rql7Qv7BsU2G9Z8HwVJKzMVNQlV/nEqdnHKyDTVqwsMtOTDy1rxVc/y8yOLq4muCxyPT UhoNmT+SHW4CTAnVfC3HTlym+YyWQNaqF67PVDt6GHyiRkZ37lF1E6ouDPMoZy0iRSfvkKNASm6 eyXDFxR3Ec1MtVBlRj9Ria9/X2WV8M07zJecOk6LGu/GRy8vglmuewVdE6yFTMB/5QKNqOWIkx9 q3D/ROkU5Gp4z06z2EOFtSxpxs8g9jxn/i3V3yqicRLSrrYeW6IdDJSAReavPddHG1skZiJZ1JI n8ABZroY0HJfzeDyJX5j9EGtMvffurBxK6pZoq8yYDmq5SxEsG78tU247vN+IHsZ/MZoPTwG6Ya cYtEPfnIIbgLJYdsEowa16Z4/ZF8/KBITOa0DG7WtXT+sYmNTYVg== X-Google-Smtp-Source: AGHT+IFL+2b301wjnMEbUO9ieOfomnCRNXNE7IcsbQWokfS/W+DYoao33XsfSveF1YTos1EsQTTvLw== X-Received: by 2002:a05:600c:4e09:b0:46e:206a:78cc with SMTP id 5b1f17b1804b1-4771e1e1079mr46937445e9.28.1761775241498; Wed, 29 Oct 2025 15:00:41 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PULL 20/23] hw/xen: Use BITS_PER_BYTE & MAKE_64BIT_MASK() in req_size_bits() Date: Wed, 29 Oct 2025 22:39:57 +0100 Message-ID: <20251029214001.99824-21-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251029214001.99824-1-philmd@linaro.org> References: <20251029214001.99824-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::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.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, T_SPF_TEMPERROR=0.01 autolearn=unavailable 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: 1761775339149158500 Replace magic 8 by BITS_PER_BYTE, use MAKE_64BIT_MASK() instead of open coding it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Reviewed-by: Edgar E. Iglesias Message-Id: <20251022140114.72372-2-philmd@linaro.org> --- hw/xen/xen-hvm-common.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/xen/xen-hvm-common.c b/hw/xen/xen-hvm-common.c index 52e2cce397a..258014370e1 100644 --- a/hw/xen/xen-hvm-common.c +++ b/hw/xen/xen-hvm-common.c @@ -1,5 +1,6 @@ #include "qemu/osdep.h" #include "qemu/units.h" +#include "qemu/bitops.h" #include "qemu/error-report.h" #include "qapi/error.h" #include "exec/target_long.h" @@ -448,12 +449,14 @@ static void cpu_ioreq_config(XenIOState *state, ioreq= _t *req) =20 static void handle_ioreq(XenIOState *state, ioreq_t *req) { + size_t req_size_bits =3D req->size * BITS_PER_BYTE; + trace_handle_ioreq(req, req->type, req->dir, req->df, req->data_is_ptr, req->addr, req->data, req->count, req->size); =20 if (!req->data_is_ptr && (req->dir =3D=3D IOREQ_WRITE) && (req->size < sizeof (target_ulong))) { - req->data &=3D ((target_ulong) 1 << (8 * req->size)) - 1; + req->data &=3D MAKE_64BIT_MASK(0, req_size_bits); } =20 if (req->dir =3D=3D IOREQ_WRITE) --=20 2.51.0 From nobody Fri Nov 14 18:19:16 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=1761775454; cv=none; d=zohomail.com; s=zohoarc; b=fHlNGVvUSXYzFQOzmJzZ9PhyIn3Rv5fsSHTIv5o+0CGSWPBOiMc5V/SmZ+g5XxmikOWnpgcgkhY47qYkZ+E72Oo6IhUsuEmOI7aMQCVOUnfYUIkneKYGGorhhMdUV9Zi+yEmmRecLJKvv7dPY6gDU2MAvKTs5ewov6w6oCurosE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761775454; 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=M5WTJOJ90ouZPZfgirhdorA0+I+5S3/ChJi6dZ472hg=; b=fWQf/KG3z6TRlqKKkvtnHa8b7hxWoPUwGabVbsgwW+QNWBMAOqcpdl20ySrKbZW4k9s/IdacXynV0cTB+BPGGbaHDnCpH6ixEeJQ+XAcqW4GqCHDgeRR3pC01h2JkqV8EvBOKrUDGCJA86/GXEGQ/7uVk+ucsr2CUAJtGvxeCcU= 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 1761775454067433.9456003410787; Wed, 29 Oct 2025 15:04:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vEEGA-0006Xz-9I; Wed, 29 Oct 2025 18:03:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vEEG7-0006Pr-Oe for qemu-devel@nongnu.org; Wed, 29 Oct 2025 18:03:12 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vEEFw-0000YP-D4 for qemu-devel@nongnu.org; Wed, 29 Oct 2025 18:03:07 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-4298a028de6so1026833f8f.0 for ; Wed, 29 Oct 2025 15:02:54 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47728999a4bsm4832635e9.2.2025.10.29.15.02.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 29 Oct 2025 15:02:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761775371; x=1762380171; 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=M5WTJOJ90ouZPZfgirhdorA0+I+5S3/ChJi6dZ472hg=; b=PuyAoEVQ15i+ouXuayMQEpjoRQureHrf85jWjPVFGzYaXv+OtmAIw8+gihmPcfNVuP qBoZGd5U8Td9Q1pa0CShYl37Q5/tS6mOcWb/LFKh5na3E+4xeVo1WXBzHS+4wF0v8qzQ BPy0WxWwyxpBRZ8XOFE3yl4eXo7fO5IGT9DS51hqNMx/glo0T8V97kzXvf/VHRTg4qYT MPxxlnZaI6uxdh8YPbusaELQtAtJ0LZYIA/1Oyo+uIhT8RPWb3DdgS7lWcbZZVW+Ovk3 sz+EMbZqKhUR/cL2okbiaYhDVvLddbWhC01RTv4vT+Bm8xEYYgngLPj3FGD4auGzP9Bs DgDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761775371; x=1762380171; 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=M5WTJOJ90ouZPZfgirhdorA0+I+5S3/ChJi6dZ472hg=; b=vXFVJBmO83WZR//y5FQ/ujaawXw+6bginnNLpOxWab2x1odRbuCkrSoS87+1aR2MZD /JWAaiIvJl3DwaDR++QrWJ8jviUsZZFlB8XGS4il7Atyk+52+pkjdew7mLh+EdMDahvY kcdvu4m+93xmRKDe+I9ZFR0OvGaw1hFgBYyI0cAJElfkuOVuygDH3ilc0GWWm7JdkLzS kufR8NKTRFKR+YzzhemghgKUHSKAy/UOs17TY+kfd6fDQq0lhMTDy5UzsqjJLAOCCI3G C2fq+HIaBaYKkuZoHcbpckWbuLe+eHC/GUNNPNk410WiUGtENAdepwsDiuuQDSlWjA2P HOCg== X-Gm-Message-State: AOJu0Yz2CIuYJsPMHJoRmMRZj+gLjGgukgnLaLshq41pfZWQhw7pbC4o M0KhMEOGalZ4IweDwtpaiKEugP+XgXSPbJL8JoAxYzcDmgf8HBoeoYzqCuRzQum8btl2YHGi5gG HBjrfaVU= X-Gm-Gg: ASbGncv2SgIeaytdbtzbcBOs0smA66vDbPohPS+QTz87vbvf8LouFn3tW8Oy3tQDPxF AjqbWOZd1SHset+U0102nOvXxgPJ07DZe14s3fiyVgMBT4iGMBSDoCRbkjLb4ntGUMhyFpRIsSw G4M8GC7fEAUm8/UOjfupqQZnPUTGAubx5RwUImNN8gYRERXI22nWTjcFKIBGouPE1L5NJZ/hdpu /WZpG2+9IVYvvE6Sv7omL4OFywI4oOxn8VKh1HBCBKSGY/byLU5JbWn1p9L55VcE3Tr5O6dZDjR zSoOZ1erxrmY/h26E+DGD+ccmtre4GBrBdjU+xjFjBKow6vqRI44M4U93UxAE9nC20mGRVXpk2m UXab5GVlRkcV2MCm6JmuizAn3lRfWkRoqzhxgSEPx6XtJxTd6Kg2n6AXQCGaM2fFBrgPnjFiyT1 1l4rBJVncenPO046M6vqAs6kvG0gE6/6qg9WekhbjIJDYTK2gb+A== X-Google-Smtp-Source: AGHT+IG55gEW4cTyrKappFPyhD2OJeyPRoKdvjjfZ7jhh54rR2ddxZavvlHcLaQuPUhm2TYFyHyuvQ== X-Received: by 2002:a05:6000:1843:b0:425:86b1:113a with SMTP id ffacd0b85a97d-429b4c68afamr1090786f8f.16.1761775370842; Wed, 29 Oct 2025 15:02:50 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PULL 21/23] hw/xen: Replace target_ulong by agnostic target_long_bits() Date: Wed, 29 Oct 2025 22:39:58 +0100 Message-ID: <20251029214001.99824-22-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251029214001.99824-1-philmd@linaro.org> References: <20251029214001.99824-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::42d; envelope-from=philmd@linaro.org; helo=mail-wr1-x42d.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=unavailable 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: 1761775455889154100 Both are equivalent: target_long_bits() sizeof(target_u?long) * BITS_PER_BYTE Prefer the former which is target-agnostic. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Reviewed-by: Edgar E. Iglesias Message-Id: <20251022140114.72372-3-philmd@linaro.org> --- hw/xen/xen-hvm-common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/xen/xen-hvm-common.c b/hw/xen/xen-hvm-common.c index 258014370e1..b40ae0b3af0 100644 --- a/hw/xen/xen-hvm-common.c +++ b/hw/xen/xen-hvm-common.c @@ -2,8 +2,8 @@ #include "qemu/units.h" #include "qemu/bitops.h" #include "qemu/error-report.h" +#include "qemu/target-info.h" #include "qapi/error.h" -#include "exec/target_long.h" #include "exec/target_page.h" #include "trace.h" =20 @@ -455,7 +455,7 @@ static void handle_ioreq(XenIOState *state, ioreq_t *re= q) req->addr, req->data, req->count, req->size); =20 if (!req->data_is_ptr && (req->dir =3D=3D IOREQ_WRITE) && - (req->size < sizeof (target_ulong))) { + (req_size_bits < target_long_bits())) { req->data &=3D MAKE_64BIT_MASK(0, req_size_bits); } =20 --=20 2.51.0 From nobody Fri Nov 14 18:19:16 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=1761775703; cv=none; d=zohomail.com; s=zohoarc; b=JKJBaM0TRGoGJCrl7eFJ6zzyyQ1nWk6A9kIuhXfJD0KdCNAkeeRoILVhLLRNmvy9wjBL4qbcFYGfCv9UnB+3ZbH+Cw+y15feKV1gHik92KhuHWtbvv7fvaZShN8032FGN8iSMU9/rKJDkh4PZQXvDAC+l/DDONcdMcBv+y2SNi0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761775703; 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=veqF+B9YD9xJXRSdAxin3zDSMOZgaGpl8wg92/hv1GE=; b=f+gLZvZxWapu6eSip8R+PzaYrEocN8hk0sYofTcBrCPfdJVc4rtoPTFE5VCfMex2+i4c/moqedBfFs4qcDDp/qpArMjRa/VDYgExds0NxB2TI1+RsB2nIFvCbttMXyKLifQSY25v+Vks40usOeRiErME427geTPDH2OihFgJOqs= 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 1761775702992620.7584064570668; Wed, 29 Oct 2025 15:08:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vEEJp-0008Iz-I6; Wed, 29 Oct 2025 18:07:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vEEJk-0008HF-Dx for qemu-devel@nongnu.org; Wed, 29 Oct 2025 18:06:57 -0400 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 1vEEJW-00010I-92 for qemu-devel@nongnu.org; Wed, 29 Oct 2025 18:06:55 -0400 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-3f0ae439bc3so187261f8f.1 for ; Wed, 29 Oct 2025 15:06:34 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-429952de5f9sm28468361f8f.38.2025.10.29.15.06.29 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 29 Oct 2025 15:06:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761775591; x=1762380391; 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=veqF+B9YD9xJXRSdAxin3zDSMOZgaGpl8wg92/hv1GE=; b=lv41CniIY5WaGFrj6wwrnlIUKqJvHRLPc6gWfom/Xz4YsnI81S988uaSU7VHhRef2z FLdKFqUpxPUINjtp4BQadwxuYYVrdZ1yR6au7p3jQdZENbDulQPtEhVMyi00KAkThnMZ lpmW4pkdPbKuiN+0QeU2a2m/twvL3OMFv+D8r1y/AYMqI+e1YEcUYCke0UZIC9gq+Scx hWVNgiNIL4wAj+yqsynIHgV8x9aUaLmI7KJ71kqCaCI+0bqR7bW+x6ldDHf+//uXC39T Sir1Zu83q+fPeizVi1ciH0FPlZR6Lw714xYC4OBXoOIdvQtHmMjy2P9M+xogPIi+MMlu JvaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761775591; x=1762380391; 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=veqF+B9YD9xJXRSdAxin3zDSMOZgaGpl8wg92/hv1GE=; b=XhcR56AFJ1OMpieV8Q0RfhDqd42RwlpzHYQXXRqj0ZCF97nhBox+qex8DLdD+vqEuz M6UKhtHv64VplIPO/sipbTaS3lzQ0daDBP3d5iu4qS6GLCymib8MboVbqTboVXw/E9Sj y5LjWqYZvEsRQSl/LbEf3Z1P0bXJVYTgBPSjECfFUrA9VZMLliDg8iMqJB1HvbnngEk4 04OTSTVNgnifGNW5rjCpjEWmjhy7NU+oXHcN4Tej37jrkcuEiv0LAPSpzqW17EabGbek YehEj79SgmSrL1SZsCLhLj7TU0MdPvFnU/ZFwXze+S2ubf51Rf8jhrXcCPIbBkVfwGIX oICQ== X-Gm-Message-State: AOJu0YyQunh2H2Rs/vtay9vBTAUemFw6Hmef7tL5RnHLHhySrbE+qESA JtclIKdxVM+2YAyseBkmWvvyVg4gbYcPv/aNvpQi81Iy/xSpaOvgLhzmyySPRQfFEjb8eR/vAto WVHCNOio= X-Gm-Gg: ASbGncscZHTTOY+lQPbc7dJJZZ4EImaVBeI3imw4M0gY5le925hPcnPMbCzwXJ62A6W DLjsKACxD2OaEh4UXsDC5hwgB3JYw/YVPB+ni6W5p1VsJ+sPb2RGqMJJayYidg80yf/690V1pm8 HIq5DPEtO9yBKMWB+LA6mPqkP+NfrXO21icfl3B+AVYYVFzdkBOKVosKO9NC58dzr25zDNrQH2b dZXqKif4cI1AdxZNJxO89WHF/S50Ec6Ann0vKQUNjm/EjTkQf92sShTdp5D50fffrcbj9ifZweC x6DtjwbTwS1g8SsaCkrrXl2G9jYblfTLkAvc8b8xw4vThRvTbkeMd/CGSdQgSDDSWFpAbXWhndr fG1Dy1eQkvtNCq19KGERYfOvtFGAeehQZpgFYVRxl7Z15GM+HkS6tANBIY7Cz6dgjwoB1FkWpOF 2chRCUcDjcJ+0EtU8mzBQRmPuRGdVvANzj3dveJ5B2sdF1CucFAA== X-Google-Smtp-Source: AGHT+IEbKRW6Xhx6tz3v9V2jt9OndZxxOflhU3MXiHFeVDPJ7uhr8kvz/sZkbLcmAJ2UTLN6uW3IIw== X-Received: by 2002:a05:6000:2506:b0:427:55e:9aa2 with SMTP id ffacd0b85a97d-429aef78924mr2786336f8f.9.1761775591538; Wed, 29 Oct 2025 15:06:31 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PULL 22/23] hw/xen: Build only once Date: Wed, 29 Oct 2025 22:39:59 +0100 Message-ID: <20251029214001.99824-23-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251029214001.99824-1-philmd@linaro.org> References: <20251029214001.99824-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, T_SPF_TEMPERROR=0.01 autolearn=unavailable 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: 1761775705540154100 Now than hw/xen/ files don't use any target-specific code, we can build all file units once, removing the need for the xen_specific_ss[] source set. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Reviewed-by: Edgar E. Iglesias Message-Id: <20251022140114.72372-4-philmd@linaro.org> --- hw/xen/meson.build | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/hw/xen/meson.build b/hw/xen/meson.build index a1850e76988..dcd2b7e1df3 100644 --- a/hw/xen/meson.build +++ b/hw/xen/meson.build @@ -7,21 +7,16 @@ system_ss.add(when: ['CONFIG_XEN_BUS'], if_true: files( 'xen_pvdev.c', )) =20 -system_ss.add(when: ['CONFIG_XEN', xen], if_true: files( - 'xen-operations.c', -), -if_false: files( - 'xen_stubs.c', -)) - -xen_specific_ss =3D ss.source_set() -xen_specific_ss.add(files( - 'xen-mapcache.c', +xen_common_ss =3D ss.source_set() +xen_common_ss.add(files( 'xen-hvm-common.c', + 'xen-mapcache.c', + 'xen-operations.c', 'xen-pvh-common.c', )) + if have_xen_pci_passthrough - xen_specific_ss.add(files( + xen_common_ss.add(files( 'xen-host-pci-device.c', 'xen_pt.c', 'xen_pt_config_init.c', @@ -30,7 +25,8 @@ if have_xen_pci_passthrough 'xen_pt_msi.c', )) else - xen_specific_ss.add(files('xen_pt_stub.c')) + xen_common_ss.add(files('xen_pt_stub.c')) endif =20 -specific_ss.add_all(when: ['CONFIG_XEN', xen], if_true: xen_specific_ss) +system_ss.add_all(when: ['CONFIG_XEN', xen], if_true: xen_common_ss) +system_ss.add(when: ['CONFIG_XEN', xen], if_false: files('xen_stubs.c')) --=20 2.51.0 From nobody Fri Nov 14 18:19:16 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=1761775797; cv=none; d=zohomail.com; s=zohoarc; b=CTd3oIwhDdG/EoK+krsHUm7+YTdZ64df8C+S1IU3rqvLaw/VEjTYjwYwlIYp5aG2FoipgxL2Jw0TIpiopWx+MDiOL6psR1ZD7XDgMHyDtQjIZCIU8YDpNwMyfPgOUTdgQJ7cp6J4cAzDSI0fDV3AN416jN9IckaT3MpAUhOhHvc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761775797; 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=YnFZ8HbLjzhB7Z42tZa4PrSIDLq0WeA8PmYU1umg+/U=; b=bvETGRAFJ9htDjTy+x8jkjylt7oQdsdoYkY6+PPstcjaq1eQpCOlkepbxbDU2INWjvpWV4vcELrTPfxl+KMgb9YwJIaiw829mrxEyXMZylfYpxdVIl2s4826+TVpBrH3ddy8TDig6PMg9xNJulqquyus8xa+R9ZsXgedHd/59/M= 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 1761775797553908.4173079334698; Wed, 29 Oct 2025 15:09:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vEEKr-0000Jk-CZ; Wed, 29 Oct 2025 18:08:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vEEKo-0000J5-3y for qemu-devel@nongnu.org; Wed, 29 Oct 2025 18:08:02 -0400 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 1vEEKa-00012a-Bt for qemu-devel@nongnu.org; Wed, 29 Oct 2025 18:08:01 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-474975af41dso2270445e9.2 for ; Wed, 29 Oct 2025 15:07:39 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47718fe63e0sm53515075e9.3.2025.10.29.15.07.32 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 29 Oct 2025 15:07:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761775653; x=1762380453; 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=YnFZ8HbLjzhB7Z42tZa4PrSIDLq0WeA8PmYU1umg+/U=; b=DzlTKO5EyIewydKLE30BNstvhLLhSkov7EKvPsSLN9b5pBtoVXNIYeYhO+RLyJe7yQ fVVONgMdFq6FBFAXYUlNxw3b3vc5fui/xUH1nILdjOTuhUjQEi7857QZEPn/N1Hr4nRl 11H7n/fvX/0JOeCOUNbDYI7oDXV3maa6AHs+gufgX1P+qI7uqb2HjjBQrIz5E37/Qick bb4/PYsR/iJdoDz6DXAR3QEGUFQ3zihLqC34cj4IqzwMUh1iJbvOKIex+lkT1e8lopjY pjIPzCLGoM+8DkQEiSe5uUXZKip3oufo6jLZXpcVCG3WGAFqf5gUbNw5UPcsIVA8kkQ9 I+ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761775653; x=1762380453; 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=YnFZ8HbLjzhB7Z42tZa4PrSIDLq0WeA8PmYU1umg+/U=; b=EN4kR2eEePMpcPJRt5R0PxF4dxKibFYVKzQzi5xGskxoDUnKKD24hOjUBfxoxGQYIt ulZBoYTsNL9XwS5uCDq/+DbXWOArm+U3r+tqWzIC2KBuuujUc4x4HCx4yqAUL0rJtEcK +uVeDtzi0ub72u4u1v/ZE7tDf/nmXlPVxMWmugMOfJgjwOfKIX/ZtDhfCBZWFiBAiMnC jzyJYrNW7248nwx1+B967U2KHYuaLg+wOLuBAHtDF3IlAPlb/nO8rGsAGZK1kKjowL8+ XKdro0iKv9jdFXW/vPkWnIJ/TapDpEBanYa3MG98E7uFBBc/re2KleT+ehRb26b1dE1R +stg== X-Gm-Message-State: AOJu0YxKKT3/u/jG3RnOD+LGP85SbfAvXErQg9hOD2faq0spfsS7Ae0f DnW21UoLFGgQzJeZ2kvwbmx04rEgSLoiQw8UYgcGNyZrOiPP53VOQ73EVuxOHhjyfaaH66ghITk MQwZdOOc= X-Gm-Gg: ASbGncvAjcLCuu0mWBYFFBFPT7tlM/zSYZOfqJnpWuTg4Zwvd8k6AUbQSIyEteLGqDm AkMhMweNk02wwOHY1wPJeXjKB9bWdd0Tha1eIqzhsaCXfykObbGwnQTT/5MOaXPzJCosfHX7CF4 B1Lu4Zc2lQH2YV/rp7yL7Zzj/LOQ/oTIbD175OpCSgGLQGX2GSEdykr6sQEIyHGOeL3l2K/sJYJ yneM9HB9GGZfM5CJCKDfCZOh49xyJx0LFqkCmeZ06uSEwB/48KZ3IzH9RQs1vH7y20QVLTTGdtD H255VOAwgcZPMPje3yTcabmvGhmp4q9hWsTCl1BnmIzVR9hS/x9xqMH5upIJrUAd2gDWIQvs3NF hSCWW3UU52WZ/8+PRZcvjtFMUFLpOPLDKumDQJaEagaV3qNuiI5smjdQqLu3bAe0/Szh9qwvrML KgfXKPpLLe06q1NLbxJZRUtrvG1GmBliMRf1q9mS2UjWURDJWl9g== X-Google-Smtp-Source: AGHT+IGTUCvJg4EhDeIPRvsWLBe3ei0nncRNddGB/z3peEHm9UduFf3ev/3OBQpoDFo6/UIh/mDJOw== X-Received: by 2002:a05:600c:c171:b0:45b:9a46:69e9 with SMTP id 5b1f17b1804b1-477268487dbmr7732815e9.31.1761775653356; Wed, 29 Oct 2025 15:07:33 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PULL 23/23] hw/riscv: Replace target_ulong uses Date: Wed, 29 Oct 2025 22:40:00 +0100 Message-ID: <20251029214001.99824-24-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251029214001.99824-1-philmd@linaro.org> References: <20251029214001.99824-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, T_SPF_HELO_TEMPERROR=0.01, T_SPF_TEMPERROR=0.01 autolearn=unavailable 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: 1761775800758154100 From: Anton Johansson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Anton Johansson Message-ID: <20251027-feature-single-binary-hw-v1-v2-2-44478d589ae9@rev.ng> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/riscv/riscv-iommu.c | 6 ++++-- hw/riscv/riscv_hart.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/hw/riscv/riscv-iommu.c b/hw/riscv/riscv-iommu.c index b33c7fe3259..f8656ec04b1 100644 --- a/hw/riscv/riscv-iommu.c +++ b/hw/riscv/riscv-iommu.c @@ -26,6 +26,8 @@ #include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/timer.h" +#include "qemu/target-info.h" +#include "qemu/bitops.h" =20 #include "cpu_bits.h" #include "riscv-iommu.h" @@ -391,9 +393,9 @@ static int riscv_iommu_spa_fetch(RISCVIOMMUState *s, RI= SCVIOMMUContext *ctx, const uint64_t va_mask =3D (1ULL << va_len) - 1; =20 if (pass =3D=3D S_STAGE && va_len > 32) { - target_ulong mask, masked_msbs; + uint64_t mask, masked_msbs; =20 - mask =3D (1L << (TARGET_LONG_BITS - (va_len - 1))) - 1; + mask =3D MAKE_64BIT_MASK(0, target_long_bits() - va_len + = 1); masked_msbs =3D (addr >> (va_len - 1)) & mask; =20 if (masked_msbs !=3D 0 && masked_msbs !=3D mask) { diff --git a/hw/riscv/riscv_hart.c b/hw/riscv/riscv_hart.c index 4d51a93dd52..33cbc9873e6 100644 --- a/hw/riscv/riscv_hart.c +++ b/hw/riscv/riscv_hart.c @@ -94,7 +94,7 @@ static bool csr_qtest_callback(CharFrontend *chr, gchar *= *words) g_assert(rc =3D=3D 0); csr_call(words[1], cpu, csr, &val); =20 - qtest_sendf(chr, "OK 0 "TARGET_FMT_lx"\n", (target_ulong)val); + qtest_sendf(chr, "OK 0 %"PRIx64"\n", val); =20 return true; } --=20 2.51.0