From: Peter Maydell Date: Mon, 3 Apr 2017 10:15:33 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.9-20170403' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9eb5adae26b828219e82f17c854cdf1f192f9565;p=qemu.git Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.9-20170403' into staging ppc patch queue 2017-04-03 A single bugfix in this pull request, for an ugly assert() failure, if the user ignores the information in query-hotpluggable-cpus and tries to hot add CPUs to pseries with bad parameters. # gpg: Signature made Mon 03 Apr 2017 11:06:58 BST # gpg: using RSA key 0x6C38CACA20D9B392 # gpg: Good signature from "David Gibson " # gpg: aka "David Gibson (Red Hat) " # gpg: aka "David Gibson (ozlabs.org) " # gpg: aka "David Gibson (kernel.org) " # Primary key fingerprint: 75F4 6586 AE61 A66C C44E 87DC 6C38 CACA 20D9 B392 * remotes/dgibson/tags/ppc-for-2.9-20170403: pseries: Enforce homogeneous threads-per-core Signed-off-by: Peter Maydell --- 9eb5adae26b828219e82f17c854cdf1f192f9565