diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2016-01-20 12:58:07 +1100 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2016-01-30 23:37:37 +1100 |
| commit | f9ab1e87edae8a72ae2a65fad658a77ad15d4da0 (patch) | |
| tree | a0d9738ac82901752bcda96af79bcabf33dfa273 /target-ppc | |
| parent | 16c25aef5362c6dd99c54fec78936ec3c10dc513 (diff) | |
| download | qemu-f9ab1e87edae8a72ae2a65fad658a77ad15d4da0.zip qemu-f9ab1e87edae8a72ae2a65fad658a77ad15d4da0.tar.gz qemu-f9ab1e87edae8a72ae2a65fad658a77ad15d4da0.tar.bz2 | |
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>
Diffstat (limited to 'target-ppc')
| -rw-r--r-- | target-ppc/cpu.h | 2 | ||||
| -rw-r--r-- | target-ppc/translate_init.c | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h index 9706000..b3b89e6 100644 --- a/target-ppc/cpu.h +++ b/target-ppc/cpu.h @@ -1210,7 +1210,7 @@ void ppc_store_msr (CPUPPCState *env, target_ulong value); void ppc_cpu_list (FILE *f, fprintf_function cpu_fprintf); 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 */ #ifndef NO_CPU_IO_DEFS diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 76d5da1..78c2811 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -9185,7 +9185,7 @@ int ppc_get_compat_smt_threads(PowerPCCPU *cpu) 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; CPUPPCState *env = &cpu->env; @@ -9207,12 +9207,13 @@ int ppc_set_compat(PowerPCCPU *cpu, uint32_t cpu_version) break; } - if (kvm_enabled() && kvmppc_set_compat(cpu, cpu->cpu_version) < 0) { - error_report("Unable to set compatibility mode in KVM"); - ret = -1; + if (kvm_enabled()) { + ret = kvmppc_set_compat(cpu, cpu->cpu_version); + 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) |