qemudriver: Allow machine-specific options.

Signed-off-by: Joschka Seydell <joschka@seydell.org>

Author: JSydll

labgrid/driver/qemudriver.py

@@ -156,19 +156,20 @@ def get_qemu_base_args(self):
             disk_opts = ""
             if self.disk_opts:
                 disk_opts = f",{self.disk_opts}"
-            if self.machine == "vexpress-a9":
+            machine_base = self.machine.split(',')[0]
+            if machine_base == "vexpress-a9":
                 cmd.append("-drive")
                 cmd.append(
                     f"if=sd,format={disk_format},file={disk_path},id=mmc0{disk_opts}")
                 boot_args.append("root=/dev/mmcblk0p1 rootfstype=ext4 rootwait")
-            elif self.machine in ["pc", "q35", "virt"]:
+            elif machine_base in ["pc", "q35", "virt"]:
                 cmd.append("-drive")
                 cmd.append(
                     f"if=virtio,format={disk_format},file={disk_path}{disk_opts}")
                 boot_args.append("root=/dev/vda rootwait")
             else:
                 raise NotImplementedError(
-                    f"QEMU disk image support not implemented for machine '{self.machine}'"
+                    f"QEMU disk image support not implemented for machine '{machine_base}'"
                 )
         if self.rootfs is not None:
             cmd.append("-fsdev")

tests/test_qemudriver.py

@@ -13,7 +13,8 @@ def qemu_env(tmpdir):
             role: foo
         images:
           kernel: "test.zImage"
-          dtb: test.dtb"
+          disk: "test.qcow2"
+          dtb: "test.dtb"
         tools:
           qemu: "qemu-system-arm"
         paths:
@@ -69,6 +70,15 @@ def qemu_version_mock(mocker):
 def test_qemu_instance(qemu_target, qemu_driver):
     assert (isinstance(qemu_driver, QEMUDriver))
 
+def test_qemu_get_qemu_base_args_disk(qemu_target, qemu_driver):
+    qemu_driver.disk = 'disk'
+    supported_machines = ['vexpress-a9', 'pc', 'q35', 'virt']
+    for machine in supported_machines:
+        qemu_driver.machine = machine
+        qemu_driver.get_qemu_base_args()
+        qemu_driver.machine = machine + ',option=value'
+        qemu_driver.get_qemu_base_args()
+
 def test_qemu_activate_deactivate(qemu_target, qemu_driver, qemu_version_mock):
     qemu_target.activate(qemu_driver)
     qemu_target.deactivate(qemu_driver)