qemu: move removable_flag into device_type

Also drop the no longer needed noqa for the overly long line.

Followup for 1c3e71b1.

diff --git a/mkosi/qemu.py b/mkosi/qemu.py
index b2c63b079001df5fb9abfc4baf35a4c8034132e7..f21760c817354250b83b554f6a1cf9edc0658130 100644 (file)
--- a/mkosi/qemu.py
+++ b/mkosi/qemu.py
@@ -1288,16 +1288,16 @@ def run_qemu(args: Args, config: Config) -> None:
             direct = fname.stat().st_size % resource.getpagesize() == 0
             ephemeral = config.ephemeral
             cache = f"cache.writeback=on,cache.direct={yes_no(direct)},cache.no-flush={yes_no(ephemeral)},aio=io_uring"  # noqa: E501
+
             device_type = "virtio-blk-pci"
-            removable_flag = ""
             if config.qemu_cdrom:
                 device_type = "scsi-cd"
             elif config.qemu_removable:
-                device_type = "scsi-hd"
-                removable_flag = ",removable=on"
+                device_type = "scsi-hd,removable=on"
+
             cmdline += [
                 "-drive", f"if=none,id=mkosi,file={fname},format=raw,discard=on,{cache}",
-                "-device", f"{device_type},drive=mkosi,bootindex=1{removable_flag}",  # noqa: E501
+                "-device", f"{device_type},drive=mkosi,bootindex=1",
             ]  # fmt: skip
 
         if config.qemu_swtpm == ConfigFeature.enabled or (