qemu: Convert qemu-44x to use qemu_main()

Author: mpe

lib/qemu.py

@@ -75,6 +75,8 @@ def apply_defaults(self):
                 self.cpuinfo = 'PowerMac3,1 MacRISC MacRISC2 Power Macintosh'
             elif self.machine == 'g3beige':
                 self.cpuinfo = 'AAPL,PowerMac G3 MacRISC'
+            elif self.machine == 'bamboo':
+                self.cpuinfo = 'PowerPC 44x Platform'
 
         if self.qemu_path is None:
             if self.machine_is('pseries') or self.machine_is('powernv'):
@@ -197,6 +199,12 @@ def cmd(self):
         return ' '.join(l)
 
 
+def qemu_monitor_shutdown(p):
+    p.send('\x01c') # invoke qemu monitor
+    p.expect('\(qemu\)')
+    p.send('quit')
+
+
 def get_qemu(name='qemu-system-ppc64'):
     qemu = get_env_var(name.upper().replace('-', '_'))
     if qemu is None:

scripts/boot/qemu-44x

@@ -18,55 +18,29 @@ 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, qemu_monitor_shutdown
+from utils import setup_logging
 
 
 def main():
     setup_logging()
-    setup_timeout(60)
 
-    expected_release = get_expected_release()
-    if expected_release is None:
-        return False
+    qconf = QemuConfig('bamboo')
+    qconf.configure_from_env()
+    qconf.configure_from_args(sys.argv[1:])
+    qconf.net_tests = False
+    qconf.smp = 1
 
-    vmlinux = get_vmlinux()
-    if vmlinux is None:
-        return False
+    def shutdown(p):
+        p.send('poweroff')
+        p.expect('System Halted, OK to turn off power')
+        qemu_monitor_shutdown(p)
 
-    p = PexpectHelper()
-    cmd = qemu_command(qemu='qemu-system-ppc', machine='bamboo', vmlinux=vmlinux,
-                       cmdline='noreboot')
-    p.spawn(cmd, logfile=open('console.log', 'w'))
+    qconf.shutdown = shutdown
 
-    standard_boot(p)
+    qconf.apply_defaults()
 
-    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("PowerPC 44x Platform")
-    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('echo o > /proc/sysrq-trigger')
-    p.expect('System Halted, OK to turn off power')
-
-    p.terminate()
-
-    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')
-
-    return True
+    return qemu_main(qconf)
 
 
 sys.exit(0 if main() else 1)