search for: as_opt

This is built on top of the following patch series: https://www.redhat.com/archives/libguestfs/2019-April/msg00054.html Rich.

Pass (again) around the libvirt URI string in the various input_libvirt subclasses so that input_libvirt#as_options does not need to connect to print the connection URI. As related change: pass input_conn as non-optional string parameter in classes that require one (all but input_libvirt_other, basically). This avoids the need for extra checks. --- v2v/input_libvirt.ml | 10 +++++----- v2v/i...

...a/v2v/v2v.ml b/v2v/v2v.ml index fe16131..564c5da 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -55,65 +55,8 @@ let rec main () = printf "%s: %s %s (%s)\n%!" prog Config.package_name Config.package_version Config.host_cpu; - message (f_"Opening the source %s") input#as_options; - let source = input#source () in - - (* Print source and stop. *) - if print_source then ( - printf (f_"Source guest information (--print-source option):\n"); - printf "\n"; - printf "%s\n" (string_of_source source); - exit 0 - ); - - if verbose...

...ning the overlay"); @@ -75,43 +76,6 @@ let rec main () = g#launch (); - (* Work out where we will write the final output. Do this early - * just so we can display errors to the user before doing too much - * work. - *) - message (f_"Initializing the target %s") output#as_options; - let targets = - List.map ( - fun ov -> - (* What output format should we use? *) - let format = - match output_format, ov.ov_source.s_format with - | Some format, _ -> format (* -of overrides everything *) - | None, Some format ->...

