mvebu: move HARDEN_BRANCH_PREDICTOR to common config

[openwrt/openwrt.git] / scripts / qemustart

diff --git a/scripts/qemustart b/scripts/qemustart
index 6c2254e3aff9ccd90733b4bf8fa09b45724d9d7a..5bb8ca5f3a353b6b45b23bc16decc510e765765f 100755 (executable)
--- a/scripts/qemustart
+++ b/scripts/qemustart
@@ -113,10 +113,11 @@ EOF
 }
 
 rand_mac() {
-       hexdump -n 3 -e '"52:54:00:" 2/1 "%02x:" 1/1 "%02x"' /dev/urandom
+       hexdump -n 3 -e '"52:54:00" 3/1 ":%02x"' /dev/urandom
 }
 
 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
                                ;;
@@ -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 \