From 92e9b46f3ca316d18aa7de499a59c3d7f12c93d8 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 2 Jan 2018 11:36:53 +0000 Subject: 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: 04646ed7edf020b73c6639a1a7445252cf7aad5e) Signed-off-by: Richard Purdie (cherry picked from commit 82e67b82ea8e12aa0b7b9db1d84fec0436dec71b) Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- scripts/runqemu | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'scripts/runqemu') diff --git a/scripts/runqemu b/scripts/runqemu index 0b6daf2cf2..0ed1eec2d3 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -508,6 +508,11 @@ class BaseConfig(object): if os.access(dev_kvm, os.W_OK|os.R_OK): self.qemu_opt_script += ' -enable-kvm' + if self.get('MACHINE') == "qemux86": + # Workaround for broken APIC window on pre 4.15 host kernels which causes boot hangs + # See YOCTO #12301 + # On 64 bit we use x2apic + self.kernel_cmdline_script += " clocksource=kvm-clock hpet=disable noapic nolapic" else: logger.error("You have no read or write permission on /dev/kvm.") logger.error("Please change the ownership of this file as described at:") -- cgit v1.2.3-54-g00ecf