]> rtime.felk.cvut.cz Git - lisovros/qemu_apohw.git/commitdiff
target-ppc: Force CPU threads count to be a power of 2
authorBharata B Rao <bharata@linux.vnet.ibm.com>
Wed, 5 Mar 2014 08:32:36 +0000 (14:02 +0530)
committerAndreas Färber <afaerber@suse.de>
Thu, 20 Mar 2014 01:39:33 +0000 (02:39 +0100)
PowerPC kernel expects the number of SMT threads in a core to be a power
of 2. Since QEMU doesn't enforce this, it leads to an early guest kernel
crash if invalid threads count is specified.

Prevent this crash and make it a graceful exit from QEMU itself by
validating the user-supplied threads count.

Signed-off-by: Bharata B Rao <bharata@linux.vnet.ibm.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
target-ppc/translate_init.c

index 3269c3ebe44bdca9f89048afa325705323bcbf3c..5302bdc1b27167295eae8b7e8b3f433fd05ebe26 100644 (file)
@@ -7848,6 +7848,12 @@ static void ppc_cpu_realizefn(DeviceState *dev, Error **errp)
                    max_smt, kvm_enabled() ? "KVM" : "TCG");
         return;
     }
+    if (!is_power_of_2(smp_threads)) {
+        error_setg(errp, "Cannot support %d threads on PPC with %s, "
+                   "threads count must be a power of 2.",
+                   smp_threads, kvm_enabled() ? "KVM" : "TCG");
+        return;
+    }
 
     cpu->cpu_dt_id = (cs->cpu_index / smp_threads) * max_smt
         + (cs->cpu_index % smp_threads);