Re: [PATCH v4 26/33] machine: Use error handling when CPU type is checked

[Richard Henderson]

On 11/1/23 17:24, Gavin Shan wrote:

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 <imamm...@redhat.com>
Signed-off-by: Gavin Shan <gs...@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 50edaab737..1c17a0d5bf 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -1393,6 +1393,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...

/* This checkpoint is required by replay to separate prior clock

         reading from the other reads, because timer polling functions query
@@ -1465,15 +1466,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);

... could go in this block.

Though I don't see why you can't write to errp directly?


r~