diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-04-19 10:11:17 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-04-19 10:11:17 +0100 |
| commit | a087cc589d3581a89fdb8c09324941512b5ef300 (patch) | |
| tree | b5443e0b49e2b344f7413562be429422f357b31a | |
| parent | 92b674b62a1aec734280c9019cfb3b3745044b66 (diff) | |
| parent | 9997cf7bdac056aeed246613639675c5a9f8fdc2 (diff) | |
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: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | target-i386/cpu.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/target-i386/cpu.c b/target-i386/cpu.c index ddae932ee1..d0b5b69156 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -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); |