From 0675ecdd2034a8f0441b0850582b89e47b4c4a1c Mon Sep 17 00:00:00 2001 From: Riku Voipio Date: Mon, 25 Aug 2014 14:58:16 +0300 Subject: kvm: disable bridge on aarch64 Don't set up bridge on aarch64 - even if kernel has tun. ARMv8 tests are run on nfsroot so bringing bridge up will kill the job. Change-Id: Ia25fcf2d8955b1f8f73b45edba2899628e4fef44 --- common/scripts/kvm/test-kvm.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/common/scripts/kvm/test-kvm.sh b/common/scripts/kvm/test-kvm.sh index 6ee32e5..0a01f87 100755 --- a/common/scripts/kvm/test-kvm.sh +++ b/common/scripts/kvm/test-kvm.sh @@ -93,8 +93,8 @@ umount /mnt sync qemu-nbd -d /dev/nbd0 -if [ -e /dev/net/tun ] -then +case ${ARCH} in + armv7l) echo setting up and testing networking bridge for guest brctl addbr br0 tunctl -u root @@ -104,10 +104,11 @@ brctl addif br0 eth0 brctl addif br0 tap0 udhcpc -t 10 -i br0 ping -W 4 -c 10 192.168.1.10 && echo "$KVM_HOST_NET 0 pc pass" || echo "$KVM_HOST_NET 0 pc fail" -else -echo "$KVM_HOST_NET 0 pc skip" -fi - + ;; + aarch64) + echo "$KVM_HOST_NET 0 pc skip" + ;; +esac case ${ARCH} in armv7l) -- cgit v1.2.3