Skip to content

Commit fc98ddc

Browse files
committed
boot-qemu.py: Use find_first_file() for kernel image
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
1 parent 4909dd4 commit fc98ddc

1 file changed

Lines changed: 4 additions & 13 deletions

File tree

boot-qemu.py

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -249,20 +249,11 @@ def _set_kernel_vars(self):
249249
raise RuntimeError('No default kernel path specified?')
250250

251251
possible_kernel_locations = {
252-
Path(self.kernel_dir,
253-
self._default_kernel_path), # default (kbuild)
254-
Path(self.kernel_dir, self._default_kernel_path.name), # tuxmake
252+
Path(self._default_kernel_path), # default (kbuild)
253+
Path(self._default_kernel_path.name), # tuxmake
255254
}
256-
for loc in possible_kernel_locations:
257-
if loc.exists():
258-
self.kernel = loc
259-
break
260-
if not self.kernel:
261-
possible_locations = "', '".join(
262-
str(path) for path in possible_kernel_locations)
263-
raise FileNotFoundError(
264-
f"{self._default_kernel_path.name} could not be found at possible locations ('{possible_locations}')",
265-
)
255+
self.kernel = utils.find_first_file(self.kernel_dir,
256+
possible_kernel_locations)
266257

267258
def _set_qemu_path(self):
268259
if self._qemu_path:

0 commit comments

Comments
 (0)