[13/13] target-ppc: Give a meaningful error if too many threads are specified

Message ID 1354588937-27122-14-git-send-email-david@gibson.dropbear.id.au
State New
Headers show

Commit Message

David Gibson Dec. 4, 2012, 2:42 a.m.
From: Mike Qiu <qiudayu@linux.vnet.ibm.com>

Currently the target-ppc tcg code only supports a single thread.  You can
specify more, but they're treated identically to multiple cores.  On KVM
we obviously can't support more threads than the hardware; if more are
specified it will cause strange and cryptic errors.

This patch clarifies the situation by giving a simple meaningful error if
more threads are specified than we can support.

Signed-off-by: Mike Qiu <qiudayu@linux.vnet.ibm.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
 target-ppc/translate_init.c |    8 ++++++++
 1 file changed, 8 insertions(+)


diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c
index dba572f..784361c 100644
--- a/target-ppc/translate_init.c
+++ b/target-ppc/translate_init.c
@@ -28,6 +28,7 @@ 
 #include <kvm.h>
 #include "kvm_ppc.h"
 #include "arch_init.h"
+#include "cpus.h"
 //#define PPC_DUMP_CPU
 //#define PPC_DEBUG_SPR
@@ -10037,6 +10038,8 @@  static int ppc_fixup_cpu(CPUPPCState *env)
 int cpu_ppc_register_internal (CPUPPCState *env, const ppc_def_t *def)
+    int max_smt = kvmppc_smt_threads();
     env->msr_mask = def->msr_mask;
     env->mmu_model = def->mmu_model;
     env->excp_model = def->excp_model;
@@ -10046,6 +10049,11 @@  int cpu_ppc_register_internal (CPUPPCState *env, const ppc_def_t *def)
     env->flags = def->flags;
     env->bfd_mach = def->bfd_mach;
     env->check_pow = def->check_pow;
+    if (smp_threads > max_smt){
+        fprintf(stderr, "Cannot support more than %d threads on PPC with %s\n",
+                max_smt, kvm_enabled() ? "KVM" : "TCG");
+        exit(1);
+    }
 #if defined(TARGET_PPC64)
     if (def->sps)