pseries: Restore support for total vcpus not a multiple of threads-per-core for old...
commit459264ef24cf2d409b8baf2047fa86e697d6e9ab
authorDavid Gibson <david@gibson.dropbear.id.au>
Tue, 23 May 2017 06:33:06 +0000 (23 16:33 +1000)
committerDavid Gibson <david@gibson.dropbear.id.au>
Wed, 24 May 2017 01:39:53 +0000 (24 11:39 +1000)
treeeac8ed3d2b70ca2179f6a022a90f6400f9d8b058
parent80c33d343f068012348869e16e579375c8911a04
pseries: Restore support for total vcpus not a multiple of threads-per-core for old machine types

As of pseries-2.7 and later, we require the total number of guest vcpus to
be a multiple of the threads-per-core.  pseries-2.6 and earlier machine
types, however, are supposed to allow this for the sake of migration from
old qemu versions which allowed this.

Unfortunately, 8149e29 "pseries: Enforce homogeneous threads-per-core"
broke this by not considering the old machine type case.  This fixes it by
only applying the check when the machine type supports hotpluggable cpus.
By not-entirely-coincidence, that corresponds to the same time when we
started enforcing total threads being a multiple of threads-per-core.

Fixes: 8149e2992f7811355cc34721b79d69d1a3a667dd

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Greg Kurz <groug@kaod.org>
Tested-by: Greg Kurz <groug@kaod.org>
hw/ppc/spapr.c