search for: rcaps

...iff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml index 7c42791..7d65516 100644 --- a/v2v/convert_linux.ml +++ b/v2v/convert_linux.ml @@ -38,7 +38,7 @@ open Linux_kernels module G = Guestfs (* The conversion function. *) -let rec convert ~keep_serial_console (g : G.guestfs) inspect source rcaps = +let rec convert (g : G.guestfs) inspect source output rcaps = (*----------------------------------------------------------------------*) (* Inspect the guest first. We already did some basic inspection in * the common v2v.ml code, but that has to deal with generic guests @@ -1005,7 +1...

Give the caller certain control over what kind of interface to use for virtual disks, network and video cards upon conversion. For that, make convert functions accept additional rcaps parameter containing an object with optional capabilities similar to the ones produced on output, with None indicating that the decision is left to the convert function itself. To facilicate review, this patch unconditionally passes rcaps with no preferences; populating it with more sensible value...

The bug is: https://bugzilla.redhat.com/show_bug.cgi?id=1161019 This makes a few other minor refactorings to the code. Rich.

Give the caller certain control over what kind of interface to use for virtual disks, network and video cards upon conversion. For that, make convert functions accept additional rcaps parameter containing an object with optional capabilities similar to the ones produced on output, with None indicating that the decision is left to the convert function itself. To facilicate review, this patch unconditionally passes rcaps with no preferences; populating it with more sensible value...

The decision on which device type to use for disks, network and video cards on output used to be taken deep inside the converting functions. This is not always desirable. In particular, there are scenarios when this decision is made before the convertion takes place. E.g. in in-place mode, the decisions are taken and the output VM configuration is created outside of v2v tool. This patchset

...v2v/windows_virtio.ml > @@ -33,57 +33,105 @@ let virtio_win = > with Not_found -> > Guestfs_config.datadir // "virtio-win" > > -let rec install_drivers g inspect systemroot root current_cs = > +let rec install_drivers g inspect systemroot root current_cs rcaps = > (* Copy the virtio drivers to the guest. *) > let driverdir = sprintf "%s/Drivers/VirtIO" systemroot in > g#mkdir_p driverdir; > > if not (copy_drivers g inspect driverdir) then ( > + let block_type = match rcaps.rcaps_block_bus with > +...

...boot_drive then "True" else "False"; ] in diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml index 0a2e439..04b7739 100644 --- a/v2v/convert_linux.ml +++ b/v2v/convert_linux.ml @@ -803,8 +803,9 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source rcaps = * major number of vdX block devices. If we change it, RHEL 3 * KVM guests won't boot. *) - [ "virtio"; "virtio_ring"; "virtio_blk"; "virtio_net"; - "virtio_pci" ] + List.filter (...

...boot_drive then "True" else "False"; ] in diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml index c9a5f69..b64d6fb 100644 --- a/v2v/convert_linux.ml +++ b/v2v/convert_linux.ml @@ -805,8 +805,9 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source rcaps = * major number of vdX block devices. If we change it, RHEL 3 * KVM guests won't boot. *) - [ "virtio"; "virtio_ring"; "virtio_blk"; "virtio_net"; - "virtio_pci" ] + List.filter (...

The decision on which device type to use for disks, network and video cards on output used to be taken deep inside the converting functions. This is not always desirable. In particular, there are scenarios when this decision is made before the convertion takes place. E.g. in in-place mode, the decisions are taken and the output VM configuration is created outside of v2v tool. This patchset

...boot_drive then "True" else "False"; ] in diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml index 0a2e439..951aa32 100644 --- a/v2v/convert_linux.ml +++ b/v2v/convert_linux.ml @@ -803,8 +803,9 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source rcaps = * major number of vdX block devices. If we change it, RHEL 3 * KVM guests won't boot. *) - [ "virtio"; "virtio_ring"; "virtio_blk"; "virtio_net"; - "virtio_pci" ] + List.filter (...

...++++++++----- 2 files changed, 78 insertions(+), 20 deletions(-) diff --git a/v2v/convert_windows.ml b/v2v/convert_windows.ml index 5daae6c..ab28636 100644 --- a/v2v/convert_windows.ml +++ b/v2v/convert_windows.ml @@ -43,18 +43,25 @@ let convert ~keep_serial_console (g : G.guestfs) inspect source rcaps = try Sys.getenv "VIRT_TOOLS_DATA_DIR" with Not_found -> Guestfs_config.datadir // "virt-tools" in - (* Check if RHEV-APT exists. This is optional. *) - let rhev_apt_exe = virt_tools_data_dir // "rhev-apt.exe" in - let rhev_apt_exe = + (* Check if e...

