From 1c3e71b12cd85a9dd2ab434483e4ec19893d0e4d Mon Sep 17 00:00:00 2001 From: Stephen Larew Date: Tue, 29 Oct 2024 17:18:00 -0700 Subject: [PATCH] Use scsi-hd when QemuRemovable is enabled --- mkosi/qemu.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/mkosi/qemu.py b/mkosi/qemu.py index 6411838e6..b2c63b079 100644 --- a/mkosi/qemu.py +++ b/mkosi/qemu.py @@ -1288,9 +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" cmdline += [ "-drive", f"if=none,id=mkosi,file={fname},format=raw,discard=on,{cache}", - "-device", f"{'scsi-cd' if config.qemu_cdrom or config.qemu_removable else 'virtio-blk-pci'},drive=mkosi,bootindex=1{',removable=on' if config.qemu_removable else ''}", # noqa: E501 + "-device", f"{device_type},drive=mkosi,bootindex=1{removable_flag}", # noqa: E501 ] # fmt: skip if config.qemu_swtpm == ConfigFeature.enabled or ( -- 2.47.3