summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Kelly <mkelly@xevo.com>2017-05-08 15:44:11 -0700
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2017-05-09 04:04:29 +0000
commitbccdc574dab0b6c45b000c0d3bb9643ad0f35a3e (patch)
treec2c83adc5120f084b979733ffadb9bde4c0d048e
parent35e565faa3b2038542b68b30449155e74df3f2d5 (diff)
x86_64-tune: fix KVM qemu options
When using runqemu with KVM enabled, qemuboot.conf uses QB_CPU_KVM_x86 and QB_CPU_KVM_x86-64 instead of QB_CPU_qemux86-64. Without this fix, the boot fails because the generic KVM CPUs don't support what Nehalem does. Change-Id: Ic7d160528c5aebfb835362f3ad3c2da2dc44c2c4 Signed-off-by: Martin Kelly <mkelly@xevo.com> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/9329 Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> ci-image-boot-test: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
-rw-r--r--meta-agl-distro/conf/distro/include/x86_64-tune.inc2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta-agl-distro/conf/distro/include/x86_64-tune.inc b/meta-agl-distro/conf/distro/include/x86_64-tune.inc
index f1ce97938..9130173fa 100644
--- a/meta-agl-distro/conf/distro/include/x86_64-tune.inc
+++ b/meta-agl-distro/conf/distro/include/x86_64-tune.inc
@@ -51,4 +51,6 @@ TUNE_PKGARCH_tune-qemux86-64 = "corei7-64"
PACKAGE_EXTRA_ARCHS_tune-qemux86-64 = "${PACKAGE_EXTRA_ARCHS_tune-core2-64} corei7-64"
QEMU_EXTRAOPTIONS_qemux86-64 = " -cpu Nehalem,check=false"
QB_CPU_qemux86-64 = " -cpu Nehalem,check=false"
+QB_CPU_KVM_x86 = "-cpu Nehalem,check=false"
+QB_CPU_KVM_x86-64 = "-cpu Nehalem,check=false"
QB_MACHINE_qemux86-64 = "-machine q35"