diff options
| author | Daniel P. Berrangé <berrange@redhat.com> | 2021-05-07 14:36:50 +0100 |
|---|---|---|
| committer | Eduardo Habkost <ehabkost@redhat.com> | 2021-05-31 15:53:03 -0400 |
| commit | 40b3cc354a47d9017d280cb25efbe6f94d7575bb (patch) | |
| tree | 8a08ee6b804e1bb872c5438bae94bb8e83ab7904 | |
| parent | b7c290177ce1f035db8cdd8abf97b94a44e27f8c (diff) | |
| download | qemu-40b3cc354a47d9017d280cb25efbe6f94d7575bb.zip qemu-40b3cc354a47d9017d280cb25efbe6f94d7575bb.tar.gz qemu-40b3cc354a47d9017d280cb25efbe6f94d7575bb.tar.bz2 | |
i386: use better matching family/model/stepping for 'max' CPU
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>
| -rw-r--r-- | target/i386/cpu.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 078ec90..d150378 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); |