From: Petr Štetiar <ynezz@true.cz>
Date: Thu, 28 Mar 2019 20:51:34 +0000 (+0000)
Subject: scripts/qemustart: Allow specifying custom kernel for x86
X-Git-Tag: v19.07.0-rc1~808
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b0e5e32daa283c2686f529d57360fda828c758bb;p=openwrt%2Fstaging%2Fchunkeey.git

scripts/qemustart: Allow specifying custom kernel for x86

Currently it's not possible to test boot squashfs root images, so this
patch now allows this use case as well.

Cc: Yousong Zhou <yszhou4tech@gmail.com>
Signed-off-by: Petr Štetiar <ynezz@true.cz>
---

diff --git a/scripts/qemustart b/scripts/qemustart
index 3b479860e9..2012d43a85 100755
--- a/scripts/qemustart
+++ b/scripts/qemustart
@@ -233,9 +233,10 @@ start_qemu_malta() {
 }
 
 start_qemu_x86() {
+	local qemu_exe
+	local kernel="$o_kernel"
 	local rootfs="$o_rootfs"
 	local mach="${o_mach:-pc}"
-	local qemu_exe
 
 	[ -n "$rootfs" ] || {
 		rootfs="$o_bindir/openwrt-$o_target-${o_subtarget%-*}-combined-ext4.img"
@@ -257,6 +258,13 @@ start_qemu_x86() {
 			;;
 	esac
 
+	[ -n "$kernel" ] && {
+	    o_qemu_extra+=( \
+		"-kernel" "$kernel" \
+		"-append" "root=/dev/vda console=ttyS0 rootwait" \
+	    )
+	}
+
 	[ -n $o_nonetwork ] || {
 		o_qemu_extra+=( \
 			"-netdev" "bridge,id=lan,br=$BR_LAN,helper=$HELPER" \