[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH 02/10] pseries: Cleanup error handling of spapr_cpu_in
From: |
David Gibson |
Subject: |
[Qemu-ppc] [PATCH 02/10] pseries: Cleanup error handling of spapr_cpu_init() |
Date: |
Fri, 15 Jan 2016 23:00:36 +1100 |
Currently spapr_cpu_init() is hardcoded to handle any errors as fatal.
That works for now, since it's only called from initial setup where an
error here means we really can't proceed.
However, we'll want to handle this more flexibly for cpu hotplug in future
so generalize this using the error reporting infrastructure. While we're
at it make a small cleanup in a related part of ppc_spapr_init() to use
error_report() instead of an old-style explicit fprintf().
Signed-off-by: David Gibson <address@hidden>
Reviewed-by: Bharata B Rao <address@hidden>
---
hw/ppc/spapr.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index fa7a7f4..b7fd09a 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -1617,7 +1617,8 @@ static void spapr_boot_set(void *opaque, const char
*boot_device,
machine->boot_order = g_strdup(boot_device);
}
-static void spapr_cpu_init(sPAPRMachineState *spapr, PowerPCCPU *cpu)
+static void spapr_cpu_init(sPAPRMachineState *spapr, PowerPCCPU *cpu,
+ Error **errp)
{
CPUPPCState *env = &cpu->env;
@@ -1635,7 +1636,13 @@ static void spapr_cpu_init(sPAPRMachineState *spapr,
PowerPCCPU *cpu)
}
if (cpu->max_compat) {
- ppc_set_compat(cpu, cpu->max_compat, &error_fatal);
+ Error *local_err = NULL;
+
+ ppc_set_compat(cpu, cpu->max_compat, &local_err);
+ if (local_err) {
+ error_propagate(errp, local_err);
+ return;
+ }
}
xics_cpu_setup(spapr->icp, cpu);
@@ -1804,10 +1811,10 @@ static void ppc_spapr_init(MachineState *machine)
for (i = 0; i < smp_cpus; i++) {
cpu = cpu_ppc_init(machine->cpu_model);
if (cpu == NULL) {
- fprintf(stderr, "Unable to find PowerPC CPU definition\n");
+ error_report("Unable to find PowerPC CPU definition");
exit(1);
}
- spapr_cpu_init(spapr, cpu);
+ spapr_cpu_init(spapr, cpu, &error_fatal);
}
if (kvm_enabled()) {
--
2.5.0
- [Qemu-ppc] [PATCH 00/10] Cleanups to error reporting on ppc and spapr (v2), David Gibson, 2016/01/15
- [Qemu-ppc] [PATCH 09/10] pseries: Clean up error reporting in ppc_spapr_init(), David Gibson, 2016/01/15
- [Qemu-ppc] [PATCH 02/10] pseries: Cleanup error handling of spapr_cpu_init(),
David Gibson <=
- [Qemu-ppc] [PATCH 01/10] ppc: Cleanup error handling in ppc_set_compat(), David Gibson, 2016/01/15
- [Qemu-ppc] [PATCH 04/10] pseries: Clean up error handling in spapr_validate_node_memory(), David Gibson, 2016/01/15
- [Qemu-ppc] [PATCH 08/10] pseries: Clean up error handling in xics_system_init(), David Gibson, 2016/01/15
- [Qemu-ppc] [PATCH 03/10] pseries: Clean up hash page table allocation error handling, David Gibson, 2016/01/15