]> code.ossystems Code Review - openembedded-core.git/commitdiff
runqemu-internal: Fix qemu networking for qemuarm64
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 22 Dec 2014 10:13:26 +0000 (10:13 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 22 Dec 2014 10:53:56 +0000 (10:53 +0000)
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@linuxfoundation.org>
scripts/runqemu-internal

index c219419014e50ae6792d0d584c8aa8f52a5bbfc7..f6274e20e80fa5c09b1ff43a53c07a299a7dcd90 100755 (executable)
@@ -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