@@ -57,6 +57,13 @@ void machine_set_cache_topo_level(MachineState *ms, CacheLevelAndType cache,
bool machine_check_smp_cache(const MachineState *ms, Error **errp);
void machine_memory_devices_init(MachineState *ms, hwaddr base, uint64_t size);
+/**
+ * machine_class_add_valid_cpu_type: Add type to list of valid CPUs
+ * @mc: Machine class
+ * @type: CPU type to allow (should be a subtype of TYPE_CPU)
+ */
+void machine_class_add_valid_cpu_type(MachineClass *mc, const char *type);
+
/**
* machine_class_allow_dynamic_sysbus_dev: Add type to list of valid devices
* @mc: Machine class
@@ -307,6 +314,7 @@ struct MachineClass {
bool ignore_memory_transaction_failures;
int numa_mem_align_shift;
const char * const *valid_cpu_types;
+ strList *valid_cpu_types_list;
strList *allowed_dynamic_sysbus_devices;
bool auto_enable_numa_with_memhp;
bool auto_enable_numa_with_memdev;
@@ -1538,6 +1538,11 @@ const char *machine_class_default_cpu_type(MachineClass *mc)
return mc->default_cpu_type;
}
+void machine_class_add_valid_cpu_type(MachineClass *mc, const char *type)
+{
+ QAPI_LIST_PREPEND(mc->valid_cpu_types_list, g_strdup(type));
+}
+
static bool is_cpu_type_supported(const MachineState *machine, Error **errp)
{
MachineClass *mc = MACHINE_GET_CLASS(machine);
@@ -1581,6 +1586,29 @@ static bool is_cpu_type_supported(const MachineState *machine, Error **errp)
return false;
}
}
+ if (mc->valid_cpu_types_list) {
+ bool valid = false;
+ unsigned count = 0;
+ strList *wl;
+
+ for (wl = mc->valid_cpu_types_list; !valid && wl; wl = wl->next) {
+ valid |= !!object_class_dynamic_cast(oc, wl->value);
+ count++;
+ }
+
+ if (!valid) {
+ g_autofree char *requested = cpu_model_from_type(machine->cpu_type);
+ error_setg(errp, "Invalid CPU model: %s", requested);
+ error_append_hint(errp, "The valid models are: ");
+ for (wl = mc->valid_cpu_types_list; wl; wl = wl->next) {
+ g_autofree char *model = cpu_model_from_type(wl->value);
+ error_append_hint(errp, "%s%s", model, --count ? ", " : "");
+ }
+ error_append_hint(errp, "\n");
+
+ return false;
+ }
+ }
/* Check if CPU type is deprecated and warn if so */
cc = CPU_CLASS(oc);
Add MachineClass::valid_cpu_types_list, a dynamic list of strings. CPU types can be registered with machine_class_add_valid_cpu_type(). Suggested-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- include/hw/boards.h | 8 ++++++++ hw/core/machine.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+)