Commit a087cc58 authored by Peter Maydell's avatar Peter Maydell
Browse files

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 <ehabkost@redhat.com>"

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

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 92b674b6 9997cf7b

target-i386/cpu.c

+8 −8
Original line number Diff line number Diff line
@@ -2897,6 +2897,14 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp) 
        env->cpuid_level = 7;

    }



    if (x86_cpu_filter_features(cpu) && cpu->enforce_cpuid) {

        error_setg(&local_err,

                   kvm_enabled() ?

                       "Host doesn't support requested features" :

                       "TCG doesn't support requested features");

        goto out;

    }



    /* On AMD CPUs, some CPUID[8000_0001].EDX bits must match the bits on

     * CPUID[1].EDX.

     */
@@ -2907,14 +2915,6 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp) 
    }





    if (x86_cpu_filter_features(cpu) && cpu->enforce_cpuid) {

        error_setg(&local_err,

                   kvm_enabled() ?

                       "Host doesn't support requested features" :

                       "TCG doesn't support requested features");

        goto out;

    }



#ifndef CONFIG_USER_ONLY

    qemu_register_reset(x86_cpu_machine_reset_cb, cpu);