[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 26/32] machine: Introduce helper is_cpu_type_supported()
From: |
Gavin Shan |
Subject: |
[PATCH v3 26/32] machine: Introduce helper is_cpu_type_supported() |
Date: |
Thu, 7 Sep 2023 10:35:47 +1000 |
The logic, to check if the specified CPU type is supported in
machine_run_board_init(), is independent enough. Factor it out
into helper is_cpu_type_supported(). With this, machine_run_board_init()
looks a bit clean. Since we're here, @machine_class is renamed to
@mc to avoid multiple line spanning of code. The comments are tweaked
a bit either.
No functional change intended.
Signed-off-by: Gavin Shan <gshan@redhat.com>
---
hw/core/machine.c | 82 +++++++++++++++++++++++++----------------------
1 file changed, 44 insertions(+), 38 deletions(-)
diff --git a/hw/core/machine.c b/hw/core/machine.c
index 6d3f8e133f..93a327927f 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -1352,12 +1352,50 @@ out:
return r;
}
+static void is_cpu_type_supported(MachineState *machine, Error **errp)
+{
+ MachineClass *mc = MACHINE_GET_CLASS(machine);
+ ObjectClass *oc = object_class_by_name(machine->cpu_type);
+ CPUClass *cc;
+ int i;
+
+ /*
+ * Check if the user specified CPU type is supported when the valid
+ * CPU types have been determined. Note that the user specified CPU
+ * type is provided through '-cpu' option.
+ */
+ if (mc->valid_cpu_types && machine->cpu_type) {
+ for (i = 0; mc->valid_cpu_types[i]; i++) {
+ if (object_class_dynamic_cast(oc, mc->valid_cpu_types[i])) {
+ break;
+ }
+ }
+
+ /* The user specified CPU type isn't valid */
+ if (!mc->valid_cpu_types[i]) {
+ error_setg(errp, "Invalid CPU type: %s", machine->cpu_type);
+ error_append_hint(errp, "The valid types are: %s",
+ mc->valid_cpu_types[0]);
+ for (i = 1; mc->valid_cpu_types[i]; i++) {
+ error_append_hint(errp, ", %s", mc->valid_cpu_types[i]);
+ }
+
+ error_append_hint(errp, "\n");
+ return;
+ }
+ }
+
+ /* Check if CPU type is deprecated and warn if so */
+ cc = CPU_CLASS(oc);
+ if (cc && cc->deprecation_note) {
+ warn_report("CPU model %s is deprecated -- %s",
+ machine->cpu_type, cc->deprecation_note);
+ }
+}
void machine_run_board_init(MachineState *machine, const char *mem_path, Error
**errp)
{
MachineClass *machine_class = MACHINE_GET_CLASS(machine);
- ObjectClass *oc = object_class_by_name(machine->cpu_type);
- CPUClass *cc;
Error *local_err = NULL;
/* This checkpoint is required by replay to separate prior clock
@@ -1409,42 +1447,10 @@ void machine_run_board_init(MachineState *machine,
const char *mem_path, Error *
machine->ram = machine_consume_memdev(machine, machine->memdev);
}
- /* If the machine supports the valid_cpu_types check and the user
- * specified a CPU with -cpu check here that the user CPU is supported.
- */
- if (machine_class->valid_cpu_types && machine->cpu_type) {
- int i;
-
- for (i = 0; machine_class->valid_cpu_types[i]; i++) {
- if (object_class_dynamic_cast(oc,
- machine_class->valid_cpu_types[i])) {
- /* The user specificed CPU is in the valid field, we are
- * good to go.
- */
- break;
- }
- }
-
- if (!machine_class->valid_cpu_types[i]) {
- /* The user specified CPU is not valid */
- error_setg(&local_err, "Invalid CPU type: %s", machine->cpu_type);
- error_append_hint(&local_err, "The valid types are: %s",
- machine_class->valid_cpu_types[0]);
- for (i = 1; machine_class->valid_cpu_types[i]; i++) {
- error_append_hint(&local_err, ", %s",
- machine_class->valid_cpu_types[i]);
- }
- error_append_hint(&local_err, "\n");
-
- error_propagate(errp, local_err);
- }
- }
-
- /* Check if CPU type is deprecated and warn if so */
- cc = CPU_CLASS(oc);
- if (cc && cc->deprecation_note) {
- warn_report("CPU model %s is deprecated -- %s", machine->cpu_type,
- cc->deprecation_note);
+ /* Check if the CPU type is supported */
+ is_cpu_type_supported(machine, &local_err);
+ if (local_err) {
+ error_propagate(errp, local_err);
}
if (machine->cgs) {
--
2.41.0
- Re: [PATCH v3 17/32] target/tricore: Use generic helper to show CPU model names, (continued)
- [PATCH v3 18/32] target/sparc: Improve sparc_cpu_class_by_name(), Gavin Shan, 2023/09/06
- [PATCH v3 19/32] target/xtensa: Improve xtensa_cpu_class_by_name(), Gavin Shan, 2023/09/06
- [PATCH v3 20/32] target/hppa: Implement hppa_cpu_list(), Gavin Shan, 2023/09/06
- [PATCH v3 21/32] target/microblaze: Implement microblaze_cpu_list(), Gavin Shan, 2023/09/06
- [PATCH v3 22/32] target/nios2: Implement nios2_cpu_list(), Gavin Shan, 2023/09/06
- [PATCH v3 23/32] Mark cpu_list() supported on all targets, Gavin Shan, 2023/09/06
- [PATCH v3 24/32] machine: Constify MachineClass::valid_cpu_types[i], Gavin Shan, 2023/09/06
- [PATCH v3 25/32] machine: Use error handling when CPU type is checked, Gavin Shan, 2023/09/06
- [PATCH v3 26/32] machine: Introduce helper is_cpu_type_supported(),
Gavin Shan <=
- [PATCH v3 27/32] machine: Print CPU model name instead of CPU type name, Gavin Shan, 2023/09/06
[PATCH v3 28/32] hw/arm/virt: Check CPU type in machine_run_board_init(), Gavin Shan, 2023/09/06
[PATCH v3 29/32] hw/arm/virt: Hide host CPU model for tcg, Gavin Shan, 2023/09/06
[PATCH v3 30/32] hw/arm/sbsa-ref: Check CPU type in machine_run_board_init(), Gavin Shan, 2023/09/06