Merge branch 'kvm-amd-fixes' into HEAD