From 3479caf1eb1a67c53722ca774bfd94145b3669b5 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 28 Mar 2023 20:04:36 -0700 Subject: [PATCH] Revert "runqemu: Add workaround for APIC hang on pre 4.15 kernels on qemux86" This reverts commit 82e67b82ea8e12aa0b7b9db1d84fec0436dec71b. It was commited as part of https://bugzilla.yoctoproject.org/show_bug.cgi?id=12301 for kernels < 4.15, as of now oldest builder kernel we have is 4.15 on ubuntu 18.04 so we should not require this workaround. Moreover, this fixes an smp problem with qemux86 where no matter what -smp option is used, qemu always starts with single core. Signed-off-by: Khem Raj Signed-off-by: Alexandre Belloni (cherry picked from commit fa8a7c0608fc800c48d0ff1cd832ad63c51eeab1) Signed-off-by: Steve Sakoman --- scripts/runqemu | 5 ----- 1 file changed, 5 deletions(-) diff --git a/scripts/runqemu b/scripts/runqemu index db35d83fa91..efc135e5359 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -591,11 +591,6 @@ 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:") -- 2.47.3