qemu: Convert qemu-mac99 to use qemu_main()

Author: mpe

lib/qemu.py

@@ -71,6 +71,8 @@ def apply_defaults(self):
                 self.cpuinfo = 'IBM pSeries \(emulated by qemu\)'
             elif self.machine_is('powernv'):
                 self.cpuinfo = 'IBM PowerNV \(emulated by qemu\)'
+            elif self.machine == 'mac99':
+                self.cpuinfo = 'PowerMac3,1 MacRISC MacRISC2 Power Macintosh'
 
         if self.qemu_path is None:
             if self.machine_is('pseries') or self.machine_is('powernv'):
@@ -87,7 +89,9 @@ def apply_defaults(self):
                 self.mem = '1G'
 
         if self.smp is None:
-            if self.accel == 'tcg':
+            if self.machine_is('mac99'): # Doesn't support SMP
+                self.smp = 1
+            elif self.accel == 'tcg':
                 self.smp = 2
             else:
                 self.smp = 8

scripts/boot/qemu-mac99

@@ -25,52 +25,20 @@ 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
+    qconf = QemuConfig('mac99')
+    qconf.configure_from_env()
+    qconf.configure_from_args(sys.argv[1:])
+    qconf.smp = 1
+    qconf.apply_defaults()
 
-    vmlinux = get_vmlinux()
-    if vmlinux is None:
-        return False
-
-    p = PexpectHelper()
-    cmd = qemu_command(qemu='qemu-system-ppc', machine='mac99', vmlinux=vmlinux, 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('PowerMac3,1 MacRISC MacRISC2 Power Macintosh')
-    p.expect_prompt()
-
-    if os.environ.get('QEMU_NET_TESTS', True) != '0':
-        qemu_net_setup(p)
-        ping_test(p)
-        wget_test(p)
-
-    p.send('halt')
-    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')
-
-    return True
+    return qemu_main(qconf)
 
 
 sys.exit(0 if main() else 1)