X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=scripts%2Fqemustart;h=5af93b9aedb3133b7b640c483b31cff4650b763a;hp=5cadd7d6a8198eaab38784e5e410ad56abf6a3c8;hb=d2f7dba309857014c8f414463c6fd7636b4ad4b9;hpb=50fcfd4b654999a1cca71d593000e3775cf2d740

diff --git a/scripts/qemustart b/scripts/qemustart
index 5cadd7d6a8..5af93b9aed 100755
--- a/scripts/qemustart
+++ b/scripts/qemustart
@@ -107,8 +107,8 @@ Examples
   $SELF malta le64
   $SELF malta be-glibc
   $SELF armvirt 32 \\
-                --kernel bin/targets/armvirt/32/lede-armvirt-32-zImage \\
-                --rootfs bin/targets/armvirt/32/lede-armvirt-32-root.ext4
+                --kernel bin/targets/armvirt/32/openwrt-armvirt-32-zImage \\
+                --rootfs bin/targets/armvirt/32/openwrt-armvirt-32-root.ext4
 EOF
 }
 
@@ -117,6 +117,7 @@ rand_mac() {
 }
 
 parse_args() {
+	o_qemu_extra=()
 	while [ "$#" -gt 0 ]; do
 		case "$1" in
 			--kernel) o_kernel="$2"; shift 2 ;;
@@ -131,7 +132,7 @@ parse_args() {
 				elif [ -z "$o_subtarget" ]; then
 					o_subtarget="$1"
 				else
-					o_qemu_extra=("${o_qemu_extra[@]}" "$1")
+					o_qemu_extra+=("$1")
 				fi
 				shift
 				;;
@@ -158,12 +159,12 @@ start_qemu_armvirt() {
 		32)
 			qemu_exe="qemu-system-arm"
 			cpu="cortex-a15"
-			[ -n "$kernel" ] || kernel="$o_bindir/lede-$o_target-${o_subtarget%-*}-zImage-initramfs"
+			[ -n "$kernel" ] || kernel="$o_bindir/openwrt-$o_target-${o_subtarget%-*}-zImage-initramfs"
 			;;
 		64)
 			qemu_exe="qemu-system-aarch64"
 			cpu="cortex-a57"
-			[ -n "$kernel" ] || kernel="$o_bindir/lede-$o_target-${o_subtarget%-*}-Image-initramfs"
+			[ -n "$kernel" ] || kernel="$o_bindir/openwrt-$o_target-${o_subtarget%-*}-Image-initramfs"
 			;;
 		*)
 			__errmsg "target $o_target: unknown subtarget $o_subtarget"
@@ -174,11 +175,10 @@ start_qemu_armvirt() {
 		if [ ! -f "$rootfs" -a -s "$rootfs.gz" ]; then
 			gunzip "$rootfs.gz"
 		fi
-		o_qemu_extra=( \
+		o_qemu_extra+=( \
 			"-drive" "file=$rootfs,format=raw,if=virtio" \
 			"-append" "root=/dev/vda rootwait" \
-			"${o_qemu_extra[@]}" \
-		 )
+		)
 	}
 
 	"$qemu_exe" -machine virt -cpu "$cpu" -nographic \
@@ -199,7 +199,7 @@ start_qemu_malta() {
 	[ "$(echo "$o_subtarget" | grep -o '^..')" = "le" ] && isel="el"
 	qemu_exe="qemu-system-mips$is64$isel"
 
-	[ -n "$kernel" ] || kernel="$o_bindir/lede-malta-${o_subtarget%-*}-vmlinux-initramfs.elf"
+	[ -n "$kernel" ] || kernel="$o_bindir/openwrt-malta-${o_subtarget%-*}-vmlinux-initramfs.elf"
 
 	# NOTE: order of wan, lan -device arguments matters as it will affect which
 	# one will be actually used as the wan, lan network interface inside the
@@ -216,7 +216,7 @@ start_qemu_x86() {
 	local qemu_exe
 
 	[ -n "$rootfs" ] || {
-		rootfs="$o_bindir/lede-$o_target-${o_subtarget%-*}-combined-ext4.img"
+		rootfs="$o_bindir/openwrt-$o_target-${o_subtarget%-*}-combined-ext4.img"
 		if [ ! -f "$rootfs" -a -s "$rootfs.gz" ]; then
 			gunzip "$rootfs.gz"
 		fi