summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2023-03-28 20:04:36 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-03-30 23:26:04 +0100
commit17c6c0d650a8302d54d507f3a8978a547faaa2d2 (patch)
treed2f2ea5bca23a7c336aaf6e6ce7844da049350f1 /scripts
parent6815f716927477988d2ca2111c74285dcc15c053 (diff)
downloadpoky-17c6c0d650a8302d54d507f3a8978a547faaa2d2.tar.gz
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. (From OE-Core rev: fa8a7c0608fc800c48d0ff1cd832ad63c51eeab1) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/runqemu5
1 files changed, 0 insertions, 5 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index 61a7f1820a..09b0ad5ed5 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -584,11 +584,6 @@ to your build configuration.
584 584
585 if os.access(dev_kvm, os.W_OK|os.R_OK): 585 if os.access(dev_kvm, os.W_OK|os.R_OK):
586 self.qemu_opt_script += ' -enable-kvm' 586 self.qemu_opt_script += ' -enable-kvm'
587 if self.get('MACHINE') == "qemux86":
588 # Workaround for broken APIC window on pre 4.15 host kernels which causes boot hangs
589 # See YOCTO #12301
590 # On 64 bit we use x2apic
591 self.kernel_cmdline_script += " clocksource=kvm-clock hpet=disable noapic nolapic"
592 else: 587 else:
593 logger.error("You have no read or write permission on /dev/kvm.") 588 logger.error("You have no read or write permission on /dev/kvm.")
594 logger.error("Please change the ownership of this file as described at:") 589 logger.error("Please change the ownership of this file as described at:")