arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2025-07-26 16:38:09 +00:00
Code Issues Releases Wiki Activity

Add edk2-stable202502 UEFI firmwares and try to first use firmwares from the ovmf package if installed. Fixes #2494

Browse Source
This commit is contained in:
grossmj 2025-04-18 17:13:29 +07:00
parent 684770a220
commit 2b7eb91694
No known key found for this signature in database
GPG Key ID: 1E7DD6DBB53FF3D7
5 changed files with 45 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
gns3server/compute/qemu/qemu_vm.py
View File

@ -2055,19 +2055,47 @@ class QemuVM(BaseNode):
else: else:
raise QemuError("bios image '{}' is not accessible".format(self._bios_image)) raise QemuError("bios image '{}' is not accessible".format(self._bios_image))
options.extend(["-bios", self._bios_image.replace(",", ",,")]) options.extend(["-bios", self._bios_image.replace(",", ",,")])
elif self._uefi: elif self._uefi:
# get the OVMF firmware from the images directory
ovmf_firmware_path = self.manager.get_abs_image_path("OVMF_CODE.fd") old_ovmf_vars_path = os.path.join(self.working_dir, "OVMF_VARS.fd")
if os.path.exists(old_ovmf_vars_path):
# the node has its own UEFI variables store already, we must also use the old UEFI firmware
ovmf_firmware_path = self.manager.get_abs_image_path("OVMF_CODE.fd")
else:
# try to use the UEFI firmware from the system first
if "windows" in self.name.lower():
#TODO: temporary & ugly workaround for Windows (we should allow users to select the UEFI firmware type)
system_ovmf_firmware_path = "/usr/share/OVMF/OVMF_CODE_4M.secboot.fd"
else:
system_ovmf_firmware_path = "/usr/share/OVMF/OVMF_CODE_4M.fd"
if os.path.exists(system_ovmf_firmware_path):
ovmf_firmware_path = system_ovmf_firmware_path
else:
# otherwise, get the UEFI firmware from the images directory
ovmf_firmware_path = self.manager.get_abs_image_path("OVMF_CODE_4M.fd")
log.info("Configuring UEFI boot mode using OVMF file: '{}'".format(ovmf_firmware_path)) log.info("Configuring UEFI boot mode using OVMF file: '{}'".format(ovmf_firmware_path))
options.extend(["-drive", "if=pflash,format=raw,readonly,file={}".format(ovmf_firmware_path)]) options.extend(["-drive", "if=pflash,format=raw,readonly,file={}".format(ovmf_firmware_path)])
# try to use the UEFI variables store from the system first
system_ovmf_vars_path = "/usr/share/OVMF/OVMF_VARS_4M.fd"
if os.path.exists(system_ovmf_vars_path):
ovmf_vars_path = system_ovmf_vars_path
else:
# otherwise, get the UEFI variables store from the images directory
ovmf_vars_path = self.manager.get_abs_image_path("OVMF_VARS_4M.fd")
# the node should have its own copy of OVMF_VARS.fd (the UEFI variables store) # the node should have its own copy of OVMF_VARS.fd (the UEFI variables store)
ovmf_vars_node_path = os.path.join(self.working_dir, "OVMF_VARS.fd") if os.path.exists(old_ovmf_vars_path):
if not os.path.exists(ovmf_vars_node_path): ovmf_vars_node_path = old_ovmf_vars_path
try: else:
shutil.copyfile(self.manager.get_abs_image_path("OVMF_VARS.fd"), ovmf_vars_node_path) ovmf_vars_node_path = os.path.join(self.working_dir, "OVMF_VARS_4M.fd")
except OSError as e: if not os.path.exists(ovmf_vars_node_path):
raise QemuError("Cannot copy OVMF_VARS.fd file to the node working directory: {}".format(e)) try:
shutil.copyfile(ovmf_vars_path, ovmf_vars_node_path)
except OSError as e:
raise QemuError("Cannot copy OVMF_VARS_4M.fd file to the node working directory: {}".format(e))
options.extend(["-drive", "if=pflash,format=raw,file={}".format(ovmf_vars_node_path)]) options.extend(["-drive", "if=pflash,format=raw,file={}".format(ovmf_vars_node_path)])
return options return options

BIN
gns3server/disks/OVMF_CODE_4M.fd Normal file
View File

Binary file not shown.

BIN
gns3server/disks/OVMF_CODE_4M.secboot.fd Normal file
View File

Binary file not shown.

BIN
gns3server/disks/OVMF_VARS_4M.fd Normal file
View File

Binary file not shown.

14
tests/compute/qemu/test_qemu_vm.py
View File

@ -396,16 +396,20 @@ async def test_uefi_boot_mode_option(vm, tmpdir, images_dir, fake_qemu_img_binar
vm._uefi = True vm._uefi = True
# create fake OVMF files # create fake OVMF files
ovmf_code_path = os.path.join(images_dir, "OVMF_CODE.fd") system_ovmf_firmware_path = "/usr/share/OVMF/OVMF_CODE_4M.fd"
with open(ovmf_code_path, "w+") as f: if os.path.exists(system_ovmf_firmware_path):
f.write('1') ovmf_code_path = system_ovmf_firmware_path
ovmf_vars_path = os.path.join(images_dir, "OVMF_VARS.fd") else:
ovmf_code_path = os.path.join(images_dir, "OVMF_CODE_4M.fd")
with open(ovmf_code_path, "w+") as f:
f.write('1')
ovmf_vars_path = os.path.join(images_dir, "OVMF_VARS_4M.fd")
with open(ovmf_vars_path, "w+") as f: with open(ovmf_vars_path, "w+") as f:
f.write('1') f.write('1')
options = await vm._build_command() options = await vm._build_command()
assert ' '.join(["-drive", "if=pflash,format=raw,readonly,file={}".format(ovmf_code_path)]) in ' '.join(options) assert ' '.join(["-drive", "if=pflash,format=raw,readonly,file={}".format(ovmf_code_path)]) in ' '.join(options)
assert ' '.join(["-drive", "if=pflash,format=raw,file={}".format(os.path.join(vm.working_dir, "OVMF_VARS.fd"))]) in ' '.join(options) assert ' '.join(["-drive", "if=pflash,format=raw,file={}".format(os.path.join(vm.working_dir, "OVMF_VARS_4M.fd"))]) in ' '.join(options)
async def test_uefi_with_bios_image_already_configured(vm, tmpdir, fake_qemu_img_binary): async def test_uefi_with_bios_image_already_configured(vm, tmpdir, fake_qemu_img_binary):