From patchwork Tue Apr 22 14:54:53 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: 882994 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp2456966wrs; Tue, 22 Apr 2025 07:57:15 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVYjeO6RWvqykFLJNBR30di/o+cnJgxaP2u7rg3zy+gNoxqG0S+OUW+F2RWd2WaSmZVGD+XLw==@linaro.org X-Google-Smtp-Source: AGHT+IHjQpR5ZyYypcVsjK8wnJm21Ygv/4dJBpgH13l8xBjE4om/XizW9GQqMCWyzcnyIAjIoTKR X-Received: by 2002:a05:620a:2450:b0:7c5:d7c4:576e with SMTP id af79cd13be357-7c927fb2205mr2112082885a.31.1745333835609; Tue, 22 Apr 2025 07:57:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745333835; cv=none; d=google.com; s=arc-20240605; b=d9T5PPpWrc7MPQ9NevYU6BBm/8uvOwdWLQl4GFRiiQxuGEMvt7K18tcR+hGBUhRsca yNvxGnq6aiC4zF7b8doq67qO8Q407cgFuQHdrCp4ynTauYCsWx/EDiux8cLTmk99TZa2 dPClnK8D7faRebEUj2s67/z1acldZ2g815C8gbIIitlD4QvrwkIGTcVfLbHKy4tqE96w Jng8IIwZFMzr3J5KqtQMU+xVh6YJ5WFNC4+ecuCMQ7QFszbXeoMTs/+nk1jrN/2zHNp0 9tc1wLNuxneYbBDrnt0cbYqVf30nTEW/a4rmhshCeY3eLx0REchPOQQcPCnzKC2aCEGm qUrA== 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=tXKfwIcrPvC5QvBuHzIyemct49OPnabCI5IYu6xLPCw=; fh=98FKcUbfHOMAWlQQi9/5y14VVYgcGa56vjU1mKYkvXI=; b=BLLIzwqOD66rjXRAjEplWslw9dVpPwElKzYj6MSecoGJwpBOL7ln589mgHngB2DTmF rkBjCkotmAadzvup1jZnqLsL3rGUD9boeHhrxHO3g+CxErjF/eDQVoQqO348+Dtu0svv xm+Sw702DDHXjA3BjxId+4hU8ZUu4kDcuiacbHPTysA9kA24Db4pwSTjVtB8Q+5yNErK 1KM0SsqrhNNbc0wNQj3FrnNmmdpm1rnyUPdbr1evIPgVe4NvuY8SmGgOI03+hkg5E/1b +PRakppAqvOQKuTqGk+eEPlCCRaId76bNuevz5y/I/ZFpSKyQLsl63co6CMiAgTdg/OE QQqg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NAEW9oml; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c925bc90a7si1103434785a.478.2025.04.22.07.57.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Apr 2025 07:57:15 -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=NAEW9oml; 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 1u7F2d-0007AT-3G; Tue, 22 Apr 2025 10:56:08 -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 1u7F2V-00073z-BL for qemu-devel@nongnu.org; Tue, 22 Apr 2025 10:55:59 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u7F2T-0005Ei-6i for qemu-devel@nongnu.org; Tue, 22 Apr 2025 10:55:58 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-3912d2c89ecso4535472f8f.2 for ; Tue, 22 Apr 2025 07:55:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745333755; x=1745938555; 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=tXKfwIcrPvC5QvBuHzIyemct49OPnabCI5IYu6xLPCw=; b=NAEW9omlsN4FmBo2kGUE8vh/YQU64LEFTS7M/Q7RcfNgifeiRA9fG4xTrmJ/atYezE wAVaVp67cGJiE7czZBFq11Fdp4HjeCjuF3Ro+x9bVRTIX3ll7gQbWWxwjjSOoaQONg/w 9y6Qwi/eGSJ6qisf/idphNFX4XmTAacb28ezJLbEh3QaelmHrDF10lpKRzJsCAgB1SYi oCa8NRM+yzB5pLpplTV/3/Axv0w4HDxeHrmM9YFZuF26Xr9L/5/00SZ1sLErQ5sBa/FR xFQZSnd4Z9+uSQgmubFAQHjcn8Fiac644xzAmYj7XFvn4dhGbxgJTi6zeOEwXkKwK1N9 IgCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745333755; x=1745938555; 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=tXKfwIcrPvC5QvBuHzIyemct49OPnabCI5IYu6xLPCw=; b=VqS7ORH009TKVftbGESXIBUPbKpUUwYYtyG5qEuLJCgWcU1OpEEFUqZ9WciRrhwG84 2W3X8JQ5bPtLfbbkH2BYO2x984HpupSNgQzwoc7DmREzbAdaoA02WGMz67Guvo+bmMAg lZRnif3lG7ZN05YymOLg7gbALDHpJm6jAjXZ7eMNtyYjGNsx46ZFYxtiDSbdF6kQ4iGx gSidKE1RxFL5Pn4mf66OsSee2y82ixWSlJafxR6LGDdLGJ00ufxuYVNNEfDXXRgb2zqE 9N9IPGU075rkQ6qlEZs/SD8CL4TdpjZTUp6FBrAWYOjNUG9NG2RJh5yxbnvl3lGRnh7f 2HnA== X-Gm-Message-State: AOJu0YxA/tFK7ZEGL1/q7dttXrUSYrjxkmaZefBxutei6z58eFjyKYK9 Jkxix6WZe3TvJYfs+T8MBsqnVdycuEaU54LWclRt5IvVpgmgNHFoL5bTIKug7o9MccKcDPC7XQ4 X X-Gm-Gg: ASbGncteCvokg5yBqqep+0ELMpJKaJlTPS1zu3whmZB2yRrO6C/cILXEza2uYnIynQ+ Goavd9stvJHXV3Phj1mVr7fA7c0FJglMcUxAyxqwrfRZ0yAP7L1Ho3AuKZsW+WvIkvZyXQBMwBE tyH990cmoiphc2BtcZeAJN/2I0SeaZkC+LnQu7pJqyVMIqET2ArtKK8FuDekK9vm5GbKWyLtF7c Ys24DV2M2C9CLTN4HRHTcvNNrxlAwjs5ptNYq1audrGFIfHnXCL8L+NZavBytCe9Jt4cmqRnoBs yt8p05ZJrFReA/AohRh4VRov728S4gijmFD0kjy06UeD6OsIw/X9/CXm4MffCfOI7zVKU9EleNO dEP1BQf/4QTkeWoao9GOmNC83cA== X-Received: by 2002:a05:6000:430c:b0:39c:1257:cd3f with SMTP id ffacd0b85a97d-39efbb17649mr12256816f8f.57.1745333755404; Tue, 22 Apr 2025 07:55:55 -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-39efa433133sm15305288f8f.28.2025.04.22.07.55.54 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 22 Apr 2025 07:55:54 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Pierrick Bouvier Cc: Richard Henderson , Anton Johansson Subject: [RFC PATCH v4 11/19] hw/core/machine: Allow dynamic registration of valid CPU types Date: Tue, 22 Apr 2025 16:54:53 +0200 Message-ID: <20250422145502.70770-12-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250422145502.70770-1-philmd@linaro.org> References: <20250422145502.70770-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=philmd@linaro.org; helo=mail-wr1-x42c.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 Add MachineClass::get_valid_cpu_types(), a helper that returns a dynamic list of CPU types. Since the helper takes a MachineState argument, we know the machine is created by the time we call it. Suggested-by: Pierrick Bouvier Signed-off-by: Philippe Mathieu-Daudé --- include/hw/boards.h | 4 ++++ hw/core/machine.c | 27 +++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/include/hw/boards.h b/include/hw/boards.h index 02f43ac5d4d..be0c0f04804 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -259,6 +259,9 @@ typedef struct { * @smbios_memory_device_size: * Default size of memory device, * SMBIOS 3.1.0 "7.18 Memory Device (Type 17)" + * @get_valid_cpu_types: + * Returns a list of valid CPU types for this board. May be NULL + * if not needed. */ struct MachineClass { /*< private >*/ @@ -306,6 +309,7 @@ struct MachineClass { bool ignore_memory_transaction_failures; int numa_mem_align_shift; const char * const *valid_cpu_types; + GSList *(*get_valid_cpu_types)(const MachineState *ms); strList *allowed_dynamic_sysbus_devices; bool auto_enable_numa_with_memhp; bool auto_enable_numa_with_memdev; diff --git a/hw/core/machine.c b/hw/core/machine.c index f52a4f2273b..8b40735ef98 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -1581,6 +1581,33 @@ static bool is_cpu_type_supported(const MachineState *machine, Error **errp) return false; } } + if (mc->get_valid_cpu_types) { + GSList *vct = mc->get_valid_cpu_types(machine); + bool valid = false; + unsigned count = 0; + GSList *l; + + for (l = vct; !valid && l != NULL; l = l->next) { + valid |= !!object_class_dynamic_cast(oc, l->data); + count++; + } + + if (!valid) { + g_autofree char *requested = cpu_model_from_type(machine->cpu_type); + vct = g_slist_reverse(vct); + error_setg(errp, "Invalid CPU model: %s", requested); + error_append_hint(errp, "The valid models are: "); + for (l = vct; l != NULL; l = l->next) { + g_autofree char *model = cpu_model_from_type(l->data); + error_append_hint(errp, "%s%s", model, --count ? ", " : ""); + } + error_append_hint(errp, "\n"); + } + g_slist_free_full(vct, g_free); + if (!valid) { + return false; + } + } /* Check if CPU type is deprecated and warn if so */ cc = CPU_CLASS(oc);