summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2023-01-07 15:41:09 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-01-12 23:08:58 +0000
commitdca9b920e08b102b377d74f870f73d5f3f377394 (patch)
treef55e74f04fe013c6a6e07d62be716a716ffcb8d1 /meta/conf/machine
parentce466626929c131db1a507e7723f9a460c475ab4 (diff)
downloadpoky-dca9b920e08b102b377d74f870f73d5f3f377394.tar.gz
tune-x86-64-v3.inc: set QEMU_EXTRAOPTIONS like other tune-* files
* use Skylake-Client to match QB_CPU_KVM as changed in: https://git.openembedded.org/openembedded-core/commit/?id=6f2af1e5d1537b4d31e14946292bf58f0fd76fc9 * explicitly set -cpu instead of letting qemu to choose based on host cpu * check=false is still useful as e.g. on on AMD Threadripper 3970X: orc/0.4.33-r0 $ PSEUDO_UNLOAD=1 qemu-x86_64 -r 3.2.0 -cpu Skylake-Client -L recipe-sysroot -E LD_LIBRARY_PATH=recipe-sysroot//usr/lib:recipe-sysroot//lib orc/0.4.33-r0/build/meson-private/sanitycheckc_cross.exe qemu-x86_64: warning: TCG doesn't support requested feature: CPUID.01H:ECX.pcid [bit 17] qemu-x86_64: warning: TCG doesn't support requested feature: CPUID.01H:ECX.x2apic [bit 21] qemu-x86_64: warning: TCG doesn't support requested feature: CPUID.01H:ECX.tsc-deadline [bit 24] qemu-x86_64: warning: TCG doesn't support requested feature: CPUID.07H:EBX.hle [bit 4] qemu-x86_64: warning: TCG doesn't support requested feature: CPUID.07H:EBX.invpcid [bit 10] qemu-x86_64: warning: TCG doesn't support requested feature: CPUID.07H:EBX.rtm [bit 11] qemu-x86_64: warning: TCG doesn't support requested feature: CPUID.07H:EBX.rdseed [bit 18] qemu-x86_64: warning: TCG doesn't support requested feature: CPUID.80000001H:ECX.3dnowprefetch [bit 8] qemu-x86_64: warning: TCG doesn't support requested feature: CPUID.0DH:EAX.xsavec [bit 1] * if this still doesn't work for you on your host, you might need to downgrade DEFAULTTUNE to e.g. corei7-64 (all all the way back to core2-64), for more details see: https://www.openembedded.org/pipermail/openembedded-core/2018-April/150178.html * the leading space shouldn't be needed, I've kept it for consistency with other QEMU_EXTRAOPTIONS (From OE-Core rev: d1a52559670921389a66a4c26d37481d6611042a) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/machine')
-rw-r--r--meta/conf/machine/include/x86/tune-x86-64-v3.inc2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/conf/machine/include/x86/tune-x86-64-v3.inc b/meta/conf/machine/include/x86/tune-x86-64-v3.inc
index 267c12ff50..254f03c590 100644
--- a/meta/conf/machine/include/x86/tune-x86-64-v3.inc
+++ b/meta/conf/machine/include/x86/tune-x86-64-v3.inc
@@ -21,9 +21,11 @@ TUNE_FEATURES:tune-x86-64-v3 = "${TUNE_FEATURES:tune-x86-64} x86-64-v3"
21BASE_LIB:tune-x86-64-v3 = "lib64" 21BASE_LIB:tune-x86-64-v3 = "lib64"
22TUNE_PKGARCH:tune-x86-64-v3 = "x86-64-v3" 22TUNE_PKGARCH:tune-x86-64-v3 = "x86-64-v3"
23PACKAGE_EXTRA_ARCHS:tune-x86-64-v3 = "${PACKAGE_EXTRA_ARCHS:tune-corei7-64} x86-64-v3" 23PACKAGE_EXTRA_ARCHS:tune-x86-64-v3 = "${PACKAGE_EXTRA_ARCHS:tune-corei7-64} x86-64-v3"
24QEMU_EXTRAOPTIONS_x86-64-v3 = " -cpu Skylake-Client,check=false"
24 25
25AVAILTUNES += "x86-64-v3-x32" 26AVAILTUNES += "x86-64-v3-x32"
26TUNE_FEATURES:tune-x86-64-v3-x32 = "${TUNE_FEATURES:tune-x86-64-x32} x86-64-v3" 27TUNE_FEATURES:tune-x86-64-v3-x32 = "${TUNE_FEATURES:tune-x86-64-x32} x86-64-v3"
27BASE_LIB:tune-x86-64-v3-x32 = "libx32" 28BASE_LIB:tune-x86-64-v3-x32 = "libx32"
28TUNE_PKGARCH:tune-x86-64-v3-x32 = "x86-64-v3-x32" 29TUNE_PKGARCH:tune-x86-64-v3-x32 = "x86-64-v3-x32"
29PACKAGE_EXTRA_ARCHS:tune-x86-64-v3-x32 = "${PACKAGE_EXTRA_ARCHS:tune-corei7-64-x32} x86-64-v3-x32" 30PACKAGE_EXTRA_ARCHS:tune-x86-64-v3-x32 = "${PACKAGE_EXTRA_ARCHS:tune-corei7-64-x32} x86-64-v3-x32"
31QEMU_EXTRAOPTIONS_x86-64-v3-x32 = " -cpu Skylake-Client,check=false"