[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 25/32] machine: Use error handling when CPU type is checked
From: |
Gavin Shan |
Subject: |
[PATCH v3 25/32] machine: Use error handling when CPU type is checked |
Date: |
Thu, 7 Sep 2023 10:35:46 +1000 |
QEMU will be terminated if the specified CPU type isn't supported
in machine_run_board_init(). The list of supported CPU type names
is tracked by mc->valid_cpu_types.
The error handling can be used to propagate error messages, to be
consistent how the errors are handled for other situations in the
same function.
No functional change intended.
Suggested-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Gavin Shan <gshan@redhat.com>
---
hw/core/machine.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/hw/core/machine.c b/hw/core/machine.c
index da699cf4e1..6d3f8e133f 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -1358,6 +1358,7 @@ void machine_run_board_init(MachineState *machine, const
char *mem_path, Error *
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
reading from the other reads, because timer polling functions query
@@ -1426,15 +1427,16 @@ void machine_run_board_init(MachineState *machine,
const char *mem_path, Error *
if (!machine_class->valid_cpu_types[i]) {
/* The user specified CPU is not valid */
- error_report("Invalid CPU type: %s", machine->cpu_type);
- error_printf("The valid types are: %s",
- machine_class->valid_cpu_types[0]);
+ 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_printf(", %s", machine_class->valid_cpu_types[i]);
+ error_append_hint(&local_err, ", %s",
+ machine_class->valid_cpu_types[i]);
}
- error_printf("\n");
+ error_append_hint(&local_err, "\n");
- exit(1);
+ error_propagate(errp, local_err);
}
}
--
2.41.0
- [PATCH v3 17/32] target/tricore: Use generic helper to show CPU model names, (continued)
- [PATCH v3 17/32] target/tricore: Use generic helper to show CPU model names, Gavin Shan, 2023/09/06
- [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 <=
- [PATCH v3 26/32] machine: Introduce helper is_cpu_type_supported(), Gavin Shan, 2023/09/06
- [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