search for: ki_modpath

...1000 | Some net_type -> net_type in configure_display_driver video; diff --git a/v2v/linux_kernels.ml b/v2v/linux_kernels.ml index 312d6d1c0..725bd03c2 100644 --- a/v2v/linux_kernels.ml +++ b/v2v/linux_kernels.ml @@ -38,18 +38,25 @@ type kernel_info = { ki_initrd : string option; ki_modpath : string; ki_modules : string list; - ki_supports_virtio : bool; + ki_supports_virtio_blk : bool; + ki_supports_virtio_net : bool; ki_is_xen_pv_only_kernel : bool; ki_is_debug : bool; ki_config_file : string option; } -let string_of_kernel_info ki = - sprintf "(%s, %s, %s, %...

...est_kernels kernels in let kernels = List.rev kernels (* so best is first *) in List.hd kernels in diff --git a/v2v/linux_kernels.ml b/v2v/linux_kernels.ml index 2efd070a6..459dc06bd 100644 --- a/v2v/linux_kernels.ml +++ b/v2v/linux_kernels.ml @@ -39,7 +39,7 @@ type kernel_info = { ki_modpath : string; ki_modules : string list; ki_supports_virtio : bool; - ki_is_xen_kernel : bool; + ki_is_xen_pv_only_kernel : bool; ki_is_debug : bool; ki_config_file : string option; } @@ -49,7 +49,7 @@ let string_of_kernel_info ki = ki.ki_name ki.ki_version ki.ki_arch ki.ki_vmlinuz...

...est_kernels kernels in let kernels = List.rev kernels (* so best is first *) in List.hd kernels in diff --git a/v2v/linux_kernels.ml b/v2v/linux_kernels.ml index 2efd070a6..312d6d1c0 100644 --- a/v2v/linux_kernels.ml +++ b/v2v/linux_kernels.ml @@ -39,7 +39,7 @@ type kernel_info = { ki_modpath : string; ki_modules : string list; ki_supports_virtio : bool; - ki_is_xen_kernel : bool; + ki_is_xen_pv_only_kernel : bool; ki_is_debug : bool; ki_config_file : string option; } @@ -49,7 +49,7 @@ let string_of_kernel_info ki = ki.ki_name ki.ki_version ki.ki_arch ki.ki_vmlinuz...

v1: https://www.redhat.com/archives/libguestfs/2017-April/msg00031.html v2: https://www.redhat.com/archives/libguestfs/2017-April/msg00040.html v2 -> v3: - Fix Xen PV-only kernel detection. Rich.

v1: https://www.redhat.com/archives/libguestfs/2017-April/msg00031.html v2: https://www.redhat.com/archives/libguestfs/2017-April/msg00040.html v3: https://www.redhat.com/archives/libguestfs/2017-April/msg00051.html v3 -> v4: - Properly fix Xen PV-only kernel detection, and test it. Rich.

...(* version-release *) - ki_arch : string; (* Kernel architecture. *) - ki_vmlinuz : string; (* The path of the vmlinuz file. *) - ki_vmlinuz_stat : G.statns; (* stat(2) of vmlinuz *) - ki_initrd : string option; (* Path of initramfs, if found. *) - ki_modpath : string; (* The module path. *) - ki_modules : string list; (* The list of module names. *) - ki_supports_virtio : bool; (* Kernel has virtio drivers? *) - ki_is_xen_kernel : bool; (* Is a Xen paravirt kernel? *) - ki_is_debug : bool; (* Is debug k...

This is a sort of follow-up to the Linux_bootloaders patch. It turns out all the kernel detection code is nicely self- contained and can therefore be moved to its own module. Rich.

Patch supplied by Mikhail Gordeev, posting for review. I have compile tested it and checked the code and it looks all fine to me, so ACK from my point of view. I did not actually run it because I don't have an ALT Linux install, but it doesn't seem as if it would affect any other distro. Rich.

...; diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml index 7967c0f..f5a716f 100644 --- a/v2v/convert_linux.ml +++ b/v2v/convert_linux.ml @@ -795,13 +795,9 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source = *) let mkinitrd_kv = let modpath = kernel.ki_modpath in - let len = String.length modpath in - try - let i = String.rindex modpath '/' in - String.sub modpath (i+1) (len - (i+1)) - with - Not_found -> - invalid_arg (sprintf "invalid module path: %s" modpath) in + m...

