From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 29 Mar 2023 03:04:36 +0000 (-0700)
Subject: Revert "runqemu: Add workaround for APIC hang on pre 4.15 kernels on qemux86"
X-Git-Tag: yocto-4.1.4~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3479caf1eb1a67c53722ca774bfd94145b3669b5;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git

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 <x> option
is used, qemu always starts with single core.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit fa8a7c0608fc800c48d0ff1cd832ad63c51eeab1)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---

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:")