search for: virtio_iso_path_matches_guest_os

...tio.ml index 5ec7664b..be281247 100644 --- a/v2v/windows_virtio.ml +++ b/v2v/windows_virtio.ml @@ -297,10 +297,11 @@ and ddb_regedits inspect drv_name drv_pciid = * been copied. *) and copy_drivers g inspect driverdir = - [] <> copy_from_virtio_win g inspect "/" driverdir - virtio_iso_path_matches_guest_os - (fun () -> - error (f_"root directory ‘/’ is missing from the virtio-win directory or ISO.\n\nThis should not happen and may indicate that virtio-win or virt-v2v is broken in some way. Please report this as a bug with a full debug log.")) + [] <> copy_from_libosinfo g...

...tio.ml index 5ec7664b..1468d207 100644 --- a/v2v/windows_virtio.ml +++ b/v2v/windows_virtio.ml @@ -297,10 +297,11 @@ and ddb_regedits inspect drv_name drv_pciid = * been copied. *) and copy_drivers g inspect driverdir = - [] <> copy_from_virtio_win g inspect "/" driverdir - virtio_iso_path_matches_guest_os - (fun () -> - error (f_"root directory ‘/’ is missing from the virtio-win directory or ISO.\n\nThis should not happen and may indicate that virtio-win or virt-v2v is broken in some way. Please report this as a bug with a full debug log.")) + [] <> copy_from_libosinfo g...

...gt; +++ b/v2v/windows_virtio.ml > @@ -254,28 +254,41 @@ and ddb_regedits inspect drv_name drv_pciid = > * been copied. > *) > and copy_drivers g inspect driverdir = > - let ret = ref false in > + List.length ( > + copy_from_virtio_win g inspect "/" driverdir virtio_iso_path_matches_guest_os > + ) > 0 You can write this as: [] <> copy_from_virtio_win g [etc...] which is also more efficient because the compiler will optimize it to a single test that the function doesn't return a cons. > +(* Copy all files from virtio_win directory/ISO located in [srcdir] > +...

