[Qemu-commits] [qemu/qemu] 9997cf: target-i386: Set AMD alias bits after filtering CP...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 9997cf7bdac056aeed246613639675c5a9f8fdc2
      
https://github.com/qemu/qemu/commit/9997cf7bdac056aeed246613639675c5a9f8fdc2
  Author: Eduardo Habkost <address@hidden>
  Date:   2016-04-18 (Mon, 18 Apr 2016)

  Changed paths:
    M target-i386/cpu.c

  Log Message:
  -----------
  target-i386: Set AMD alias bits after filtering CPUID data

QEMU complains about -cpu host on an AMD machine:
  warning: host doesn't support requested feature: CPUID.80000001H:EDX [bit 0]
For bits 0,1,3,4,5,6,7,8,9,12,13,14,15,16,17,23,24.

KVM_GET_SUPPORTED_CPUID and and x86_cpu_get_migratable_flags()
don't handle the AMD CPUID aliases bits, making
x86_cpu_filter_features() print warnings and clear those CPUID
bits incorrectly.

To avoid hacking x86_cpu_get_migratable_flags() to handle
CPUID_EXT2_AMD_ALIASES (just like the existing hack inside
kvm_arch_get_supported_cpuid()), simply move the
CPUID_EXT2_AMD_ALIASES code in x86_cpu_realizefn() after the
x86_cpu_filter_features() call.

This will probably make the CPUID_EXT2_AMD_ALIASES hack in
kvm_arch_get_supported_cpuid() unnecessary, too. The hack will be
removed in a follow-up patch after v2.6.0.

Reported-by: Radim Krčmář <address@hidden>
Tested-by: Radim Krčmář <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>


  Commit: a087cc589d3581a89fdb8c09324941512b5ef300
      
https://github.com/qemu/qemu/commit/a087cc589d3581a89fdb8c09324941512b5ef300
  Author: Peter Maydell <address@hidden>
  Date:   2016-04-19 (Tue, 19 Apr 2016)

  Changed paths:
    M target-i386/cpu.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into 
staging

X86 fix for 2.6.0-rc3

# gpg: Signature made Mon 18 Apr 2016 20:02:15 BST using RSA key ID 984DC5A6
# gpg: Good signature from "Eduardo Habkost <address@hidden>"

* remotes/ehabkost/tags/x86-pull-request:
  target-i386: Set AMD alias bits after filtering CPUID data

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/92b674b62a1a...a087cc589d35