summaryrefslogtreecommitdiffstats
path: root/scripts/runqemu-internal
diff options
context:
space:
mode:
authorCristian Iorga <cristian.iorga@intel.com>2015-06-29 18:03:11 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-02 23:08:39 +0100
commit7e074c3641f0b44317b036dc979dac5e71a5ba9d (patch)
tree02c07606bb4b02897bf73a8c7b3f508f059cb354 /scripts/runqemu-internal
parenta23d2730b84166464de257ffb7b562af72fc33d5 (diff)
downloadpoky-7e074c3641f0b44317b036dc979dac5e71a5ba9d.tar.gz
runqemu-internal: correctly set format for root FS as raw
qemu guesses via probing the format of root FS, but gives a warning and restricts write operations on block 0. Fix it by setting correctly the format as raw for more machines and non-KVM machines. In some cases, replaced the way machine disk is set for qemu. Fix for [YOCTO #7918] (From OE-Core rev: 6f7144ebe2da4c72ef58280e034b2cc75331a471) Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/runqemu-internal')
-rwxr-xr-xscripts/runqemu-internal12
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index 694815fb74..6878251635 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -127,7 +127,7 @@ if [ "$SLIRP_ENABLED" = "yes" ]; then
127 else 127 else
128 QEMU_NETWORK_CMD="" 128 QEMU_NETWORK_CMD=""
129 DROOT="/dev/hda" 129 DROOT="/dev/hda"
130 ROOTFS_OPTIONS="-hda $ROOTFS" 130 ROOTFS_OPTIONS="-drive file=$ROOTFS,if=ide,format=raw"
131 fi 131 fi
132 132
133else 133else
@@ -265,12 +265,12 @@ else
265 else 265 else
266 QEMU_NETWORK_CMD="-net nic,vlan=0 $QEMU_TAP_CMD" 266 QEMU_NETWORK_CMD="-net nic,vlan=0 $QEMU_TAP_CMD"
267 DROOT="/dev/hda" 267 DROOT="/dev/hda"
268 ROOTFS_OPTIONS="-hda $ROOTFS" 268 ROOTFS_OPTIONS="-drive file=$ROOTFS,if=ide,format=raw"
269 fi 269 fi
270 if [ "$MACHINE" = "qemuarm64" ]; then 270 if [ "$MACHINE" = "qemuarm64" ]; then
271 QEMU_NETWORK_CMD="-netdev tap,id=net0,ifname=$TAP,script=no,downscript=no -device virtio-net-device,netdev=net0 " 271 QEMU_NETWORK_CMD="-netdev tap,id=net0,ifname=$TAP,script=no,downscript=no -device virtio-net-device,netdev=net0 "
272 DROOT="/dev/vda" 272 DROOT="/dev/vda"
273 ROOTFS_OPTIONS="-drive id=disk0,file=$ROOTFS -device virtio-blk-device,drive=disk0" 273 ROOTFS_OPTIONS="-drive id=disk0,file=$ROOTFS,format=raw -device virtio-blk-device,drive=disk0"
274 fi 274 fi
275 275
276 KERNCMDLINE="mem=$QEMU_MEMORY" 276 KERNCMDLINE="mem=$QEMU_MEMORY"
@@ -357,7 +357,7 @@ if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "qemuarmv6" -o "$MACHINE" = "qemuarm
357 # QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -force-pointer" 357 # QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -force-pointer"
358 if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then 358 if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then
359 KERNCMDLINE="root=/dev/sda rw console=ttyAMA0,115200 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY highres=off" 359 KERNCMDLINE="root=/dev/sda rw console=ttyAMA0,115200 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY highres=off"
360 QEMUOPTIONS="$QEMU_NETWORK_CMD -M ${MACHINE_SUBTYPE} -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS" 360 QEMUOPTIONS="$QEMU_NETWORK_CMD -M ${MACHINE_SUBTYPE} -drive file=$ROOTFS,format=raw -no-reboot $QEMU_UI_OPTIONS"
361 fi 361 fi
362 if [ "$FSTYPE" = "nfs" ]; then 362 if [ "$FSTYPE" = "nfs" ]; then
363 if [ "$NFS_SERVER" = "192.168.7.1" -a ! -d "$NFS_DIR" ]; then 363 if [ "$NFS_SERVER" = "192.168.7.1" -a ! -d "$NFS_DIR" ]; then
@@ -501,7 +501,7 @@ if [ "$MACHINE" = "qemumips" -o "$MACHINE" = "qemumipsel" -o "$MACHINE" = "qemum
501 if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then 501 if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then
502 #KERNCMDLINE="root=/dev/hda console=ttyS0 console=tty0 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" 502 #KERNCMDLINE="root=/dev/hda console=ttyS0 console=tty0 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
503 KERNCMDLINE="root=/dev/hda rw console=ttyS0 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" 503 KERNCMDLINE="root=/dev/hda rw console=ttyS0 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
504 QEMUOPTIONS="$QEMU_NETWORK_CMD -M $MACHINE_SUBTYPE -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS" 504 QEMUOPTIONS="$QEMU_NETWORK_CMD -M $MACHINE_SUBTYPE -drive file=$ROOTFS,format=raw -no-reboot $QEMU_UI_OPTIONS"
505 fi 505 fi
506 if [ "$FSTYPE" = "nfs" ]; then 506 if [ "$FSTYPE" = "nfs" ]; then
507 if [ "$NFS_SERVER" = "192.168.7.1" -a ! -d "$NFS_DIR" ]; then 507 if [ "$NFS_SERVER" = "192.168.7.1" -a ! -d "$NFS_DIR" ]; then
@@ -526,7 +526,7 @@ if [ "$MACHINE" = "qemuppc" ]; then
526 fi 526 fi
527 if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then 527 if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then
528 KERNCMDLINE="root=/dev/hda rw console=ttyS0 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" 528 KERNCMDLINE="root=/dev/hda rw console=ttyS0 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
529 QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -M $MACHINE_SUBTYPE -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS" 529 QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -M $MACHINE_SUBTYPE -drive file=$ROOTFS,format=raw -no-reboot $QEMU_UI_OPTIONS"
530 fi 530 fi
531 if [ "$FSTYPE" = "nfs" ]; then 531 if [ "$FSTYPE" = "nfs" ]; then
532 if [ "$NFS_SERVER" = "192.168.7.1" -a ! -d "$NFS_DIR" ]; then 532 if [ "$NFS_SERVER" = "192.168.7.1" -a ! -d "$NFS_DIR" ]; then