summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAníbal Limón <anibal.limon@linux.intel.com>2015-09-29 17:51:23 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-01 07:40:37 +0100
commitbbfb3cd06e0ff5661ef3732ebfffa74b94400cd9 (patch)
tree6fb3a0cda6f2cc759245c4aa29bac95fade1b7be
parent61240e9f7e40400d49a91a0f1f0446755bd17294 (diff)
downloadopenembedded-core-contrib-bbfb3cd06e0ff5661ef3732ebfffa74b94400cd9.tar.gz
openembedded-core-contrib-bbfb3cd06e0ff5661ef3732ebfffa74b94400cd9.tar.bz2
openembedded-core-contrib-bbfb3cd06e0ff5661ef3732ebfffa74b94400cd9.zip
runqemu-internal: qemuarm enable usage of virtio devices
We are experiencing occasional segfaults in scsi sym53c8xx driver on qemuarm boot. There are some old discussions into the mailing lists [1] about the scsi problem and seems to be isn't fixed. We use virtio blk/net devices into qemuarm64 also are supported into qemuarm so change to use it because virtio devices are the best choice. [YOCTO #8060] [1] https://bugzilla.yoctoproject.org/show_bug.cgi?id=8060#c10 Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/runqemu-internal14
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
QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS"
# QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -force-pointer"
if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then
- KERNCMDLINE="root=/dev/sda rw console=ttyAMA0,115200 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY highres=off"
- QEMUOPTIONS="$QEMU_NETWORK_CMD -M ${MACHINE_SUBTYPE} -drive file=$ROOTFS,format=raw -no-reboot $QEMU_UI_OPTIONS"
+ if [ "$MACHINE" = "qemuarm" ]; then
+ QEMU_NETWORK_CMD="-net nic,model=virtio $QEMU_TAP_CMD"
+ DROOT="/dev/vda"
+ ROOTFS_OPTIONS="-drive file=$ROOTFS,if=virtio,format=raw"
+ else
+ QEMU_NETWORK_CMD="-net nic,vlan=0 $QEMU_TAP_CMD"
+ DROOT="/dev/sda"
+ ROOTFS_OPTIONS="-drive file=$ROOTFS,format=raw"
+ fi
+
+ KERNCMDLINE="root=$DROOT rw console=ttyAMA0,115200 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY highres=off"
+ QEMUOPTIONS="$QEMU_NETWORK_CMD -M ${MACHINE_SUBTYPE} $ROOTFS_OPTIONS -no-reboot $QEMU_UI_OPTIONS"
fi
if [ "$FSTYPE" = "nfs" ]; then
if [ "$NFS_SERVER" = "192.168.7.1" -a ! -d "$NFS_DIR" ]; then