Second PPC KVM update for 4.15

This merges in my kvm-ppc-fixes branch to resolve the conflicts
between the fixes that have been applied there and the changes
made in my patch series to allow HPT guests to run on a radix
host on POWER9.  It also resolves another conflict in the code
for the KVM_CAP_PPC_HTM capability.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQEcBAABAgAGBQJaBCnRAAoJEJ2a6ncsY3GfHXUIAOAJm8GZXbtPLOHj+mdT3v2A
dkcy0kyYX/u6wxSIMQJVQUeq82hNDLv7ELxm4FB5xkjmq++yphvtJDyIbVKKdEX2
a2X83YlkQDOEhqwuT+1o/ysl0PCzQkdo6C2+s48mtLhn30j+ZkGorbnfKbGq3nav
H3oL6ut0Igl6kfnz2wSViK9pwq4oaWQvsf4PtzkRudk3W8V9bU7XeTL6/om32yW9
jgct+01i4hLSJLuCoMsqIVLwQDW88Fn2HGE/D52vnhbO3STiJRgh12t+TfC/smZo
RYDvWlEAVAEcoPaEzX9PDR8ntgnYaFo+5j/uG+8MpaSOryIR28KzQOXl8SnGR+w=
=NeHV
-----END PGP SIGNATURE-----