| Message ID | 20210507133650.645526-3-berrange@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | i386: use better matching family/model/stepping for generic CPUs | expand |
On Fri, May 07, 2021 at 02:36:50PM +0100, Daniel P. Berrangé wrote: > 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> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 99caa3deae..80de5b04eb 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -4440,9 +4440,15 @@ static void max_x86_cpu_initfn(Object *obj) } else { 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);
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> --- target/i386/cpu.c | 6 ++++++ 1 file changed, 6 insertions(+)