..."transports", (fun { vddk_transports } -> vddk_transports); + "vimapiver", (fun { vddk_vimapiver } -> vddk_vimapiver) ] in + object - inherit input_libvirt password libvirt_uri guest + inherit input_libvirt password libvirt_uri guest as super + + method as_options = + let pt_options = + String.concat "" ( + List.map ( + fun (name, get_field) -> + match get_field vddk_options with + | None -> "" + | Some field -> sprintf " --vddk-%s %s" name field + ) pa...

...rget_firmware guestcaps target_firmware = match target_firmware with | TargetBIOS -> () diff --git a/v2v/output_local.ml b/v2v/output_local.ml index 9ba1d6f..9c105ef 100644 --- a/v2v/output_local.ml +++ b/v2v/output_local.ml @@ -30,8 +30,6 @@ class output_local dir = object method as_options = sprintf "-o local -os %s" dir - method supported_firmware = [ TargetBIOS; TargetUEFI ] - method prepare_targets source targets = List.map ( fun t -> @@ -39,6 +37,17 @@ class output_local dir = object { t with target_file = target_file } ) targets...

...v2v/output_libvirt.ml b/v2v/output_libvirt.ml index 5fa338f..e934335 100644 --- a/v2v/output_libvirt.ml +++ b/v2v/output_libvirt.ml @@ -340,6 +340,7 @@ class output_libvirt oc output_pool = object inherit output val mutable capabilities_doc = None + val mutable pool_name = None method as_options = match oc with @@ -392,6 +393,15 @@ class output_libvirt oc output_pool = object | Some dir when not (is_directory dir) -> error (f_"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path element is not a local directory. See virt-v...

...string_of_target_bus_slots "scsi" buses.target_scsi_bus +let open_guestfs () = + (* Open the guestfs handle. *) + let g = new Guestfs.guestfs () in + if trace () then g#set_trace true; + if verbose () then g#set_verbose true; + g + class virtual input = object method virtual as_options : string method virtual source : unit -> source diff --git a/v2v/types.mli b/v2v/types.mli index 55fb09a..9e8932e 100644 --- a/v2v/types.mli +++ b/v2v/types.mli @@ -253,3 +253,8 @@ type output_allocation = Sparse | Preallocated type vmtype = Desktop | Server (** Type of [--vmtype] opt...

...ring_of_target_buses buses = + string_of_target_bus_slots "virtio-blk" buses.target_virtio_blk_bus ^ + string_of_target_bus_slots "ide" buses.target_ide_bus ^ + string_of_target_bus_slots "scsi" buses.target_scsi_bus + class virtual input = object method virtual as_options : string method virtual source : unit -> source diff --git a/v2v/types.mli b/v2v/types.mli index 6f9bf0d..45014a7 100644 --- a/v2v/types.mli +++ b/v2v/types.mli @@ -196,6 +196,20 @@ and guestcaps_video_type = QXL | Cirrus val string_of_guestcaps : guestcaps -> string +type target_...

...or reason. *) List.map (fun (_, ov) -> TargetFile (tmpdir // ov.ov_sd)) overlays diff --git a/v2v/output_json.ml b/v2v/output_json.ml index 29c4a1d0..b23420a7 100644 --- a/v2v/output_json.ml +++ b/v2v/output_json.ml @@ -71,7 +71,7 @@ class output_json dir json_options = object method as_options = sprintf "-o json -os %s" dir - method prepare_targets source_name overlays = + method prepare_targets source_name overlays _ = List.mapi ( fun i (_, ov) -> let outname = diff --git a/v2v/output_libvirt.ml b/v2v/output_libvirt.ml index dfd5d1a3..6c6b23ed 1...

Originally posted here: https://www.redhat.com/archives/libguestfs/2019-April/thread.html#00054 https://www.redhat.com/archives/libguestfs/2019-April/msg00076.html https://www.redhat.com/archives/libguestfs/2019-April/msg00126.html This is a rebase on top of current master branch with no other changes. The first patch in the old series was pushed a while back, and the last "TEMPORARY"

...m.ml +++ b/v2v/output_vdsm.ml @@ -30,6 +30,7 @@ type vdsm_params = { image_uuid : string; vol_uuids : string list; vm_uuid : string; + ovf_output : string; } class output_vdsm verbose os vdsm_params vmtype output_alloc = @@ -37,11 +38,12 @@ object inherit output verbose method as_options = - sprintf "-o vdsm -os %s --vdsm-image-uuid %s%s --vdsm-vm-uuid %s%s" os + sprintf "-o vdsm -os %s --vdsm-image-uuid %s%s --vdsm-vm-uuid %s --vdsm-ovf-output %s%s" os vdsm_params.image_uuid (String.concat "" (List.map (sprintf "...

v2 was posted here: https://www.redhat.com/archives/libguestfs/2019-July/msg00115.html This also has links to earlier versions. v3: - The 01/11 patch in v2 included a bunch of unnecessary plus one necessary change to how input_password is passed around. I moved the necessary change into the final patch (implementing SSH password authentication) and dropped the rest. - The 01/11

The first two patches implement the change discussed here: https://www.redhat.com/archives/libguestfs/2016-April/msg00178.html The third patch fixes the mapping of inspection data to OVF VmType which was inherited directly from old virt-v2v and had never been changed. It had a number of problems. The fourth patch is only slightly related to the others. It adds an extra slow test to ensure that

v3 posted here: https://www.redhat.com/archives/libguestfs/2019-July/msg00200.html v4: - The first patch in the v3 series was just a trivial doc whitespace fix so I pushed it. - There's a new patch using the nbdkit-retry-filter. This is not actually upstream in nbdkit but we know enough about how it will work. - Rebased against master and reran the tests. Rich.

...disk.ml index 84a2f85..970f552 100644 --- a/v2v/input_disk.ml +++ b/v2v/input_disk.ml @@ -24,8 +24,8 @@ open Common_utils open Types open Utils -class input_disk verbose input_format disk = object - inherit input verbose +class input_disk input_format disk = object + inherit input method as_options = sprintf "-i disk%s %s" diff --git a/v2v/input_disk.mli b/v2v/input_disk.mli index 44f99b1..4f8d5cd 100644 --- a/v2v/input_disk.mli +++ b/v2v/input_disk.mli @@ -18,7 +18,7 @@ (** [-i disk] source. *) -val input_disk : bool -> string option -> string -> Types.input...

...v2v/v2v.ml +++ b/v2v/v2v.ml @@ -55,6 +55,9 @@ let rec main () = printf "%s: %s %s (%s)\n%!" prog Config.package_name Config.package_version Config.host_cpu; + if debug_gc then + at_exit (fun () -> Gc.compact()); + message (f_"Opening the source %s") input#as_options; let source = input#source () in @@ -63,8 +66,6 @@ let rec main () = printf (f_"Source guest information (--print-source option):\n"); printf "\n"; printf "%s\n" (string_of_source source); - if debug_gc then - Gc.compact (); exit 0...

...y: Tomáš Golembiovský <tgolembi@redhat.com> --- v2v/input_ova.ml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/v2v/input_ova.ml b/v2v/input_ova.ml index db884d9..f76fe82 100644 --- a/v2v/input_ova.ml +++ b/v2v/input_ova.ml @@ -38,6 +38,12 @@ object method as_options = "-i ova " ^ ova method source () = + + let untar ?(format = "") file outdir = + let cmd = [ "tar"; sprintf "-x%sf" format; file; "-C"; outdir ] in + if run_command cmd <> 0 then + error (f_"error unpacking %...

...y: Tomáš Golembiovský <tgolembi@redhat.com> --- v2v/input_ova.ml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/v2v/input_ova.ml b/v2v/input_ova.ml index 61930f0..85954a3 100644 --- a/v2v/input_ova.ml +++ b/v2v/input_ova.ml @@ -38,6 +38,12 @@ object method as_options = "-i ova " ^ ova method source () = + + let untar ?(format = "") file outdir = + let cmd = [ "tar"; sprintf "-x%sf" format; file; "-C"; outdir ] in + if run_command cmd <> 0 then + error (f_"error unpacking %...

...ass output_libvirt oc output_pool = +object (self) inherit output val mutable capabilities_doc = None val mutable pool_name = None + val lazy_conn = lazy (Libvirt.Connect.connect ?name:oc ()) + + method private conn : Libvirt.rw Libvirt.Connect.t = + Lazy.force lazy_conn method as_options = match oc with @@ -71,13 +76,10 @@ class output_libvirt oc output_pool = object | Some uri -> sprintf "-o libvirt -oc %s -os %s" uri output_pool method prepare_targets source overlays _ _ _ _ = - (* Open the connection to libvirt. *) - let conn = Libvirt.Conne...