From 1f6e00d29f6cc756fe2a847c184a2bb3ebf51d43 Mon Sep 17 00:00:00 2001 From: grossmj Date: Tue, 21 Jul 2026 17:20:46 +0200 Subject: [PATCH] Fix issues after merging --- gns3server/compute/qemu/qemu_vm.py | 5 ++--- gns3server/config_samples/gns3_server.conf | 2 ++ gns3server/schemas/config.py | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gns3server/compute/qemu/qemu_vm.py b/gns3server/compute/qemu/qemu_vm.py index a7ffa2d6b..8d66bdbff 100644 --- a/gns3server/compute/qemu/qemu_vm.py +++ b/gns3server/compute/qemu/qemu_vm.py @@ -35,7 +35,7 @@ import shlex import psutil from pathlib import Path -from gns3server.utils import parse_version, shlex_quote +from gns3server.utils import parse_version from gns3server.utils.asyncio import subprocess_check_output, cancellable_wait_run_in_executor from .qemu_error import QemuError from .utils.qcow2 import Qcow2, Qcow2Error @@ -2293,8 +2293,7 @@ class QemuVM(BaseNode): options.extend(["-bios", self._bios_image.replace(",", ",,")]) elif self._uefi: - ovmf_firmware_dir = self._manager.config.get_section_config("Qemu").get("ovmf_firmware_dir", "/usr/share/OVMF") - system_ovmf_firmware_dir = Path(ovmf_firmware_dir) + system_ovmf_firmware_dir = Path(self.manager.config.settings.Qemu.ovmf_firware_dir) log.info("Using OVMF firmware directory: {}".format(system_ovmf_firmware_dir)) old_ovmf_vars_path = os.path.join(self.working_dir, "OVMF_VARS.fd") if os.path.exists(old_ovmf_vars_path): diff --git a/gns3server/config_samples/gns3_server.conf b/gns3server/config_samples/gns3_server.conf index ca672891d..a8db5004c 100644 --- a/gns3server/config_samples/gns3_server.conf +++ b/gns3server/config_samples/gns3_server.conf @@ -177,6 +177,8 @@ enable_hardware_acceleration = True require_hardware_acceleration = False ; Allow unsafe additional command line options allow_unsafe_options = False +; Path to the OVMF firmware directory +ovmf_firmware_dir = "/usr/share/OVMF" [WebWireshark] ; Enable Web Wireshark feature (container-based Wireshark in browser) diff --git a/gns3server/schemas/config.py b/gns3server/schemas/config.py index 12e57b7a2..851f0d4e3 100644 --- a/gns3server/schemas/config.py +++ b/gns3server/schemas/config.py @@ -71,6 +71,7 @@ class QemuSettings(BaseModel): enable_hardware_acceleration: bool = True require_hardware_acceleration: bool = False allow_unsafe_options: bool = False + ovmf_firmware_dir: str = "/usr/share/OVMF" model_config = ConfigDict(validate_assignment=True, str_strip_whitespace=True)