| Message ID | 20230111110330.1507634-1-richard.purdie@linuxfoundation.org |
|---|---|
| State | Accepted, archived |
| Commit | 369b1dfa28b1791d45f068acc765190defecd460 |
| Headers | show |
| Series | qemux86-64: Reduce tuning to core2-64 | expand |
On Wed, 11 Jan 2023 at 12:03, Richard Purdie <richard.purdie@linuxfoundation.org> wrote: > Much as I'd love us to use the latest tuning, we do have some autobuilder > hardware which isn't ready for this yet which breaks KVM and some qemu > user mode usage as there appear to be TCG bugs too. I suspect we're not > the only ones with such hardware. For reference, the TCG bugs showed up only in meta-clang testing: https://autobuilder.yoctoproject.org/typhoon/#/builders/142/builds/10 particularly, BMI implementation isn't entirely correct: https://gitlab.com/qemu-project/qemu/-/issues/1370 Alex
diff --git a/meta/conf/machine/include/x86/qemuboot-x86.inc b/meta/conf/machine/include/x86/qemuboot-x86.inc index 31db1b2a61f..3953679366d 100644 --- a/meta/conf/machine/include/x86/qemuboot-x86.inc +++ b/meta/conf/machine/include/x86/qemuboot-x86.inc @@ -4,8 +4,8 @@ QB_SMP = "-smp 4" QB_CPU:x86 = "-cpu IvyBridge -machine q35,i8042=off" QB_CPU_KVM:x86 = "-cpu IvyBridge -machine q35,i8042=off" -QB_CPU:x86-64 = "-cpu Skylake-Client -machine q35,i8042=off" -QB_CPU_KVM:x86-64 = "-cpu Skylake-Client -machine q35,i8042=off" +QB_CPU:x86-64 = "-cpu IvyBridge -machine q35,i8042=off" +QB_CPU_KVM:x86-64 = "-cpu IvyBridge -machine q35,i8042=off" QB_AUDIO_DRV = "alsa" QB_AUDIO_OPT = "-device AC97" diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf index d355375f13c..14873a3b4f2 100644 --- a/meta/conf/machine/qemux86-64.conf +++ b/meta/conf/machine/qemux86-64.conf @@ -9,7 +9,7 @@ PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" PREFERRED_PROVIDER_virtual/libgles3 ?= "mesa" require conf/machine/include/qemu.inc -DEFAULTTUNE ?= "x86-64-v3" +DEFAULTTUNE ?= "core2-64" require conf/machine/include/x86/tune-x86-64-v3.inc require conf/machine/include/x86/qemuboot-x86.inc
Effectively revert "qemux86-64: build for x86-64-v3 (2013 Haswell and later) rather than Core 2 from 2006" (commit 6f2af1e5d1537b4d31e14946292bf58f0fd76fc9) Much as I'd love us to use the latest tuning, we do have some autobuilder hardware which isn't ready for this yet which breaks KVM and some qemu user mode usage as there appear to be TCG bugs too. I suspect we're not the only ones with such hardware. Drop the tune back to core2-64, anyone can easily customise it themselves if they need it. We can revisit this in a year or two as we should be ready then. It has beena good test of the rest of the support which all seems ready. I'd have preferred to use corei7-64 but that causes runqemu.RunqemuTests.test_boot_machine_iso to hang. Leave the newer tune file inclusion so people can change tunes more easily. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> --- meta/conf/machine/include/x86/qemuboot-x86.inc | 4 ++-- meta/conf/machine/qemux86-64.conf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)