NgTech-LTD/gns3-server
2
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-10-24 11:52:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/2.2' into 3.0

Browse Source 
# Conflicts:
#	gns3server/compute/qemu/qemu_vm.py
#	gns3server/schemas/template.py
This commit is contained in:
grossmj 2025-05-14 16:42:59 +02:00
commit df576f0668
No known key found for this signature in database
GPG Key ID: 1E7DD6DBB53FF3D7
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -266,17 +266,10 @@ class QemuVM(BaseNode):
if qemu_bin == "qemu": if qemu_bin == "qemu":
self._platform = "i386" self._platform = "i386"
else: else:
self._platform = re.sub(r'^qemu-system-(\w+).*$', r'\1', qemu_bin, re.IGNORECASE) self._platform = re.sub(r'^qemu-system-(\w+).*$', r'\1', qemu_bin, flags=re.IGNORECASE)
if self._platform.split(".")[0] not in QEMU_PLATFORMS:
try:
QemuPlatform(self._platform.split(".")[0])
except ValueError:
raise QemuError(f"Platform {self._platform} is unknown") raise QemuError(f"Platform {self._platform} is unknown")
log.info( log.info(f'QEMU VM "{self._name}" [{self._name}] has set the QEMU path to {qemu_path}')
'QEMU VM "{name}" [{id}] has set the QEMU path to {qemu_path}'.format(
name=self._name, id=self._id, qemu_path=qemu_path
)
)
def _check_qemu_path(self, qemu_path): def _check_qemu_path(self, qemu_path):