diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-06-30 13:12:01 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-06-30 13:12:01 +0300 |
| commit | 6421a1ce48f03a63c3fcf32ee0300655fcb1d8fb (patch) | |
| tree | 491562ddaea8ea1a0d5151e8f48ac7b191fa86b5 /target-i386/helper.c | |
| parent | Merge commit '6c1f42fe83bf9bc14a7a6cc5afd8dad83ee25c74' into upstream-merge (diff) | |
| parent | remove CPUID host hacks (diff) | |
| download | qemu-kvm-6421a1ce48f03a63c3fcf32ee0300655fcb1d8fb.tar.gz qemu-kvm-6421a1ce48f03a63c3fcf32ee0300655fcb1d8fb.tar.bz2 qemu-kvm-6421a1ce48f03a63c3fcf32ee0300655fcb1d8fb.zip | |
Merge commit '671e4676076fb62860986decd44440d97bcc872d' into upstream-merge
* commit '671e4676076fb62860986decd44440d97bcc872d':
remove CPUID host hacks
Conflicts:
target-i386/helper.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'target-i386/helper.c')
| -rw-r--r-- | target-i386/helper.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/target-i386/helper.c b/target-i386/helper.c index 30c2352a3..d76c2246b 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -1665,9 +1665,12 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, /* svm */ if (!kvm_nested) - *ecx &= ~4UL; + *ecx &= ~CPUID_EXT3_SVM; /* 3dnow */ *edx &= ~0xc0000000; + } else { + /* AMD 3DNow! is not supported in QEMU */ + *edx &= ~(CPUID_EXT2_3DNOW | CPUID_EXT2_3DNOWEXT); } break; case 0x80000002: |