summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorLaurent Vivier <lvivier@redhat.com>2018-02-09 09:18:58 +0100
committerDavid Gibson <david@gibson.dropbear.id.au>2018-02-10 20:22:02 +1100
commit4ad64cbd0c3f9df15be5f7d1c920285551e802ca (patch)
tree7ee976766ddfc176584febdc2f29303969921ef3
parentae14d81757945a8298a34e00e82abe68d90644e7 (diff)
downloadfocaccia-qemu-4ad64cbd0c3f9df15be5f7d1c920285551e802ca.tar.gz
focaccia-qemu-4ad64cbd0c3f9df15be5f7d1c920285551e802ca.zip
spapr: set vsmt to MAX(8, smp_threads)
We ignore silently the value of smp_threads when we set
the default VSMT value, and if smp_threads is greater than VSMT
kernel is going into trouble later.

Fixes: 8904e5a750
("spapr: Adjust default VSMT value for better migration compatibility")

Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Greg Kurz <groug@kaod.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
-rw-r--r--hw/ppc/spapr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 96515036e6..9f29434819 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -2310,7 +2310,7 @@ static void spapr_set_vsmt_mode(sPAPRMachineState *spapr, Error **errp)
          * the value that we'd get with KVM on POWER8, the
          * overwhelmingly common case in production systems.
          */
-        spapr->vsmt = 8;
+        spapr->vsmt = MAX(8, smp_threads);
     }
 
     /* KVM: If necessary, set the SMT mode: */