Skip to contentSkip to conversation

runqemu-internal: Fix qemu networking for qemuarm64

PATCH In review Richard Purdie 2 participants 2 messages Dec 22, 2014 – Dec 23, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

scripts/runqemu-internal +2 -2
index c219419..f6274e2 100755
@@ -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
#1 lore raw
Quoted 2 lines · Richard Purdie

This brings qemuarm64 into feature parity with the other qemu machines and enables the automated testing on the autobuilder.

Great! It will be enormously helpful.
Thanks.

--Kai

Quoted 29 lines
scripts/runqemu-internal +2 -2
index c219419..f6274e2 100755
@@ -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
Signature · 2 lines
Regards,
Neil | Kai Kang