[Libguestfs] [PATCH v3 08/13] v2v: factor out preserving overlays for debugging

[Richard W.M. Jones]

On Tue, Oct 20, 2015 at 04:08:16PM +0300, Roman Kagan wrote:
> Signed-off-by: Roman Kagan <rkagan at virtuozzo.com>
> ---
>  v2v/v2v.ml | 23 ++++++++++++-----------
>  1 file changed, 12 insertions(+), 11 deletions(-)
> 
> diff --git a/v2v/v2v.ml b/v2v/v2v.ml
> index 703038c..cc36422 100644
> --- a/v2v/v2v.ml
> +++ b/v2v/v2v.ml
> @@ -119,17 +119,7 @@ let rec main () =
>    output#create_metadata source targets target_buses guestcaps inspect
>                           target_firmware;
>  
> -  (* Save overlays if --debug-overlays option was used. *)
> -  if debug_overlays then (
> -    let overlay_dir = (new Guestfs.guestfs ())#get_cachedir () in
> -    List.iter (
> -      fun ov ->
> -        let saved_filename =
> -          sprintf "%s/%s-%s.qcow2" overlay_dir source.s_name ov.ov_sd in
> -        rename ov.ov_overlay_file saved_filename;
> -        printf (f_"Overlay saved as %s [--debug-overlays]\n") saved_filename
> -    ) overlays
> -  );
> +  if debug_overlays then preserve_overlays overlays source.s_name;
>  
>    message (f_"Finishing off");
>    delete_target_on_exit := false  (* Don't delete target on exit. *)
> @@ -916,4 +906,15 @@ and target_bus_assignment source targets guestcaps =
>      target_ide_bus = !ide_bus;
>      target_scsi_bus = !scsi_bus }
>  
> +and preserve_overlays overlays src_name =
> +  (* Save overlays if --debug-overlays option was used. *)
> +  let overlay_dir = (new Guestfs.guestfs ())#get_cachedir () in
> +  List.iter (
> +    fun ov ->
> +      let saved_filename =
> +        sprintf "%s/%s-%s.qcow2" overlay_dir src_name ov.ov_sd in
> +      rename ov.ov_overlay_file saved_filename;
> +      printf (f_"Overlay saved as %s [--debug-overlays]\n") saved_filename
> +  ) overlays
> +
>  let () = run_main_and_handle_errors main

Simple refactoring, so ACK.

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
libguestfs lets you edit virtual machines.  Supports shell scripting,
bindings from many languages.  http://libguestfs.org