From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sat, 16 Mar 2024 19:55:28 +0000 (+0100)
Subject: qemu: Introduce finalize_drive()
X-Git-Tag: v23~85^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9cfc5490b415e46cb1764b7f98739577e30c6dbe;p=thirdparty%2Fmkosi.git

qemu: Introduce finalize_drive()
---

diff --git a/mkosi/qemu.py b/mkosi/qemu.py
index 020952d3c..2da32a336 100644
--- a/mkosi/qemu.py
+++ b/mkosi/qemu.py
@@ -28,6 +28,7 @@ from mkosi.config import (
     ConfigFeature,
     Network,
     OutputFormat,
+    QemuDrive,
     QemuFirmware,
     QemuVsockCID,
     format_bytes,
@@ -529,6 +530,13 @@ def apply_runtime_size(config: Config, image: Path) -> None:
     )
 
 
+@contextlib.contextmanager
+def finalize_drive(drive: QemuDrive) -> Iterator[Path]:
+    with tempfile.NamedTemporaryFile(dir=drive.directory or "/var/tmp", prefix=f"mkosi-drive-{drive.id}") as file:
+        file.truncate(drive.size)
+        yield Path(file.name)
+
+
 def run_qemu(args: Args, config: Config) -> None:
     if config.output_format not in (
         OutputFormat.disk,
@@ -850,12 +858,9 @@ def run_qemu(args: Args, config: Config) -> None:
             cmdline += ["-smbios", f"type=11,value=io.systemd.credential:vmm.notify_socket={addr}"]
 
         for drive in config.qemu_drives:
-            file = stack.enter_context(
-                tempfile.NamedTemporaryFile(dir=drive.directory or "/var/tmp", prefix=f"mkosi-drive-{drive.id}")
-            )
-            file.truncate(drive.size)
+            file = stack.enter_context(finalize_drive(drive))
 
-            arg = f"if=none,id={drive.id},file={file.name},format=raw"
+            arg = f"if=none,id={drive.id},file={file},format=raw"
             if drive.options:
                 arg += f",{drive.options}"