...c4e 100644 --- a/v2v/windows_virtio.ml +++ b/v2v/windows_virtio.ml @@ -254,28 +254,41 @@ and ddb_regedits inspect drv_name drv_pciid = * been copied. *) and copy_drivers g inspect driverdir = - let ret = ref false in + List.length ( + copy_from_virtio_win g inspect "/" driverdir virtio_iso_path_matches_guest_os + ) > 0 + +(* Copy all files from virtio_win directory/ISO located in [srcdir] + * subdirectory and all its subdirectories to the [destdir]. The directory + * hierarchy is not preserved, meaning all files will be directly in [destdir]. + * The file list is filtered based on [filter] function. +...

...c4e 100644 --- a/v2v/windows_virtio.ml +++ b/v2v/windows_virtio.ml @@ -254,28 +254,41 @@ and ddb_regedits inspect drv_name drv_pciid = * been copied. *) and copy_drivers g inspect driverdir = - let ret = ref false in + List.length ( + copy_from_virtio_win g inspect "/" driverdir virtio_iso_path_matches_guest_os + ) > 0 + +(* Copy all files from virtio_win directory/ISO located in [srcdir] + * subdirectory and all its subdirectories to the [destdir]. The directory + * hierarchy is not preserved, meaning all files will be directly in [destdir]. + * The file list is filtered based on [filter] function. +...

...s source directory %s" dir; - let cmd = sprintf "cd %s && find -L -type f" (quote virtio_win) in + let cmd = sprintf "cd %s && find -L -type f" (quote dir) in let paths = external_command cmd in List.iter ( fun path -> - if virtio_iso_path_matches_guest_os path inspect then ( - let source = virtio_win // path in - let target = driverdir // - String.lowercase_ascii (Filename.basename path) in - debug "copying virtio driver bits: 'host:%s' -> '%s'" + if filter path i...

This installs packages with QEMU Guest Agent when converting Linux machine. The packages should be available on guest tools ISO. The patches work "as-is" but probably deserve some more attention: - it is "abusing" Winows_virtio code but renaming/refactoring everything to remove "windows" from the name and use "guest tools" seems like a lot of unnecesary

...this as a bug with a full debug log.")) + + (* Copy all files from virtio_win directory/ISO located in [srcdir] * subdirectory and all its subdirectories to the [destdir]. The directory * hierarchy is not preserved, meaning all files will be directly in [destdir]. @@ -433,6 +440,26 @@ and virtio_iso_path_matches_guest_os path inspect = with Not_found -> false +(* Given a path of a file relative to the root of the directory tree + * with virtio-win drivers, figure out if it's suitable for the + * specific Windows flavor of the current guest. + *) +and virtio_iso_path_matches_qemu_ga path inspect = + l...

...off-by: Roman Kagan <rkagan at virtuozzo.com> --- v2v/windows_virtio.ml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/v2v/windows_virtio.ml b/v2v/windows_virtio.ml index 6c8396c..354aa19 100644 --- a/v2v/windows_virtio.ml +++ b/v2v/windows_virtio.ml @@ -291,17 +291,6 @@ and virtio_iso_path_matches_guest_os path inspect = * elements. *) let lc_path = String.lowercase_ascii path in - let lc_basename = Filename.basename lc_path in - - let extension = - match last_part_of lc_basename '.' with - | Some x -> x - | None -> raise Not_found - in - - (*...

...quot; true guestfish --ro -a "$d/windows-sda" -i < "$script" > "$response" diff -u "$expected" "$response" diff --git a/v2v/utils.ml b/v2v/utils.ml index 2a668ec..d65bb94 100644 --- a/v2v/utils.ml +++ b/v2v/utils.ml @@ -179,7 +179,7 @@ let virtio_iso_path_matches_guest_os path inspect = in (* Skip files without specific extensions. *) - let extensions = ["cat"; "inf"; "pdb"; "sys"] in + let extensions = ["cat"; "dll"; "inf"; "pdb"; "sys"] in if not (List....

...rence between v2 & v3 is below. All my other comments in the cover letter of v2 also apply here. Rich. --- a/v2v/windows_virtio.ml +++ b/v2v/windows_virtio.ml @@ -293,8 +293,7 @@ and copy_drivers g inspect driverdir = [] <> copy_from_virtio_win g inspect "/" driverdir virtio_iso_path_matches_guest_os (fun () -> - error "driver directory ‘%s’ is missing from the virtio-win directory or ISO.\n\nThis should not happen and may indicate that virtio-win or virt-v2v is broken in some way. Please report this as a bug with a full debug log." - driverdir) + error &...

...ISO to be copied in. It's not clear to me whether these files are needed - I suspect not. It also causes the tests to fail, although only when you have installed the optional ocaml oUnit2 package: ---------------------------------------------------------------------- Error: virt-v2v:3:Utils.virtio_iso_path_matches_guest_os. File "/home/rjones/d/libguestfs/v2v/oUnit-virt-v2v-choo.home.annexia.org#01.log", line 8, characters 1-1: Error: virt-v2v:3:Utils.virtio_iso_path_matches_guest_os (in the log). Raised at file "src/oUnitAssert.ml", line 45, characters 8-27 Called from file "list.ml",...

...Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com> --- v2v/windows_virtio.ml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/v2v/windows_virtio.ml b/v2v/windows_virtio.ml index 354aa19..334e347 100644 --- a/v2v/windows_virtio.ml +++ b/v2v/windows_virtio.ml @@ -330,6 +330,8 @@ and virtio_iso_path_matches_guest_os path inspect = (6, 3, not_client) else if pathelem "w10" || pathelem "win10" then (10, 0, is_client) + else if pathelem "2k16" || pathelem "win2016" then + (10, 0, not_client) else raise Not_found in --...

On Tue, Nov 13, 2018 at 01:41:40PM +0100, Tomáš Golembiovský wrote: > + List.length ( > + copy_from_virtio_win g inspect "/" driverdir virtio_iso_path_matches_guest_os > + ) > 0 Any reason not to change this to copy_from_virtio_win ... <> [] as described in the previous comment on this patch? More comments here: https://www.redhat.com/archives/libguestfs/2018-November/msg00081.html Rich. -- Richard Jones, Virtualization Group, Red Hat http://peo...

changes in v4: - fix call to install_local changes in v2: - moved copy_drivers above copy_files - renamed copy_files to copy_from_virtio_win - renamed install to install_local - use rpm instead of yum This installs packages with QEMU Guest Agent when converting Linux machine. The packages should be available on guest tools ISO. The patches work "as-is" but probably deserve some more

changes in v2: - moved copy_drivers above copy_files - renamed copy_files to copy_from_virtio_win - renamed install to install_local - use rpm instead of yum This installs packages with QEMU Guest Agent when converting Linux machine. The packages should be available on guest tools ISO. The patches work "as-is" but probably deserve some more attention: - it is "abusing"

changes in v5: - simplified expression in copy_drivers - new commit fixing path constructions - indentation fixes changes in v4: - fix call to install_local changes in v2: - moved copy_drivers above copy_files - renamed copy_files to copy_from_virtio_win - renamed install to install_local - use rpm instead of yum This installs packages with QEMU Guest Agent when converting Linux machine. The

changes in v3: - fix call to install_local changes in v2: - moved copy_drivers above copy_files - renamed copy_files to copy_from_virtio_win - renamed install to install_local - use rpm instead of yum This installs packages with QEMU Guest Agent when converting Linux machine. The packages should be available on guest tools ISO. The patches work "as-is" but probably deserve some more

This patch series integrates libosinfo in virt-v2v to get the list of files for Windows from libosinfo, if possible. The actual data is still from virtio-win, just unpacked. Pino Toscano (3): build: require libosinfo v2v: add a minimal libosinfo interface v2v: try to get windows driver files from libosinfo m4/guestfs-v2v.m4 | 3 + v2v/Makefile.am | 9 +-

...ture). Thanks: Vadim Rozenfeld, Tingting Zheng. --- v2v/windows_virtio.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v2v/windows_virtio.ml b/v2v/windows_virtio.ml index d78bb0c..df1df5a 100644 --- a/v2v/windows_virtio.ml +++ b/v2v/windows_virtio.ml @@ -426,7 +426,7 @@ and virtio_iso_path_matches_guest_os path inspect = in (* Skip files without specific extensions. *) - let extensions = ["cat"; "inf"; "pdb"; "sys"] in + let extensions = ["cat"; "dll"; "inf"; "pdb"; "sys"] in if not (List....