ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ppc: Clean up error handling in ppc_set_compat() 

Current ppc_set_compat() returns -1 for errors, and also (unconditionally)
reports an error message.  The caller in h_client_architecture_support()
may then report it again using an outdated fprintf().

Clean this up by using the modern error reporting mechanisms.  Also add
strerror(errno) to the error message.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Thomas Huth <thuth@redhat.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:07 +11:00
parent 16c25aef53
commit f9ab1e87ed
4 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/ppc/spapr.c
View File

@ -1643,9 +1643,7 @@ static void spapr_cpu_init(sPAPRMachineState *spapr, PowerPCCPU *cpu)
} }
if (cpu->max_compat) { if (cpu->max_compat) {
if (ppc_set_compat(cpu, cpu->max_compat) < 0) { ppc_set_compat(cpu, cpu->max_compat, &error_fatal);
exit(1);
}
} }
xics_cpu_setup(spapr->icp, cpu); xics_cpu_setup(spapr->icp, cpu);

10
hw/ppc/spapr_hcall.c
View File

@ -838,7 +838,7 @@ static target_ulong cas_get_option_vector(int vector, target_ulong table)
typedef struct { typedef struct {
PowerPCCPU *cpu; PowerPCCPU *cpu;
uint32_t cpu_version; uint32_t cpu_version;
int ret; Error *err;
} SetCompatState; } SetCompatState;
static void do_set_compat(void *arg) static void do_set_compat(void *arg)
@ -846,7 +846,7 @@ static void do_set_compat(void *arg)
SetCompatState *s = arg; SetCompatState *s = arg;
cpu_synchronize_state(CPU(s->cpu)); cpu_synchronize_state(CPU(s->cpu));
s->ret = ppc_set_compat(s->cpu, s->cpu_version); ppc_set_compat(s->cpu, s->cpu_version, &s->err);
} }
#define get_compat_level(cpuver) ( \ #define get_compat_level(cpuver) ( \
@ -931,13 +931,13 @@ static target_ulong h_client_architecture_support(PowerPCCPU *cpu_,
SetCompatState s = { SetCompatState s = {
.cpu = POWERPC_CPU(cs), .cpu = POWERPC_CPU(cs),
.cpu_version = cpu_version, .cpu_version = cpu_version,
.ret = 0 .err = NULL,
}; };
run_on_cpu(cs, do_set_compat, &s); run_on_cpu(cs, do_set_compat, &s);
if (s.ret < 0) { if (s.err) {
fprintf(stderr, "Unable to set compatibility mode\n"); error_report_err(s.err);
return H_HARDWARE; return H_HARDWARE;
} }
} }

2
target-ppc/cpu.h
View File

@ -1210,7 +1210,7 @@ void ppc_store_msr (CPUPPCState *env, target_ulong value);
void ppc_cpu_list (FILE *f, fprintf_function cpu_fprintf); void ppc_cpu_list (FILE *f, fprintf_function cpu_fprintf);
int ppc_get_compat_smt_threads(PowerPCCPU *cpu); int ppc_get_compat_smt_threads(PowerPCCPU *cpu);
int ppc_set_compat(PowerPCCPU *cpu, uint32_t cpu_version); void ppc_set_compat(PowerPCCPU *cpu, uint32_t cpu_version, Error **errp);
/* Time-base and decrementer management */ /* Time-base and decrementer management */
#ifndef NO_CPU_IO_DEFS #ifndef NO_CPU_IO_DEFS

13
target-ppc/translate_init.c
View File

@ -9185,7 +9185,7 @@ int ppc_get_compat_smt_threads(PowerPCCPU *cpu)
return ret; return ret;
} }
int ppc_set_compat(PowerPCCPU *cpu, uint32_t cpu_version) void ppc_set_compat(PowerPCCPU *cpu, uint32_t cpu_version, Error **errp)
{ {
int ret = 0; int ret = 0;
CPUPPCState *env = &cpu->env; CPUPPCState *env = &cpu->env;
@ -9207,12 +9207,13 @@ int ppc_set_compat(PowerPCCPU *cpu, uint32_t cpu_version)
break; break;
} }
if (kvm_enabled() && kvmppc_set_compat(cpu, cpu->cpu_version) < 0) { if (kvm_enabled()) {
error_report("Unable to set compatibility mode in KVM"); ret = kvmppc_set_compat(cpu, cpu->cpu_version);
ret = -1; if (ret < 0) {
error_setg_errno(errp, -ret,
"Unable to set CPU compatibility mode in KVM");
}
} }
return ret;
} }
static gint ppc_cpu_compare_class_pvr(gconstpointer a, gconstpointer b) static gint ppc_cpu_compare_class_pvr(gconstpointer a, gconstpointer b)