summaryrefslogtreecommitdiffstats
path: root/scripts/runqemu
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-02 11:36:53 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-02 17:24:39 +0000
commitd18003726f561bab2ab07acf16baee074da37cdc (patch)
treef0d3433aaf460545a3bf082601fe184f3d652a59 /scripts/runqemu
parente8e6dbbe9a2f1119e713dd3b72aa740f81a89617 (diff)
downloadpoky-d18003726f561bab2ab07acf16baee074da37cdc.tar.gz
runqemu: Add workaround for APIC hang on pre 4.15 kernels on qemux86
On pre 4.15 host kernels, an APIC window emulation bug can cause qemu to hang. On 64 bit we can use the x2apic, for 32 bit, we just have to disable the other timer sources and rely on kvm-clock. [YOCTO #12301] (From OE-Core rev: 82e67b82ea8e12aa0b7b9db1d84fec0436dec71b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/runqemu')
-rwxr-xr-xscripts/runqemu5
1 files changed, 5 insertions, 0 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index f2b4b3c09d..d998494063 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -510,6 +510,11 @@ class BaseConfig(object):
510 510
511 if os.access(dev_kvm, os.W_OK|os.R_OK): 511 if os.access(dev_kvm, os.W_OK|os.R_OK):
512 self.qemu_opt_script += ' -enable-kvm' 512 self.qemu_opt_script += ' -enable-kvm'
513 if self.get('MACHINE') == "qemux86":
514 # Workaround for broken APIC window on pre 4.15 host kernels which causes boot hangs
515 # See YOCTO #12301
516 # On 64 bit we use x2apic
517 self.kernel_cmdline_script += " clocksource=kvm-clock hpet=disable noapic nolapic"
513 else: 518 else:
514 logger.error("You have no read or write permission on /dev/kvm.") 519 logger.error("You have no read or write permission on /dev/kvm.")
515 logger.error("Please change the ownership of this file as described at:") 520 logger.error("Please change the ownership of this file as described at:")