diff options
| author | Daniel P. Berrangé <berrange@redhat.com> | 2021-05-07 14:36:49 +0100 |
|---|---|---|
| committer | Eduardo Habkost <ehabkost@redhat.com> | 2021-05-31 15:53:03 -0400 |
| commit | b7c290177ce1f035db8cdd8abf97b94a44e27f8c (patch) | |
| tree | f7fbac1155f55100d515f09455572570ddcbef5c /target/i386/cpu.c | |
| parent | f9c0322a5ff5dc28be41290a26d0133e86a6ea4c (diff) | |
| download | focaccia-qemu-b7c290177ce1f035db8cdd8abf97b94a44e27f8c.tar.gz focaccia-qemu-b7c290177ce1f035db8cdd8abf97b94a44e27f8c.zip | |
i386: use better matching family/model/stepping for 'qemu64' CPU
The 'qemu64' CPUID currently reports a family/model/stepping that approximately corresponds to an AMD K7 vintage architecture. The K7 series predates the introduction of 64-bit support by AMD in the K8 series. This has been reported to lead to LLVM complaints about generating 64-bit code for a 32-bit CPU target LLVM ERROR: 64-bit code requested on a subtarget that doesn't support it! It appears LLVM looks at the family/model/stepping, despite qemu64 reporting it is 64-bit capable. This patch changes 'qemu64' to report a CPUID with the family, model and stepping taken from a AMD Athlon(tm) 64 X2 Dual Core Processor 4000+ which is one of the first 64-bit AMD CPUs. Closes https://gitlab.com/qemu-project/qemu/-/issues/191 Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> Message-Id: <20210507133650.645526-2-berrange@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Diffstat (limited to 'target/i386/cpu.c')
| -rw-r--r-- | target/i386/cpu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/i386/cpu.c b/target/i386/cpu.c index ff92d924ad..078ec90552 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -1803,9 +1803,9 @@ static const X86CPUDefinition builtin_x86_defs[] = { .name = "qemu64", .level = 0xd, .vendor = CPUID_VENDOR_AMD, - .family = 6, - .model = 6, - .stepping = 3, + .family = 15, + .model = 107, + .stepping = 1, .features[FEAT_1_EDX] = PPRO_FEATURES | CPUID_MTRR | CPUID_CLFLUSH | CPUID_MCA | |