mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-22 07:03:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

v2v: linux: improve arch detection from modules (RHBZ#1690574)

Browse Source 
Try to look for a well known kernel module (so far only virtio, or kvm)
to use for detecting the architecture of a kernel.  This way, we can
avoid picking 3rd party modules that cause troubles.

(cherry picked from commit 363b5e0b4e)
This commit is contained in:
Pino Toscano
2019-03-20 12:32:02 +01:00
committed by Richard W.M. Jones
parent 999180eca8
commit de9ebcaf07
1 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
v2v/linux_kernels.ml
View File

@@ -185,11 +185,35 @@ let detect_kernels (g : G.guestfs) inspect family bootloader =
assert (List.length modules > 0);
(* Determine the kernel architecture by looking at the
* architecture of an arbitrary kernel module.
* architecture of a kernel module.
*
* To avoid architecture detection issues with 3rd party
* modules (RHBZ#1690574), try to pick one of the well
* known modules, if available. Otherwise, an arbitrary
* module is used.
*)
let arch =
let any_module = modpath ^ List.hd modules in
g#file_architecture (g#realpath any_module) in
(* Well known kernel modules. *)
let candidates = [ "virtio"; "kvm" ] in
let all_candidates = List.flatten (
List.map (
fun f ->
[ "/" ^ f ^ ".o"; "/" ^ f ^ ".ko"; "/" ^ f ^ ".ko.xz" ]
) candidates
) in
let candidate =
try
List.find (
fun m ->
List.exists (String.is_suffix m) all_candidates
) modules
with Not_found ->
(* No known module found, pick an arbitrary one
* (the first).
*)
List.hd modules in
let candidate = modpath ^ candidate in
g#file_architecture (g#realpath candidate) in
(* Just return the module names, without path or extension. *)
let modules = List.filter_map (