[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/24] i386: use better matching family/model/stepping for 'max' C
From: |
Eduardo Habkost |
Subject: |
[PULL 07/24] i386: use better matching family/model/stepping for 'max' CPU |
Date: |
Tue, 1 Jun 2021 14:09:57 -0400 |
From: Daniel P. Berrangé <berrange@redhat.com>
The 'max' CPU under TCG 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 'max' 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>
Message-Id: <20210507133650.645526-3-berrange@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
target/i386/cpu.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 078ec905522..d150378c400 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -4285,9 +4285,15 @@ static void max_x86_cpu_initfn(Object *obj)
*/
object_property_set_str(OBJECT(cpu), "vendor", CPUID_VENDOR_AMD,
&error_abort);
+#ifdef TARGET_X86_64
+ object_property_set_int(OBJECT(cpu), "family", 15, &error_abort);
+ object_property_set_int(OBJECT(cpu), "model", 107, &error_abort);
+ object_property_set_int(OBJECT(cpu), "stepping", 1, &error_abort);
+#else
object_property_set_int(OBJECT(cpu), "family", 6, &error_abort);
object_property_set_int(OBJECT(cpu), "model", 6, &error_abort);
object_property_set_int(OBJECT(cpu), "stepping", 3, &error_abort);
+#endif
object_property_set_str(OBJECT(cpu), "model-id",
"QEMU TCG CPU version " QEMU_HW_VERSION,
&error_abort);
--
2.30.2
- [PULL 00/24] x86 queue, 2021-06-01, Eduardo Habkost, 2021/06/01
- [PULL 01/24] target/i386: Add CPU model versions supporting 'xsaves', Eduardo Habkost, 2021/06/01
- [PULL 02/24] i386: Document when features can be added to kvm_default_props, Eduardo Habkost, 2021/06/01
- [PULL 03/24] target/i386/cpu: Constify CPUCaches, Eduardo Habkost, 2021/06/01
- [PULL 04/24] target/i386/cpu: Constify X86CPUDefinition, Eduardo Habkost, 2021/06/01
- [PULL 05/24] i386/cpu_dump: support AVX512 ZMM regs dump, Eduardo Habkost, 2021/06/01
- [PULL 07/24] i386: use better matching family/model/stepping for 'max' CPU,
Eduardo Habkost <=
- [PULL 06/24] i386: use better matching family/model/stepping for 'qemu64' CPU, Eduardo Habkost, 2021/06/01
- [PULL 10/24] i386: always fill Hyper-V CPUID feature leaves from X86CPU data, Eduardo Habkost, 2021/06/01
- [PULL 09/24] i386: invert hyperv_spinlock_attempts setting logic with hv_passthrough, Eduardo Habkost, 2021/06/01
- [PULL 08/24] i386: keep hyperv_vendor string up-to-date, Eduardo Habkost, 2021/06/01
- [PULL 11/24] i386: stop using env->features[] for filling Hyper-V CPUIDs, Eduardo Habkost, 2021/06/01
- [PULL 13/24] i386: introduce hv_cpuid_get_host(), Eduardo Habkost, 2021/06/01
- [PULL 12/24] i386: introduce hyperv_feature_supported(), Eduardo Habkost, 2021/06/01
- [PULL 14/24] i386: drop FEAT_HYPERV feature leaves, Eduardo Habkost, 2021/06/01
- [PULL 17/24] i386: move eVMCS enablement to hyperv_init_vcpu(), Eduardo Habkost, 2021/06/01
- [PULL 20/24] i386: prefer system KVM_GET_SUPPORTED_HV_CPUID ioctl over vCPU's one, Eduardo Habkost, 2021/06/01