qemu: Make callbacks a list

Continuing the trend of making things lists :)

Also pass the qconf to the callback.

Author: mpe

lib/qemu.py

@@ -34,7 +34,7 @@ def __init__(self, machine):
         self.compat_rootfs = False
         self.boot_func = None
         self.shutdown = None
-        self.callback = None
+        self.callbacks = []
         self.extra_args = []
         self.qemu_path = None
         self.qemu_cmd = None
@@ -547,9 +547,11 @@ def qemu_main(qconf):
             p.send(f'[ -x /mnt/host{i}/{qconf.host_command} ] && (cd /mnt/host{i} && ./{qconf.host_command})')
             p.expect_prompt(timeout=None) # no timeout
 
-    if qconf.callback and qconf.callback(p) is False:
-        logging.error("Callback failed")
-        return False
+    for callback in qconf.callbacks:
+        logging.info("Running callback ...")
+        if callback(qconf, p) is False:
+            logging.error("Callback failed")
+            return False
 
     if qconf.shutdown:
         qconf.shutdown(p)

scripts/test/qemu-cpu-hotplug

@@ -22,7 +22,7 @@ def test(name, cpu, machine):
     if os.environ.get('QEMU_QUIET', None) is None:
         qconf.quiet = True
 
-    qconf.callback = test_cpuhotplug
+    qconf.callbacks.append(test_cpuhotplug)
     qconf.apply_defaults()
 
     if cpu == 'POWER10' and not qemu_supports_p10(qconf.qemu_cmd):
@@ -31,7 +31,7 @@ def test(name, cpu, machine):
     return qemu_main(qconf)
 
 
-def test_cpuhotplug(p):
+def test_cpuhotplug(qconf, p):
     # Check we have 2 CPUs online
     p.send('grep -H . /sys/devices/system/cpu/cpu*/online')
     p.expect('/sys/devices/system/cpu/cpu0/online:1')

scripts/test/qemu-lkdtm

@@ -38,14 +38,14 @@ def test(name, cpu, machine):
     qconf.cpu = cpu
     qconf.accel = kvm_or_tcg(machine, cpu)
 
-    def test(p):
+    def test(qconf, p):
         p.cmd('mount -t debugfs none /sys/kernel/debug')
 
         for trigger in triggers:
             p.send(f"sh -c 'echo {trigger} > /sys/kernel/debug/provoke-crash/DIRECT'")
             p.expect(p.prompt, bug_patterns=[])
 
-    qconf.callback = test
+    qconf.callbacks.append(test)
     qconf.apply_defaults()
 
     if cpu.upper() == 'POWER10' and not qemu_supports_p10(qconf.qemu_cmd):

scripts/test/qemu-ptdump

@@ -33,7 +33,7 @@ def test(name, cpu, machine):
         return False
 
 
-    def test(p):
+    def test(qconf, p):
         p.cmd('mount -t debugfs none /sys/kernel/debug')
         p.send('cat /sys/kernel/debug/kernel_page_tables')
         i = p.expect(["can't open '/sys/kernel/debug/kernel_page_tables': No such file or directory",
@@ -56,7 +56,7 @@ def test(name, cpu, machine):
 
         p.expect_prompt()
 
-    qconf.callback = test
+    qconf.callbacks.append(test)
     qconf.apply_defaults()
 
     return qemu_main(qconf)

scripts/test/qemu-xmon

@@ -22,7 +22,7 @@ def test(name, cpu, machine):
     if os.environ.get('QEMU_QUIET', None) is None:
         qconf.quiet = True
 
-    def test_xmon(p):
+    def test_xmon(qconf, p):
         xmon_enter(p)
 
         p.send('e')
@@ -55,7 +55,7 @@ def test(name, cpu, machine):
 
         xmon_exit(p)
 
-    qconf.callback = test_xmon
+    qconf.callbacks.append(test_xmon)
     qconf.apply_defaults()
 
     if cpu == 'POWER10' and not qemu_supports_p10(qconf.qemu_cmd):