From patchwork Thu Apr 24 22:21:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 883992 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp3672768wrs; Thu, 24 Apr 2025 15:23:29 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVZxoE7DhDkFdtvWms812rzxaCpiUkwzo/qKm0aFviYHxjcBHvVoRPqTYPLD0I6ssQDAG+2Sw==@linaro.org X-Google-Smtp-Source: AGHT+IH/c7TjSkhUh/x9EoNwitu+5xV+TJjp7VuX4hFbfjUzQJqnDOU5zZVIuRlmd7iDEqEGjxdN X-Received: by 2002:a05:622a:110b:b0:478:f69b:ac9 with SMTP id d75a77b69052e-47ec266ba2fmr66068961cf.11.1745533409067; Thu, 24 Apr 2025 15:23:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745533409; cv=none; d=google.com; s=arc-20240605; b=UdnYoFx7Zu7HvnmtVY4pKeBysLcQyEsIN67m30L+Z7bJgLlY9S1PIQTBZ6URFHUPZ1 E1sBfUIQEFtyvmDQsahPcG13A0uqvbxSlLkg8ITgkiS///TR8TPKv2Rtk6dXOW68UzsU XyXmaIdrAChB4owZNYQrG3AdSxz2lE912aSLvsJ/TNoxCnyTgs+p+M6oPfNRV91urkHT wG9m6+jTPhyGvdm6z9er/W6ntxWFwFZ2V5hMKZljTEEaAAa7bdPxxjfeVBEKsczhodU8 16pbuoM1Mf5svrEBkO5msdn0H7kHIF/FFEd6Ptc3gFM+MW5j+cYFXPgRZeCWod7aIw1S a5ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=uWC7ZUuhMJjjntdzJpmYnoIJKuGi0kxenHJ2eaOicnY=; fh=xBDGjMrCmtN2EfzM/Vp8N6QwWER4yVVcK/Wv9WxPqwQ=; b=d8ZDZDlQEIN4QO2W7hlXu68FmExkuQypJpt8i6WWhnsF6/mCdK5fytjqOwCXsbqHMn QU9r/EoUp3L5Pfcsp5H8wBes3NVQEUCp/iTPOk20OEufl+ZiFa5O5hLUzwqQwKz7qGvL jiENaW1mre399pWGPoeJeXLcspqvQ8DvFL13vPKipvFwy2RT2Ah98PWwWt8IC8L7aDyD DTngbSvALv438SHiN/PCNGjh5vuE2l2/Adwratq4U1dnpuUHEHY4IoSzdHUG0Iag62fi 9gB3MroWxjAsPYeu409qedOq0+QMxfoDU6iFjMWTk56iIUwBAAsfE8tk5HxTmS8W4H73 2TiA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="fZi/TxeA"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-47e9f2ca249si5908371cf.82.2025.04.24.15.23.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Apr 2025 15:23:29 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="fZi/TxeA"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u84yF-0008C5-KO; Thu, 24 Apr 2025 18:23:03 -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 1u84yE-00085U-Cl for qemu-devel@nongnu.org; Thu, 24 Apr 2025 18:23:02 -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 1u84yC-00017m-Lk for qemu-devel@nongnu.org; Thu, 24 Apr 2025 18:23:02 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-39efc1365e4so795679f8f.1 for ; Thu, 24 Apr 2025 15:23:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745533379; x=1746138179; 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=uWC7ZUuhMJjjntdzJpmYnoIJKuGi0kxenHJ2eaOicnY=; b=fZi/TxeApOHecixa5JPQAWJmYPVErpzkTcuPN+wu4Pw2PIP3JHSyvMLI+7iCsIPDNT T6sJZQnvvqsvINN8+M8JdrW6BxwdRNYkqmuA1YZtQtTFzmWpPEYAtaXLR41XkugKwQHU iUzymzJsWpHOidNiT9uwv1m2LPJvZsbG3gbmr6IOzFeBiW3+hCYdYFQIQQ1FUAr4QH8E A/FyWi7T9Zdni3XJupz5rbYEIoNhD00JCBdLzug1ICcB9ej9ZIgxc7d6UIlXH04U24nK TVqcaqsxqj4xZP2DOVgvoqX9DJQRGriLJFy1oTaKKq3DUZdkMx35nqtpB4jRG+cGY3kJ nZ/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745533379; x=1746138179; 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=uWC7ZUuhMJjjntdzJpmYnoIJKuGi0kxenHJ2eaOicnY=; b=bGbw6Q5MGFVSr+5va0sfR00qoDMRSIxYvrjvtjfZmD0szZRmAIVv0wYn/c06HEG77/ W0kDKGWd284if/fIv45BoWrkG4ySB5T17/LA5nj6YpWvDaCSBCQ90XcKGq8Da+Xphu3F 4XjQzaMzVoN4xm8Zht2nqvJhjyoCN1aCXZTrcC5QQqtGuHvzf8P3Rz++4FbE5vxEmwAM RCS1+Ggn2UzgeQfkDlhaoXWysZmWO9DOvOHBFOsl0IlPBMJrHiBMjyayoRbTC2KTnMQf oSpvlcVlP+IN4uy0VyyyE4PsjdgOcsDuw5Ke4Rrprab3wdnWG22YUwFvye9/dguVeg0a S8wg== X-Forwarded-Encrypted: i=1; AJvYcCWnkADF9ZwoGx0CBJstMjZxiHIyCYaUtOMjCBOpwG2Jejjn3W076nz+L8vnx4G7i64q6psMoeAa5mAD@nongnu.org X-Gm-Message-State: AOJu0YxrmzqMZF93x50qROpghvku5nH6dU3/KvVEdbdQc7f07JiW0gJe av61QniMqjycX+5PeYb4hfFxnYgSDISB6RSQE1rThxTlA+5fSYV35V8AYdV5qBA= X-Gm-Gg: ASbGncsLIBnEywOi/T1CYRn/awJdjLJqVNVKp1YzaW2dvwC0nnHwykhcKjmen73qZMK Jz2mOm7WGp3w7Tg3weLaM32z8RJDsfF7BkqrTKleZtVaEqe95jFxcXnhJDwYZF9ujDBQA8T/HpG fgSyezaSLAXNZ7OYJtWt8v4cv//HcmRpyEabByCSDVuFDTS/R28voqwHKtWoO10+atohj6xOjeP 8IXjkihWETWxarWiOaLr/7wF5obxgLAMGJiw4bWWnylpAg2/rYPO37cNgbVCX71gtkCcaErwIl3 8j3zl23DcMyDxpnrNQe0I5j5u79O4yMDDoTQQAqqEN1PyI7y2OgE71fJ61ke2gx064t8FaWuZSO 67YndodAex1N+dMY= X-Received: by 2002:a05:6000:4011:b0:39c:dfa:e1bb with SMTP id ffacd0b85a97d-3a06cfa8319mr3247397f8f.42.1745533379197; Thu, 24 Apr 2025 15:22:59 -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-3a073c8cc74sm531999f8f.11.2025.04.24.15.22.58 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 24 Apr 2025 15:22:58 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Pierrick Bouvier , Richard Henderson , qemu-devel@nongnu.org Cc: Mark Cave-Ayland , Anton Johansson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [RFC PATCH v5 21/21] hw/arm/virt: Get default CPU type at runtime Date: Fri, 25 Apr 2025 00:21:12 +0200 Message-ID: <20250424222112.36194-22-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250424222112.36194-1-philmd@linaro.org> References: <20250424222112.36194-1-philmd@linaro.org> MIME-Version: 1.0 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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é Reviewed-by: Richard Henderson --- 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 566afa4c978..b59cc90bd36 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3127,6 +3127,12 @@ static int virt_hvf_get_physical_address_range(MachineState *ms) return requested_ipa_size; } +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 = g_ptr_array_new_with_free_func(g_free); @@ -3184,11 +3190,7 @@ static void virt_machine_class_init(ObjectClass *oc, const void *data) mc->minimum_page_bits = 12; mc->possible_cpu_arch_ids = virt_possible_cpu_arch_ids; mc->cpu_index_to_instance_props = virt_cpu_index_to_props; -#ifdef CONFIG_TCG - mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a15"); -#else - mc->default_cpu_type = ARM_CPU_TYPE_NAME("max"); -#endif + mc->get_default_cpu_type = virt_get_default_cpu_type; mc->get_valid_cpu_types = virt_get_valid_cpu_types; mc->get_default_cpu_node_id = virt_get_default_cpu_node_id; mc->kvm_type = virt_kvm_type;