diff options
-rwxr-xr-x | scripts/runqemu-internal | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal index 078545e931..13840b3023 100755 --- a/scripts/runqemu-internal +++ b/scripts/runqemu-internal | |||
@@ -364,8 +364,18 @@ if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "qemuarmv6" -o "$MACHINE" = "qemuarm | |||
364 | QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS" | 364 | QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS" |
365 | # QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -force-pointer" | 365 | # QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -force-pointer" |
366 | if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then | 366 | if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then |
367 | KERNCMDLINE="root=/dev/sda rw console=ttyAMA0,115200 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY highres=off" | 367 | if [ "$MACHINE" = "qemuarm" ]; then |
368 | QEMUOPTIONS="$QEMU_NETWORK_CMD -M ${MACHINE_SUBTYPE} -drive file=$ROOTFS,format=raw -no-reboot $QEMU_UI_OPTIONS" | 368 | QEMU_NETWORK_CMD="-net nic,model=virtio $QEMU_TAP_CMD" |
369 | DROOT="/dev/vda" | ||
370 | ROOTFS_OPTIONS="-drive file=$ROOTFS,if=virtio,format=raw" | ||
371 | else | ||
372 | QEMU_NETWORK_CMD="-net nic,vlan=0 $QEMU_TAP_CMD" | ||
373 | DROOT="/dev/sda" | ||
374 | ROOTFS_OPTIONS="-drive file=$ROOTFS,format=raw" | ||
375 | fi | ||
376 | |||
377 | KERNCMDLINE="root=$DROOT rw console=ttyAMA0,115200 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY highres=off" | ||
378 | QEMUOPTIONS="$QEMU_NETWORK_CMD -M ${MACHINE_SUBTYPE} $ROOTFS_OPTIONS -no-reboot $QEMU_UI_OPTIONS" | ||
369 | fi | 379 | fi |
370 | if [ "$FSTYPE" = "nfs" ]; then | 380 | if [ "$FSTYPE" = "nfs" ]; then |
371 | if [ "$NFS_SERVER" = "192.168.7.1" -a ! -d "$NFS_DIR" ]; then | 381 | if [ "$NFS_SERVER" = "192.168.7.1" -a ! -d "$NFS_DIR" ]; then |