...t; in - Some { - ki_app = app; - ki_name = name; - ki_version = version; - ki_arch = arch; - ki_vmlinuz = vmlinuz; - ki_vmlinuz_stat = vmlinuz_stat; - ki_initrd = initrd; - ki_modpath = modpath; - ki_modules = modules; - ki_supports_virtio_blk = supports_virtio_blk; - ki_supports_virtio_net = supports_virtio_net; - ki_supports_virtio_rng = supports_virtio_rng; - ki_supports_virtio_balloon = supports_virtio_bal...

Yaniv pointed out in https://bugzilla.redhat.com/show_bug.cgi?id=1438794 that virt-v2v both doesn't install the virtio-rng driver for Windows, and doesn't give the guest a virtio-rng PCI device either. There are two problems here: Firstly the Windows virtio-rng driver isn't included in the exploded tree (/usr/share/virtio-win) so it doesn't get copied into the guest. The solution

v1 was posted here: https://www.redhat.com/archives/libguestfs/2017-April/msg00031.html v1 -> v2: - Add support for -o glance. - Add support for -o qemu. - Fix the -o libvirt support for balloon as pointed out by Dan. - Fix a test failure caused by changing libvirt XML output. Rich.

Metapackages are valid packages with no files, used to easily install something without manually installing bits. This is the case of the "kernel" package in Fedora/RHEL/etc in the last couple of years. --- v2v/linux_kernels.ml | 1 - 1 file changed, 1 deletion(-) diff --git a/v2v/linux_kernels.ml b/v2v/linux_kernels.ml index 9a41225a..78c1ee59 100644 --- a/v2v/linux_kernels.ml +++

...aps _ = run_update_initramfs_command () ) + else if family = `ALT_family then ( + (* ALT utilities to work with initrd does not support adding modules + * to an existing initrd + *) + let kver = kernel.ki_version in + let kmodpath = kernel.ki_modpath in + + (* find module files *) + let files = g#find kmodpath |> Array.to_list in + let test f = + let r m = sprintf ".*/%s\\.ko$" m |> Str.regexp in + let rmodules = List.map r modules in + let fold_f acc mr = acc || Str.string_match m...

...; diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml index 7967c0f..cadd515 100644 --- a/v2v/convert_linux.ml +++ b/v2v/convert_linux.ml @@ -795,10 +795,8 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source = *) let mkinitrd_kv = let modpath = kernel.ki_modpath in - let len = String.length modpath in try - let i = String.rindex modpath '/' in - String.sub modpath (i+1) (len - (i+1)) + last_part_of modpath '/' with Not_found -> invalid_arg (sprintf "invalid...

...g modules > + * to an existing initrd > + *) So how are users supposed to include modules they want? Recreating the initrd manually every time? What about https://en.altlinux.org/Make-initrd ? > + let kver = kernel.ki_version in > + let kmodpath = kernel.ki_modpath in > + > + (* find module files *) > + let files = g#find kmodpath |> Array.to_list in > + let test f = > + let r m = sprintf ".*/%s\\.ko$" m |> Str.regexp in > + let rmodules = List.map r modules in > + let fold_f...

...b/v2v/convert_linux.ml > index 7967c0f..f5a716f 100644 > --- a/v2v/convert_linux.ml > +++ b/v2v/convert_linux.ml > @@ -795,13 +795,9 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source = > *) > let mkinitrd_kv = > let modpath = kernel.ki_modpath in > - let len = String.length modpath in > - try > - let i = String.rindex modpath '/' in > - String.sub modpath (i+1) (len - (i+1)) > - with > - Not_found -> > - invalid_arg (sprintf "invalid module pa...

...ndex 7967c0f..f5a716f 100644 > > --- a/v2v/convert_linux.ml > > +++ b/v2v/convert_linux.ml > > @@ -795,13 +795,9 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source = > > *) > > let mkinitrd_kv = > > let modpath = kernel.ki_modpath in > > - let len = String.length modpath in > > - try > > - let i = String.rindex modpath '/' in > > - String.sub modpath (i+1) (len - (i+1)) > > - with > > - Not_found -> > > - invalid_a...

This way it is possible to use rm_rf_only_files, but not removing specific files. --- mllib/common_utils.ml | 8 +++++++- mllib/common_utils.mli | 5 ++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/mllib/common_utils.ml b/mllib/common_utils.ml index 516cff3..3737b4c 100644 --- a/mllib/common_utils.ml +++ b/mllib/common_utils.ml @@ -640,13 +640,19 @@ let rmdir_on_exit = *

...(* Kernel architecture. *) ki_vmlinuz : string; (* The path of the vmlinuz file. *) - ki_vmlinuz_stat : G.stat; (* stat(2) of vmlinuz *) + ki_vmlinuz_stat : G.statns; (* stat(2) of vmlinuz *) ki_initrd : string option; (* Path of initramfs, if found. *) ki_modpath : string; (* The module path. *) ki_modules : string list; (* The list of module names. *) @@ -165,7 +165,7 @@ let rec convert ~verbose ~keep_serial_console (g : G.guestfs) inspect source = if not (g#is_dir ~followsymlinks:true modpath) then raise Not...