summaryrefslogtreecommitdiffstats
path: root/scripts/runqemu-internal
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-22 10:13:26 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-23 10:18:19 +0000
commite1858932f98c1ec192479b9a5dcad7b39cbd97ec (patch)
tree818fb045bca620d83af62f409f6c82ef5e630bce /scripts/runqemu-internal
parenteef1d41751f691158376cd49955b956c28fec2f2 (diff)
downloadpoky-e1858932f98c1ec192479b9a5dcad7b39cbd97ec.tar.gz
runqemu-internal: Fix qemu networking for qemuarm64
This brings qemuarm64 into feature parity with the other qemu machines and enables the automated testing on the autobuilder. (From OE-Core rev: 31e259f2f2a83c26b8a62b6d7dbca010c6db16bf) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/runqemu-internal')
-rwxr-xr-xscripts/runqemu-internal4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index c219419014..f6274e20e8 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -264,7 +264,7 @@ else
264 ROOTFS_OPTIONS="-hda $ROOTFS" 264 ROOTFS_OPTIONS="-hda $ROOTFS"
265 fi 265 fi
266 if [ "$MACHINE" = "qemuarm64" ]; then 266 if [ "$MACHINE" = "qemuarm64" ]; then
267 QEMU_NETWORK_CMD="-netdev user,id=net0 -device virtio-net-device,netdev=net0" 267 QEMU_NETWORK_CMD="-netdev tap,id=net0,ifname=$TAP,script=no,downscript=no -device virtio-net-device,netdev=net0 "
268 DROOT="/dev/vda" 268 DROOT="/dev/vda"
269 ROOTFS_OPTIONS="-drive id=disk0,file=$ROOTFS -device virtio-blk-device,drive=disk0" 269 ROOTFS_OPTIONS="-drive id=disk0,file=$ROOTFS -device virtio-blk-device,drive=disk0"
270 fi 270 fi
@@ -381,7 +381,7 @@ if [ "$MACHINE" = "qemuarm64" ]; then
381 export QEMU_AUDIO_DRV="none" 381 export QEMU_AUDIO_DRV="none"
382 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS" 382 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS"
383 if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then 383 if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then
384 KERNCMDLINE="root=/dev/vda rw console=ttyAMA0,38400 mem=$QEMU_MEMORY highres=off" 384 KERNCMDLINE="root=/dev/vda rw console=ttyAMA0,38400 mem=$QEMU_MEMORY highres=off $KERNEL_NETWORK_CMD"
385 # qemu-system-aarch64 only support '-machine virt -cpu cortex-a57' for now 385 # qemu-system-aarch64 only support '-machine virt -cpu cortex-a57' for now
386 QEMUOPTIONS="$QEMU_NETWORK_CMD -machine virt -cpu cortex-a57 $ROOTFS_OPTIONS $QEMU_UI_OPTIONS" 386 QEMUOPTIONS="$QEMU_NETWORK_CMD -machine virt -cpu cortex-a57 $ROOTFS_OPTIONS $QEMU_UI_OPTIONS"
387 fi 387 fi