[oe-commits] Richard Purdie : runqemu-internal: Fix qemu networking for qemuarm64

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 31e259f2f2a83c26b8a62b6d7dbca010c6db16bf
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=31e259f2f2a83c26b8a62b6d7dbca010c6db16bf

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Mon Dec 22 10:13:26 2014 +0000

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.

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 scripts/runqemu-internal | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index c219419..f6274e2 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -264,7 +264,7 @@ else
             ROOTFS_OPTIONS="-hda $ROOTFS"
         fi
         if [ "$MACHINE" = "qemuarm64" ]; then
-            QEMU_NETWORK_CMD="-netdev user,id=net0 -device virtio-net-device,netdev=net0"
+            QEMU_NETWORK_CMD="-netdev tap,id=net0,ifname=$TAP,script=no,downscript=no -device virtio-net-device,netdev=net0 "
             DROOT="/dev/vda"
             ROOTFS_OPTIONS="-drive id=disk0,file=$ROOTFS -device virtio-blk-device,drive=disk0"
         fi
@@ -381,7 +381,7 @@ if [ "$MACHINE" = "qemuarm64" ]; then
     export QEMU_AUDIO_DRV="none"
     QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS"
     if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then
-        KERNCMDLINE="root=/dev/vda rw console=ttyAMA0,38400 mem=$QEMU_MEMORY highres=off"
+        KERNCMDLINE="root=/dev/vda rw console=ttyAMA0,38400 mem=$QEMU_MEMORY highres=off $KERNEL_NETWORK_CMD"
         # qemu-system-aarch64 only support '-machine virt -cpu cortex-a57' for now
         QEMUOPTIONS="$QEMU_NETWORK_CMD -machine virt -cpu cortex-a57 $ROOTFS_OPTIONS $QEMU_UI_OPTIONS"
     fi