qemu: Disable network tests by default

The network tests fail more often than they work, depending on having
the right network driver in the kernel, slirp working etc. So disable
them by default.

Author: mpe

lib/qemu.py

@@ -23,7 +23,7 @@ def __init__(self, machine):
         self.logpath = 'console.log'
         self.quiet = False
         self.net = None
-        self.net_tests = True
+        self.net_tests = False
         self.host_command = 'run'
         self.gdb = None
         self.interactive = False
@@ -55,7 +55,7 @@ def configure_from_env(self):
         self.pexpect_timeout = int(get_env_var('QEMU_PEXPECT_TIMEOUT', self.pexpect_timeout))
         self.logpath = get_env_var('QEMU_CONSOLE_LOG', self.logpath)
         self.quiet = get_env_var('QEMU_QUIET', self.quiet)
-        self.net_tests = get_env_var('QEMU_NET_TESTS', self.net_tests) != '0'
+        self.net_tests = get_env_var('QEMU_NET_TESTS', self.net_tests) == '1'
         self.host_command = get_env_var('QEMU_HOST_COMMAND', self.host_command)
         self.expected_release = get_expected_release()
         self.vmlinux = get_vmlinux()

scripts/boot/qemu-44x

@@ -28,7 +28,6 @@ def main():
     qconf = QemuConfig('bamboo')
     qconf.configure_from_env()
     qconf.configure_from_args(sys.argv[1:])
-    qconf.net_tests = False
     qconf.smp = 1
 
     def shutdown(p):

scripts/boot/qemu-e500mc

@@ -36,7 +36,6 @@ def main():
     qconf.configure_from_env()
     qconf.configure_from_args(sys.argv[1:])
     qconf.qemu_path = 'qemu-system-ppc'
-    qconf.net_tests = False
     qconf.mem = '2G'
     qconf.smp = 1
     qconf.cpu = 'e500mc'

scripts/boot/qemu-g5

@@ -31,6 +31,7 @@ def main():
     setup_logging()
 
     qconf = QemuConfig('mac99')
+    qconf.net_tests = True
     qconf.configure_from_env()
     qconf.configure_from_args(sys.argv[1:])
     qconf.machine_caps += ['via=pmu']

scripts/boot/qemu-powernv

@@ -30,6 +30,7 @@ def main():
     setup_logging()
 
     qconf = QemuConfig('powernv')
+    qconf.net_tests = True
     qconf.configure_from_env()
     qconf.configure_from_args(sys.argv[1:])
     qconf.apply_defaults()

scripts/boot/qemu-ppc64e

@@ -40,7 +40,6 @@ def main():
     qconf.configure_from_env()
     qconf.configure_from_args(sys.argv[1:])
     qconf.qemu_path = 'qemu-system-ppc64'
-    qconf.net_tests = False
     qconf.mem = '4G'
     qconf.smp = 2
 

scripts/boot/qemu-pseries

@@ -29,6 +29,7 @@ def main():
     setup_logging()
 
     qconf = QemuConfig('pseries')
+    qconf.net_tests = True
     qconf.configure_from_env()
     qconf.configure_from_args(sys.argv[1:])
     qconf.apply_defaults()

scripts/test/qemu-cpu-hotplug

@@ -14,7 +14,6 @@ from pexpect_utils import xmon_enter, xmon_exit
 def test(name, cpu, machine):
     qconf = QemuConfig(machine)
     qconf.configure_from_env()
-    qconf.net_tests = False
     qconf.smp = 2
     qconf.cpu = cpu
     qconf.host_mounts = []

scripts/test/qemu-lkdtm

@@ -34,7 +34,6 @@ triggers = ['BUG', 'WARNING', 'WARNING_MESSAGE', 'EXCEPTION', 'ARRAY_BOUNDS',
 def test(name, cpu, machine):
     qconf = QemuConfig(machine)
     qconf.configure_from_env()
-    qconf.net_tests = False
     qconf.mem = '2G'
     qconf.cpu = cpu
     qconf.accel = kvm_or_tcg(machine, cpu)

scripts/test/qemu-ptdump

@@ -15,7 +15,6 @@ from dump import read_symbols, find_symbol
 def test(name, cpu, machine):
     qconf = QemuConfig(machine)
     qconf.configure_from_env()
-    qconf.net_tests = False
     qconf.mem = '2G'
     qconf.smp = 1
     qconf.cpu = cpu