OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

pseries: Clean up error handling of spapr_cpu_init()

Browse Source 
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 <david@gibson.dropbear.id.au>
Reviewed-by: Bharata B Rao <bharata@linux.vnet.ibm.com>
Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
David Gibson 2016-01-20 12:58:21 +11:00
parent f9ab1e87ed
commit 569f49671d
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/ppc/spapr.c
View File

@ -1625,7 +1625,8 @@ static void spapr_boot_set(void *opaque, const char *boot_device,
machine->boot_order = g_strdup(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; CPUPPCState *env = &cpu->env;
@ -1643,7 +1644,13 @@ static void spapr_cpu_init(sPAPRMachineState *spapr, PowerPCCPU *cpu)
} }
if (cpu->max_compat) { 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); xics_cpu_setup(spapr->icp, cpu);
@ -1812,10 +1819,10 @@ static void ppc_spapr_init(MachineState *machine)
for (i = 0; i < smp_cpus; i++) { for (i = 0; i < smp_cpus; i++) {
cpu = cpu_ppc_init(machine->cpu_model); cpu = cpu_ppc_init(machine->cpu_model);
if (cpu == NULL) { if (cpu == NULL) {
fprintf(stderr, "Unable to find PowerPC CPU definition\n"); error_report("Unable to find PowerPC CPU definition");
exit(1); exit(1);
} }
spapr_cpu_init(spapr, cpu); spapr_cpu_init(spapr, cpu, &error_fatal);
} }
if (kvm_enabled()) { if (kvm_enabled()) {