From: Maxim Baryshnikov <barysmax@fel.cvut.cz>
Date: Mon, 22 Feb 2016 23:29:42 +0000 (+0100)
Subject: os_launch: "nohpet" option was prepended to kernel opts.
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/jailhouse-test.git/commitdiff_plain/f78a175fd05186c945f72261bc0054002ee8b9ec?hp=a715dd3462a5efa1163033dabe99acf1361a21ce

os_launch: "nohpet" option was prepended to kernel opts.
---

diff --git a/buildroot-os/buildroot.sh b/buildroot-os/buildroot.sh
index 666d2e2..5e96682 100755
--- a/buildroot-os/buildroot.sh
+++ b/buildroot-os/buildroot.sh
@@ -12,9 +12,9 @@ else
 	RFSIMG="$2"
 fi
 echo RFSIMG="$RFSIMG"
-qemu-system-x86_64 -machine q35 -m 1G -enable-kvm -smp 4\
+qemu-system-x86_64 -machine q35 -m 1G -enable-kvm -smp 4 \
 	-cpu host,-kvm_pv_eoi,-kvm_steal_time,-kvm_asyncpf,-kvmclock,+svm,+x2apic \
-	-kernel "$KIMG" -append "root=/dev/sda memmap=66M$0x3b000000" \
+	-kernel "$KIMG" -append "root=/dev/sda memmap=66M$0x3b000000 nohpet" \
 	-drive file="$RFSIMG",format=raw,id=disk,if=none \
         -device ide-hd,drive=disk -serial stdio	-serial vc \
         -device intel-hda,addr=1b.0 -device hda-duplex