..._allocation; diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml index f9e811c8d..1ada36115 100644 --- a/v2v/convert_linux.ml +++ b/v2v/convert_linux.ml @@ -34,7 +34,7 @@ open Linux_kernels module G = Guestfs (* The conversion function. *) -let convert (g : G.guestfs) inspect source output rcaps = +let convert (g : G.guestfs) inspect source output rcaps _ = (*----------------------------------------------------------------------*) (* Inspect the guest first. We already did some basic inspection in * the common v2v.ml code, but that has to deal with generic guests diff --git a/v2...

The decision on which device type to use for disks, network and video cards on output used to be taken deep inside the converting functions. This is not always desirable. In particular, there are scenarios when this decision is made before the convertion takes place. E.g. in in-place mode, the decisions are taken and the output VM configuration is created outside of v2v tool. This patchset

..._store; } diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml index f9e811c8d..1ada36115 100644 --- a/v2v/convert_linux.ml +++ b/v2v/convert_linux.ml @@ -34,7 +34,7 @@ open Linux_kernels module G = Guestfs (* The conversion function. *) -let convert (g : G.guestfs) inspect source output rcaps = +let convert (g : G.guestfs) inspect source output rcaps _ = (*----------------------------------------------------------------------*) (* Inspect the guest first. We already did some basic inspection in * the common v2v.ml code, but that has to deal with generic guests diff --git a/v2...

It seems newer versions of VMware Tools for Windows can be uninstalled also when the guest does not run on VMware anymore. Hence, attempt to uninstall them during a conversion, reusing the same code already used to uninstall Parallel Tools. This was tested with the following Windows guests: - Windows 2008r2 - Windows 2012r2 - Windows 2016 - Windows 7 - Windows 8 - Windows 10 Pino Toscano (2):

...boot_drive then "True" else "False"; ] in diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml index 0a2e439..90355fb 100644 --- a/v2v/convert_linux.ml +++ b/v2v/convert_linux.ml @@ -803,8 +803,9 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source rcaps = * major number of vdX block devices. If we change it, RHEL 3 * KVM guests won't boot. *) - [ "virtio"; "virtio_ring"; "virtio_blk"; "virtio_net"; - "virtio_pci" ] + List.filter (...

--- v2v/windows.ml | 24 ++++++++++++++++++++++++ v2v/windows.mli | 6 ++++++ 2 files changed, 30 insertions(+) diff --git a/v2v/windows.ml b/v2v/windows.ml index 23d589b00..dde64e677 100644 --- a/v2v/windows.ml +++ b/v2v/windows.ml @@ -19,6 +19,7 @@ open Printf open Common_gettext.Gettext +open Std_utils open Tools_utils open Utils @@ -45,3 +46,26 @@ and check_app { Guestfs.app2_name

...++++++------- 2 files changed, 82 insertions(+), 31 deletions(-) diff --git a/v2v/convert_windows.ml b/v2v/convert_windows.ml index 5daae6c..f88d163 100644 --- a/v2v/convert_windows.ml +++ b/v2v/convert_windows.ml @@ -43,18 +43,25 @@ let convert ~keep_serial_console (g : G.guestfs) inspect source rcaps = try Sys.getenv "VIRT_TOOLS_DATA_DIR" with Not_found -> Guestfs_config.datadir // "virt-tools" in - (* Check if RHEV-APT exists. This is optional. *) - let rhev_apt_exe = virt_tools_data_dir // "rhev-apt.exe" in - let rhev_apt_exe = + (* Check if e...

The decision on which device type to use for disks, network and video cards on output used to be taken deep inside the converting functions. This is not always desirable. In particular, there are scenarios when this decision is made before the convertion takes place. E.g. in in-place mode, the decisions are taken and the output VM configuration is created outside of v2v tool. This patchset

Patch v2 was here: https://www.redhat.com/archives/libguestfs/2019-April/thread.html#00114 There's no change here except that I've rebased it against the latest master branch and retested. There was a comment by Pino (https://www.redhat.com/archives/libguestfs/2019-April/msg00117.html) which isn't incorporated into this patch. Rich.