qemu: Convert qemu-ppc64e to use qemu_main()

Author: mpe

lib/qemu.py

@@ -77,6 +77,8 @@ def apply_defaults(self):
                 self.cpuinfo = 'AAPL,PowerMac G3 MacRISC'
             elif self.machine == 'bamboo':
                 self.cpuinfo = 'PowerPC 44x Platform'
+            elif self.machine == 'ppce500':
+                self.cpuinfo = 'QEMU ppce500'
 
         if self.qemu_path is None:
             if self.machine_is('pseries') or self.machine_is('powernv'):

scripts/boot/qemu-ppc64e

@@ -28,58 +28,27 @@ import logging
 import os, sys
 sys.path.append(f'{os.path.dirname(sys.argv[0])}/../../lib')
 
-from qemu import qemu_command, qemu_net_setup
-from pexpect_utils import *
-from utils import *
+from qemu import QemuConfig, qemu_main
+from utils import setup_logging
 
 
 def main():
     setup_logging()
-    setup_timeout(60)
 
-    expected_release = get_expected_release()
-    if expected_release is None:
-        return False
-
-    vmlinux = get_vmlinux()
-    if vmlinux is None:
-        return False
+    qconf = QemuConfig('ppce500')
+    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 = 1
+    qconf.cpu = 'e5500'
 
     if os.environ.get('COMPAT_USERSPACE', False):
-        initrd = 'ppc-rootfs.cpio.gz'
-    else:
-        initrd = 'ppc64-novsx-rootfs.cpio.gz'
-
-    p = PexpectHelper()
-    cmd = qemu_command(vmlinux=vmlinux, machine='ppce500', cpu='e5500',
-                       mem='4G', initrd=initrd, cmdline='noreboot')
-    p.spawn(cmd, logfile=open('console.log', 'w'))
-
-    standard_boot(p)
-
-    p.send("echo -n 'booted-revision: '; uname -r")
-    p.expect(f'booted-revision: {expected_release}')
-    p.expect_prompt()
-
-    p.send('cat /proc/cpuinfo')
-    p.expect("QEMU ppce500")
-    p.expect_prompt()
-
-    if os.environ.get('QEMU_NET_TESTS', True) != '0':
-        qemu_net_setup(p)
-        ping_test(p, check=False)
-        wget_test(p)
-
-    p.send('poweroff')
-    p.wait_for_exit()
-
-    if filter_log_warnings(open('console.log'), open('warnings.txt', 'w')):
-        logging.error('Errors/warnings seen in console.log')
-        return False
-
-    logging.info('Test completed OK')
+        qconf.initrd = 'ppc-rootfs.cpio.gz'
 
-    return True
+    qconf.apply_defaults()
 
+    return qemu_main(qconf)
 
 sys.exit(0 if main() else 1)