diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-01-11 10:59:20 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-01-11 11:03:34 +0000 |
| commit | 3d67b6c60fa968cd36b51c63e2a7f11bb87dd315 (patch) | |
| tree | 588e323c5ff6b5f6eec040e93f31695e679a9551 /meta/conf/machine | |
| parent | 4595a8bc621a5912285d26894de4fd4bd03a1bee (diff) | |
| download | poky-3d67b6c60fa968cd36b51c63e2a7f11bb87dd315.tar.gz | |
qemux86-64: Reduce tuning to core2-64
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.
(From OE-Core rev: 369b1dfa28b1791d45f068acc765190defecd460)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/machine')
| -rw-r--r-- | meta/conf/machine/include/x86/qemuboot-x86.inc | 4 | ||||
| -rw-r--r-- | meta/conf/machine/qemux86-64.conf | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/conf/machine/include/x86/qemuboot-x86.inc b/meta/conf/machine/include/x86/qemuboot-x86.inc index 31db1b2a61..3953679366 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" | |||
| 4 | QB_CPU:x86 = "-cpu IvyBridge -machine q35,i8042=off" | 4 | QB_CPU:x86 = "-cpu IvyBridge -machine q35,i8042=off" |
| 5 | QB_CPU_KVM:x86 = "-cpu IvyBridge -machine q35,i8042=off" | 5 | QB_CPU_KVM:x86 = "-cpu IvyBridge -machine q35,i8042=off" |
| 6 | 6 | ||
| 7 | QB_CPU:x86-64 = "-cpu Skylake-Client -machine q35,i8042=off" | 7 | QB_CPU:x86-64 = "-cpu IvyBridge -machine q35,i8042=off" |
| 8 | QB_CPU_KVM:x86-64 = "-cpu Skylake-Client -machine q35,i8042=off" | 8 | QB_CPU_KVM:x86-64 = "-cpu IvyBridge -machine q35,i8042=off" |
| 9 | 9 | ||
| 10 | QB_AUDIO_DRV = "alsa" | 10 | QB_AUDIO_DRV = "alsa" |
| 11 | QB_AUDIO_OPT = "-device AC97" | 11 | QB_AUDIO_OPT = "-device AC97" |
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf index d355375f13..14873a3b4f 100644 --- a/meta/conf/machine/qemux86-64.conf +++ b/meta/conf/machine/qemux86-64.conf | |||
| @@ -9,7 +9,7 @@ PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" | |||
| 9 | PREFERRED_PROVIDER_virtual/libgles3 ?= "mesa" | 9 | PREFERRED_PROVIDER_virtual/libgles3 ?= "mesa" |
| 10 | 10 | ||
| 11 | require conf/machine/include/qemu.inc | 11 | require conf/machine/include/qemu.inc |
| 12 | DEFAULTTUNE ?= "x86-64-v3" | 12 | DEFAULTTUNE ?= "core2-64" |
| 13 | require conf/machine/include/x86/tune-x86-64-v3.inc | 13 | require conf/machine/include/x86/tune-x86-64-v3.inc |
| 14 | require conf/machine/include/x86/qemuboot-x86.inc | 14 | require conf/machine/include/x86/qemuboot-x86.inc |
| 15 | 15 | ||