summaryrefslogtreecommitdiffstats
path: root/scripts/runqemu-internal
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/runqemu-internal')
-rwxr-xr-xscripts/runqemu-internal10
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index 0c00d8f9cb..89a1e1ba27 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -300,13 +300,13 @@ case "$MACHINE" in
300 ;; 300 ;;
301esac 301esac
302 302
303if [ ! -f "$KERNEL" -a "x$FSTYPE" != "xvmdk" -a "x$FSTYPE" != "xhddimg" -a "x$FSTYPE" != "xhdddirect" -a "x$FSTYPE" != "xwic" ]; then 303if [ ! -f "$KERNEL" -a "$IS_VM" = "false" ]; then
304 echo "Error: Kernel image file $KERNEL doesn't exist" 304 echo "Error: Kernel image file $KERNEL doesn't exist"
305 cleanup 305 cleanup
306 return 1 306 return 1
307fi 307fi
308 308
309if [ "$FSTYPE" != "nfs" -a "$FSTYPE" != "vmdk" -a "$FSTYPE" != "hddimg" -a "$FSTYPE" != "hdddirect" -a ! -f "$ROOTFS" ]; then 309if [ "$FSTYPE" != "nfs" -a "$IS_VM" = "false" -a ! -f "$ROOTFS" ]; then
310 echo "Error: Image file $ROOTFS doesn't exist" 310 echo "Error: Image file $ROOTFS doesn't exist"
311 cleanup 311 cleanup
312 return 1 312 return 1
@@ -428,7 +428,7 @@ if [ "$MACHINE" = "qemux86" ]; then
428 KERNCMDLINE="root=/dev/nfs nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" 428 KERNCMDLINE="root=/dev/nfs nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
429 QEMUOPTIONS="$QEMU_NETWORK_CMD $QEMU_UI_OPTIONS" 429 QEMUOPTIONS="$QEMU_NETWORK_CMD $QEMU_UI_OPTIONS"
430 fi 430 fi
431 if [ "$FSTYPE" = "vmdk" -o "$FSTYPE" = "hddimg" -o "$FSTYPE" = "hdddirect" ]; then 431 if [ "$IS_VM" = "true" ]; then
432 QEMUOPTIONS="$QEMU_NETWORK_CMD $QEMU_UI_OPTIONS" 432 QEMUOPTIONS="$QEMU_NETWORK_CMD $QEMU_UI_OPTIONS"
433 fi 433 fi
434 # Currently oprofile's event based interrupt mode doesn't work(Bug #828) in 434 # Currently oprofile's event based interrupt mode doesn't work(Bug #828) in
@@ -464,7 +464,7 @@ if [ "$MACHINE" = "qemux86-64" ]; then
464 KERNCMDLINE="root=/dev/nfs nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" 464 KERNCMDLINE="root=/dev/nfs nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
465 QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE $QEMU_UI_OPTIONS" 465 QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE $QEMU_UI_OPTIONS"
466 fi 466 fi
467 if [ "$FSTYPE" = "vmdk" -o "$FSTYPE" = "hddimg" -o "$FSTYPE" = "hdddirect" ]; then 467 if [ "$IS_VM" = "true" ]; then
468 QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE $QEMU_UI_OPTIONS" 468 QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE $QEMU_UI_OPTIONS"
469 fi 469 fi
470 # Currently oprofile's event based interrupt mode doesn't work(Bug #828) in 470 # Currently oprofile's event based interrupt mode doesn't work(Bug #828) in
@@ -721,7 +721,7 @@ fi
721 721
722echo "Running $QEMU..." 722echo "Running $QEMU..."
723# -no-reboot is a mandatory option - see bug #100 723# -no-reboot is a mandatory option - see bug #100
724if [ "$FSTYPE" = "vmdk" -o "$FSTYPE" = "hddimg" -o "$FSTYPE" = "hdddirect" ]; then 724if [ "$IS_VM" = "true" ]; then
725 # Check root=/dev/sdX or root=/dev/vdX 725 # Check root=/dev/sdX or root=/dev/vdX
726 [ ! -e "$VM" ] && error "VM image is not found!" 726 [ ! -e "$VM" ] && error "VM image is not found!"
727 if grep -q 'root=/dev/sd' $VM; then 727 if grep -q 'root=/dev/sd' $VM; then