From e620ace671e8d204636a5d74d4fda4fdd0e5e6d8 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 10 Aug 2025 11:07:09 +0100 Subject: [PATCH] Revert "qemux86-64: Reduce tuning to core2-64" This was originally applied as our autobuilder had older hardware and couldn't cope with the newer settings. This has been resolved in the new cluster so we can go back to the newer tuning, which software is now more likely to need. This reverts commit 369b1dfa28b1791d45f068acc765190defecd460. (From OE-Core rev: c9585bb8689b6089ce3870910b2dbdb7e9aa547a) Signed-off-by: Richard Purdie --- meta/conf/machine/include/x86/qemuboot-x86.inc | 4 ++-- 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 6ae03633ae..82ef4a0b73 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 IvyBridge -machine q35,i8042=off" -QB_CPU_KVM:x86-64 ?= "-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_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 62108b703b..8aac7634b7 100644 --- a/meta/conf/machine/qemux86-64.conf +++ b/meta/conf/machine/qemux86-64.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for running an x86-64 system on QEMU require conf/machine/include/qemu.inc -DEFAULTTUNE ?= "core2-64" +DEFAULTTUNE ?= "x86-64-v3" require conf/machine/include/x86/tune-x86-64-v3.inc require conf/machine/include/x86/qemuboot-x86.inc