]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
qemu: Rename fw variables to ovmf
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Thu, 7 Sep 2023 11:46:28 +0000 (13:46 +0200)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Thu, 7 Sep 2023 12:08:33 +0000 (14:08 +0200)
These specifically indicate the ovmf firmware so let's make that
more clear.

mkosi/qemu.py

index 85793306159c57a5e2cb5f65840be0c97c430ea6..97b2bcab6c29b476de3f4b4f9314f5d79ffbbb33 100644 (file)
@@ -220,8 +220,8 @@ def run_qemu(args: MkosiArgs, config: MkosiConfig) -> None:
     if config.qemu_kvm == ConfigFeature.enabled or auto:
         accel = "kvm"
 
-    firmware, fw_supports_sb = find_ovmf_firmware(config)
-    smm = "on" if config.qemu_firmware == QemuFirmware.uefi and fw_supports_sb else "off"
+    ovmf, ovmf_supports_sb = find_ovmf_firmware(config)
+    smm = "on" if config.qemu_firmware == QemuFirmware.uefi and ovmf_supports_sb else "off"
 
     if config.architecture == Architecture.arm64:
         machine = f"type=virt,accel={accel}"
@@ -264,12 +264,12 @@ def run_qemu(args: MkosiArgs, config: MkosiConfig) -> None:
 
     # QEMU has built-in logic to look for the BIOS firmware so we don't need to do anything special for that.
     if config.qemu_firmware == QemuFirmware.uefi:
-        cmdline += ["-drive", f"if=pflash,format=raw,readonly=on,file={firmware}"]
+        cmdline += ["-drive", f"if=pflash,format=raw,readonly=on,file={ovmf}"]
 
     notifications: dict[str, str] = {}
 
     with contextlib.ExitStack() as stack:
-        if config.qemu_firmware == QemuFirmware.uefi and fw_supports_sb:
+        if config.qemu_firmware == QemuFirmware.uefi and ovmf_supports_sb:
             ovmf_vars = stack.enter_context(tempfile.NamedTemporaryFile(prefix=".mkosi-"))
             shutil.copy2(find_ovmf_vars(config), Path(ovmf_vars.name))
             cmdline += [