similar to: [PATCH 0/4] v2v: simplify driver copying from virtio-win iso

Libguestfs supports passing an ISO image as a source of virtio windows drivers to v2v. This series attempts to make it simpler and better scoped. Roman Kagan (3): v2v: consolidate virtio-win file copying v2v: copy virtio drivers without guestfs handle leak v2v: drop useless forced gc --- changes since v2: - drop patch 4 (reuse of the master guestfs handle for hot-adding the ISO image)

In version 2: - Add a bunch of debugging output. - Recognize Windows Vista, Windows 10. - Compare driver paths case-insensitively.

Refactor copying of virtio windows drivers into the guest so that the matching of the drivers to the guest os flavor and copying the files happens one next to the other in a single function, and no guestfs handle (nor any other irrelevant info) is leaked outside. Signed-off-by: Roman Kagan <rkagan@virtuozzo.com> --- changes since v1: - former patch #3 - updated usage of string functions

Refactor copying of virtio windows drivers into the guest so that the matching of the drivers to the guest os flavor and copying the files happens one next to the other in a single function, and no guestfs handle (nor any other irrelevant info) is leaked outside. Signed-off-by: Roman Kagan <rkagan@virtuozzo.com> --- v2v/convert_windows.ml | 77 ++++++++++------- v2v/utils.ml |

https://github.com/rwmjones/libguestfs/tree/rewrite-virtio-copy-drivers Instead of trying to split and parse elements from virtio-win paths, use the '*.inf' files supplied with the drivers to control how Windows drivers are installed. The following emails best explain how this works: https://www.redhat.com/archives/libguestfs/2015-October/msg00352.html

This makes several changes to the handling of virtio-win drivers: The VIRTIO_WIN_DIR environment variable has been renamed VIRTIO_WIN (but you can still use the old name). You can point the VIRTIO_WIN either at a RHEL virtio-win directory (ie. /usr/share/virtio-win), OR at a loopback-mounted virtio-win ISO, OR at the virtio-win.iso file itself. In the latter case, libguestfs is used to open the

This makes several changes to the handling of virtio-win drivers: The VIRTIO_WIN_DIR environment variable has been renamed VIRTIO_WIN (but you can still use the old name). You can point the VIRTIO_WIN either at a RHEL virtio-win directory (ie. /usr/share/virtio-win), OR at a loopback-mounted virtio-win ISO, OR at the virtio-win.iso file itself. In the latter case, libguestfs is used to open the

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

On Wed, Nov 07, 2018 at 12:53:18PM +0100, Tomáš Golembiovský wrote: > Changed the function to be more generic and renamed. > The only change in behavior is in produced debug messages. > > Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com> > --- > v2v/windows_virtio.ml | 48 ++++++++++++++++++++++++++++--------------- > 1 file changed, 31 insertions(+), 17

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 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 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

First patch just fixes installing guest tools from directory that was broken. Second patch revamps how virt-v2v chooses from which directory install guest tools on Linux. Details in commit message. Tomáš Golembiovský (2): v2v: fix path to source when copying files from guest tools directory v2v: allow alternative directories for distributions v2v/windows_virtio.ml | 67

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

This is my version of this patch which I think improves it in a number of ways. Firstly instead of having the bare boolean parameter ‘ok_if_missing’ we pass in the function we want to call along the directory missing path. This change then allows us to print a more useful error or warning message given the context of the call, and the new message is actionable too, so the user knows what has to

Sorry, there was a small mistake in v2 of the patch. The difference 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

This is why I shouldn't program before lunchtime ... v2 & v3 omitted gettext (‘f_()’) annotations around the warning and error strings. Fixed in this version. My cover letter for v2 still applies here. Rich.

Copy the appropriate driver files from the virtio-win storage into %SYSTEMROOT%\Drivers\VirtIO once they are discovered, and stick to using those copies later on. This way the knowledge of where the drivers come from originally is consolidated in one place, so the lifetime of the associated entities becomes easier to control (to be implemented in followup patches). Signed-off-by: Roman Kagan

First patch just fixes installing guest tools from directory that was broken. Second patch revamps how virt-v2v chooses from which directory install guest tools on Linux. Details in commit message. v2: - included comments from Pino and Rich - added test Tomáš Golembiovský (3): v2v: fix path to source when copying files from guest tools directory v2v: allow alternative directories for

On Tue, Feb 09, 2016 at 05:53:57PM +0300, Roman Kagan wrote: > diff --git a/v2v/windows_virtio.ml b/v2v/windows_virtio.ml > index bdce038..8e0430c 100644 > --- a/v2v/windows_virtio.ml > +++ b/v2v/windows_virtio.ml > @@ -33,57 +33,105 @@ let virtio_win = > with Not_found -> > Guestfs_config.datadir // "virtio-win" > > -let rec install_drivers g