diff mbox series

Revert "qemux86-64: Reduce tuning to core2-64"

Message ID 20250811081510.2777752-1-ecordonnier@snap.com
State New
Headers show
Series Revert "qemux86-64: Reduce tuning to core2-64" | expand

Commit Message

Etienne Cordonnier Aug. 11, 2025, 8:15 a.m. UTC 
From: Etienne Cordonnier <ecordonnier@snap.com>

This reverts commit 3d67b6c60fa968cd36b51c63e2a7f11bb87dd315 which mentions "We can revisit this in a year or two
as we should be ready then.".

Reverting this commit allows perfetto to work out of the box with qemux86-64. At the moment perfetto prints this error on qemux86-64:
```
root@qemux86-64:~# tracebox --txt -c /tmp/config.pbtxt -o /tmp/perfetto-trace.pb
This executable requires a x86_64 cpu that supports SSE4.2, BMI2 and AVX2.
Rebuild with enable_perfetto_x64_cpu_opt=false.
```
---
 meta/conf/machine/include/x86/qemuboot-x86.inc | 4 ++--
 meta/conf/machine/qemux86-64.conf              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/meta/conf/machine/include/x86/qemuboot-x86.inc b/meta/conf/machine/include/x86/qemuboot-x86.inc
index 6ae03633aea..82ef4a0b732 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 62108b703b6..8aac7634b75 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