summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xscripts/runqemu6
-rwxr-xr-xscripts/runqemu-internal7
2 files changed, 13 insertions, 0 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index 188eccf003..c20c8dd3a6 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -27,6 +27,7 @@ usage() {
27 echo " ROOTFS - the rootfs image file or nfsroot directory to use" 27 echo " ROOTFS - the rootfs image file or nfsroot directory to use"
28 echo " MACHINE - the machine name (optional, autodetected from KERNEL filename if unspecified)" 28 echo " MACHINE - the machine name (optional, autodetected from KERNEL filename if unspecified)"
29 echo " RAMFS - boot a ramfs-based image" 29 echo " RAMFS - boot a ramfs-based image"
30 echo " ISO - boot an ISO image"
30 echo " VM - boot a vmdk image" 31 echo " VM - boot a vmdk image"
31 echo " Simplified QEMU command-line options can be passed with:" 32 echo " Simplified QEMU command-line options can be passed with:"
32 echo " nographic - disables video console" 33 echo " nographic - disables video console"
@@ -40,6 +41,7 @@ usage() {
40 echo " $MYNAME qemux86-64 core-image-sato ext3" 41 echo " $MYNAME qemux86-64 core-image-sato ext3"
41 echo " $MYNAME path/to/bzImage-qemux86.bin path/to/nfsrootdir/ serial" 42 echo " $MYNAME path/to/bzImage-qemux86.bin path/to/nfsrootdir/ serial"
42 echo " $MYNAME qemux86 ramfs" 43 echo " $MYNAME qemux86 ramfs"
44 echo " $MYNAME qemux86 iso"
43 echo " $MYNAME qemux86 qemuparams=\"-m 256\"" 45 echo " $MYNAME qemux86 qemuparams=\"-m 256\""
44 echo " $MYNAME qemux86 bootparams=\"psplash=false\"" 46 echo " $MYNAME qemux86 bootparams=\"psplash=false\""
45 echo " $MYNAME path/to/<image>-<machine>.vmdk" 47 echo " $MYNAME path/to/<image>-<machine>.vmdk"
@@ -132,6 +134,10 @@ while true; do
132 FSTYPE=cpio.gz 134 FSTYPE=cpio.gz
133 RAMFS=true 135 RAMFS=true
134 ;; 136 ;;
137 "iso")
138 FSTYPE=iso
139 ISOFS=true
140 ;;
135 "nographic") 141 "nographic")
136 SCRIPT_QEMU_OPT="$SCRIPT_QEMU_OPT -nographic" 142 SCRIPT_QEMU_OPT="$SCRIPT_QEMU_OPT -nographic"
137 SCRIPT_KERNEL_OPT="$SCRIPT_KERNEL_OPT console=ttyS0" 143 SCRIPT_KERNEL_OPT="$SCRIPT_KERNEL_OPT console=ttyS0"
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index 9d570ed9c6..0e3dad0e13 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -475,6 +475,10 @@ if [ "x$RAMFS" = "xtrue" ]; then
475 KERNCMDLINE="root=/dev/ram0 debugshell" 475 KERNCMDLINE="root=/dev/ram0 debugshell"
476fi 476fi
477 477
478if [ "x$ISOFS" = "xtrue" ]; then
479 QEMUOPTIONS="-cdrom $ROOTFS"
480fi
481
478if [ "x$QEMUOPTIONS" = "x" ]; then 482if [ "x$QEMUOPTIONS" = "x" ]; then
479 echo "Error: Unable to support this combination of options" 483 echo "Error: Unable to support this combination of options"
480 cleanup 484 cleanup
@@ -577,6 +581,9 @@ echo "Running $QEMU..."
577if [ "$FSTYPE" = "vmdk" ]; then 581if [ "$FSTYPE" = "vmdk" ]; then
578 echo $QEMUBIN $VM $QEMUOPTIONS $SERIALOPTS -no-reboot $SCRIPT_QEMU_OPT $SCRIPT_QEMU_EXTRA_OPT 582 echo $QEMUBIN $VM $QEMUOPTIONS $SERIALOPTS -no-reboot $SCRIPT_QEMU_OPT $SCRIPT_QEMU_EXTRA_OPT
579 LD_PRELOAD="$GL_LD_PRELOAD" $QEMUBIN $VM $QEMUOPTIONS $SERIALOPTS -no-reboot $SCRIPT_QEMU_OPT $SCRIPT_QEMU_EXTRA_OPT 583 LD_PRELOAD="$GL_LD_PRELOAD" $QEMUBIN $VM $QEMUOPTIONS $SERIALOPTS -no-reboot $SCRIPT_QEMU_OPT $SCRIPT_QEMU_EXTRA_OPT
584elif [ "$FSTYPE" = "iso" ]; then
585 echo $QEMUBIN $QEMUOPTIONS $SERIALOPTS -no-reboot $SCRIPT_QEMU_OPT $SCRIPT_QEMU_EXTRA_OPT
586 LD_PRELOAD="$GL_LD_PRELOAD" $QEMUBIN $QEMUOPTIONS $SERIALOPTS -no-reboot $SCRIPT_QEMU_OPT $SCRIPT_QEMU_EXTRA_OPT
580else 587else
581 echo $QEMUBIN -kernel $KERNEL $QEMUOPTIONS $SERIALOPTS -no-reboot $SCRIPT_QEMU_OPT $SCRIPT_QEMU_EXTRA_OPT --append '"'$KERNCMDLINE $SCRIPT_KERNEL_OPT'"' 588 echo $QEMUBIN -kernel $KERNEL $QEMUOPTIONS $SERIALOPTS -no-reboot $SCRIPT_QEMU_OPT $SCRIPT_QEMU_EXTRA_OPT --append '"'$KERNCMDLINE $SCRIPT_KERNEL_OPT'"'
582 LD_PRELOAD="$GL_LD_PRELOAD" $QEMUBIN -kernel $KERNEL $QEMUOPTIONS $SERIALOPTS -no-reboot $SCRIPT_QEMU_OPT $SCRIPT_QEMU_EXTRA_OPT --append "$KERNCMDLINE $SCRIPT_KERNEL_OPT" 589 LD_PRELOAD="$GL_LD_PRELOAD" $QEMUBIN -kernel $KERNEL $QEMUOPTIONS $SERIALOPTS -no-reboot $SCRIPT_QEMU_OPT $SCRIPT_QEMU_EXTRA_OPT --append "$KERNCMDLINE $SCRIPT_KERNEL_OPT"