diff options
Diffstat (limited to 'scripts/runqemu-internal')
| -rwxr-xr-x | scripts/runqemu-internal | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal index a691a80a46..15272683b8 100755 --- a/scripts/runqemu-internal +++ b/scripts/runqemu-internal | |||
| @@ -315,13 +315,13 @@ case "$MACHINE" in | |||
| 315 | ;; | 315 | ;; |
| 316 | esac | 316 | esac |
| 317 | 317 | ||
| 318 | if [ ! -f "$KERNEL" -a "x$FSTYPE" != "xvmdk" ]; then | 318 | if [ ! -f "$KERNEL" -a "x$FSTYPE" != "xvmdk" -a "x$FSTYPE" != "xhddimg" -a "x$FSTYPE" != "xhdddirect" ]; then |
| 319 | echo "Error: Kernel image file $KERNEL doesn't exist" | 319 | echo "Error: Kernel image file $KERNEL doesn't exist" |
| 320 | cleanup | 320 | cleanup |
| 321 | return 1 | 321 | return 1 |
| 322 | fi | 322 | fi |
| 323 | 323 | ||
| 324 | if [ "$FSTYPE" != "nfs" -a "$FSTYPE" != "vmdk" -a ! -f "$ROOTFS" ]; then | 324 | if [ "$FSTYPE" != "nfs" -a "$FSTYPE" != "vmdk" -a "$FSTYPE" != "hddimg" -a "$FSTYPE" != "hdddirect" -a ! -f "$ROOTFS" ]; then |
| 325 | echo "Error: Image file $ROOTFS doesn't exist" | 325 | echo "Error: Image file $ROOTFS doesn't exist" |
| 326 | cleanup | 326 | cleanup |
| 327 | return 1 | 327 | return 1 |
| @@ -440,7 +440,7 @@ if [ "$MACHINE" = "qemux86" ]; then | |||
| 440 | KERNCMDLINE="root=/dev/nfs nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" | 440 | KERNCMDLINE="root=/dev/nfs nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" |
| 441 | QEMUOPTIONS="$QEMU_NETWORK_CMD $QEMU_UI_OPTIONS" | 441 | QEMUOPTIONS="$QEMU_NETWORK_CMD $QEMU_UI_OPTIONS" |
| 442 | fi | 442 | fi |
| 443 | if [ "$FSTYPE" = "vmdk" ]; then | 443 | if [ "$FSTYPE" = "vmdk" -o "$FSTYPE" = "hddimg" -o "$FSTYPE" = "hdddirect" ]; then |
| 444 | QEMUOPTIONS="$QEMU_NETWORK_CMD $QEMU_UI_OPTIONS" | 444 | QEMUOPTIONS="$QEMU_NETWORK_CMD $QEMU_UI_OPTIONS" |
| 445 | fi | 445 | fi |
| 446 | # Currently oprofile's event based interrupt mode doesn't work(Bug #828) in | 446 | # Currently oprofile's event based interrupt mode doesn't work(Bug #828) in |
| @@ -476,7 +476,7 @@ if [ "$MACHINE" = "qemux86-64" ]; then | |||
| 476 | KERNCMDLINE="root=/dev/nfs nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" | 476 | KERNCMDLINE="root=/dev/nfs nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" |
| 477 | QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE $QEMU_UI_OPTIONS" | 477 | QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE $QEMU_UI_OPTIONS" |
| 478 | fi | 478 | fi |
| 479 | if [ "$FSTYPE" = "vmdk" ]; then | 479 | if [ "$FSTYPE" = "vmdk" -o "$FSTYPE" = "hddimg" -o "$FSTYPE" = "hdddirect" ]; then |
| 480 | QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE $QEMU_UI_OPTIONS" | 480 | QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE $QEMU_UI_OPTIONS" |
| 481 | fi | 481 | fi |
| 482 | # Currently oprofile's event based interrupt mode doesn't work(Bug #828) in | 482 | # Currently oprofile's event based interrupt mode doesn't work(Bug #828) in |
| @@ -702,7 +702,7 @@ fi | |||
| 702 | 702 | ||
| 703 | echo "Running $QEMU..." | 703 | echo "Running $QEMU..." |
| 704 | # -no-reboot is a mandatory option - see bug #100 | 704 | # -no-reboot is a mandatory option - see bug #100 |
| 705 | if [ "$FSTYPE" = "vmdk" ]; then | 705 | if [ "$FSTYPE" = "vmdk" -o "$FSTYPE" = "hddimg" -o "$FSTYPE" = "hdddirect" ]; then |
| 706 | echo $QEMUBIN $VM $QEMUOPTIONS $SERIALOPTS -no-reboot $SCRIPT_QEMU_OPT $SCRIPT_QEMU_EXTRA_OPT | 706 | echo $QEMUBIN $VM $QEMUOPTIONS $SERIALOPTS -no-reboot $SCRIPT_QEMU_OPT $SCRIPT_QEMU_EXTRA_OPT |
| 707 | LD_PRELOAD="$GL_LD_PRELOAD" $QEMUBIN $VM $QEMUOPTIONS $SERIALOPTS -no-reboot $SCRIPT_QEMU_OPT $SCRIPT_QEMU_EXTRA_OPT | 707 | LD_PRELOAD="$GL_LD_PRELOAD" $QEMUBIN $VM $QEMUOPTIONS $SERIALOPTS -no-reboot $SCRIPT_QEMU_OPT $SCRIPT_QEMU_EXTRA_OPT |
| 708 | elif [ "$FSTYPE" = "iso" ]; then | 708 | elif [ "$FSTYPE" = "iso" ]; then |
