driver: qemudriver: fold equivalent disk arguments

Fold the "q35", "virt" and "pc" machines into a single if clause. They all use the same definition anyway. Signed-off-by: Rouven Czerwinski <[email protected]>
labgrid-project · Dec 15, 2023 · c3f2a94 · c3f2a94
1 parent 5b6852d
commit c3f2a94
Showing 1 changed file with 1 addition and 11 deletions.
diff --git a/labgrid/driver/qemudriver.py b/labgrid/driver/qemudriver.py
@@ -158,17 +158,7 @@ def get_qemu_base_args(self):
                 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 == "q35":
-                cmd.append("-drive")
-                cmd.append(
-                    f"if=virtio,format={disk_format},file={disk_path}{disk_opts}")
-                boot_args.append("root=/dev/vda rootwait")
-            elif self.machine == "pc":
-                cmd.append("-drive")
-                cmd.append(
-                    f"if=virtio,format={disk_format},file={disk_path}{disk_opts}")
-                boot_args.append("root=/dev/vda rootwait")
-            elif self.machine == "virt":
+            elif self.machine in [ "pc", "q35", "virt" ]:
                 cmd.append("-drive")
                 cmd.append(
                     f"if=virtio,format={disk_format},file={disk_path}{disk_opts}")