|
|
@ -160,13 +160,20 @@ class Qemu(BaseManager):
|
|
|
|
for arch in archs:
|
|
|
|
for arch in archs:
|
|
|
|
if f.endswith(arch) or f.endswith("{}.exe".format(arch)) or f.endswith("{}w.exe".format(arch)):
|
|
|
|
if f.endswith(arch) or f.endswith("{}.exe".format(arch)) or f.endswith("{}w.exe".format(arch)):
|
|
|
|
qemu_path = os.path.join(path, f)
|
|
|
|
qemu_path = os.path.join(path, f)
|
|
|
|
version = await Qemu.get_qemu_version(qemu_path)
|
|
|
|
try:
|
|
|
|
|
|
|
|
version = await Qemu.get_qemu_version(qemu_path)
|
|
|
|
|
|
|
|
except QemuError as e:
|
|
|
|
|
|
|
|
log.warning(str(e))
|
|
|
|
|
|
|
|
continue
|
|
|
|
qemus.append({"path": qemu_path, "version": version})
|
|
|
|
qemus.append({"path": qemu_path, "version": version})
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
qemu_path = os.path.join(path, f)
|
|
|
|
qemu_path = os.path.join(path, f)
|
|
|
|
version = await Qemu.get_qemu_version(qemu_path)
|
|
|
|
try:
|
|
|
|
|
|
|
|
version = await Qemu.get_qemu_version(qemu_path)
|
|
|
|
|
|
|
|
except QemuError as e:
|
|
|
|
|
|
|
|
log.warning(str(e))
|
|
|
|
|
|
|
|
continue
|
|
|
|
qemus.append({"path": qemu_path, "version": version})
|
|
|
|
qemus.append({"path": qemu_path, "version": version})
|
|
|
|
|
|
|
|
|
|
|
|
except OSError:
|
|
|
|
except OSError:
|
|
|
|
continue
|
|
|
|
continue
|
|
|
|
|
|
|
|
|
|
|
|