search for: output_format

...able documentation dib: add tgz output format dib/Makefile.am | 14 +++- dib/cmdline.ml | 62 +++++++--------- dib/cmdline.mli | 6 +- dib/dib.ml | 148 +++++++++++++++++++------------------ dib/elements.ml | 28 +++++-- dib/output_format.ml | 176 ++++++++++++++++++++++++++++++++++++++++++++ dib/output_format.mli | 122 ++++++++++++++++++++++++++++++ dib/output_format_docker.ml | 56 ++++++++++++++ dib/output_format_qcow2.ml | 55 ++++++++++++++ dib/output_format_raw.ml | 31 ++++++++ dib/output_format_tar.ml...

...0644 --- a/v2v/cmdline.ml +++ b/v2v/cmdline.ml @@ -337,7 +337,7 @@ read the man page virt-v2v(1). (* Parse the output mode. *) if output_mode <> `Not_set && in_place then error (f_"-o and --in-place cannot be used at the same time"); - let output = + let output, output_format, output_alloc = match output_mode with | `Glance -> if output_conn <> None then @@ -348,7 +348,8 @@ read the man page virt-v2v(1). error (f_"-o glance: --qemu-boot option cannot be used in this output mode"); if not do_copy then error (f_...

...g directory. *) let infile = @@ -474,14 +475,15 @@ let main () = * thing a copy does is to remove the template tag (since it's always * copied out of the cache directory). *) - tr `Copy ((`Filename, output_filename) :: remove `Template itags); + if infile <> output_format then + tr `Copy ((`Filename, output_filename) :: remove `Template itags); tr `Copy ((`Filename, tempfile) :: remove `Template itags); (* We can rename a file instead of copying, but don't rename the * cache copy! *) if is_not `Template then ( - if not outp...

Previous patch contained a typo. Changed output_format -> output_filename. Rich.

...do_copy in @@ -414,6 +417,6 @@ read the man page virt-v2v(1). Output_vdsm.output_vdsm os vdsm_params vmtype output_alloc in input, output, - debug_overlays, do_copy, in_place, network_map, no_trim, + compressed, debug_overlays, do_copy, in_place, network_map, no_trim, output_alloc, output_format, output_name, print_source, root_choice diff --git a/v2v/v2v.ml b/v2v/v2v.ml index dabec7f..f1ebb45 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -50,7 +50,7 @@ let () = Random.self_init () let rec main () = (* Handle the command line. *) let input, output, - debug_overlays, do_copy, in_...

I'm interested to hear opinions on whether this makes the code clearer, or not. This is virt-v2v, but many other virt-* tools work the same way, and analogous changes could be made. Currently when command line argument parsing is done in 'cmdline.ml' the list of parsed parameters is passed to the main program in a very long tuple. Each parameter is strongly typed, but not named (so

This adds --print-target. In addition, v2 provides a machine-readable version (in JSON format). All of the record -> JSON boilerplate in this patch could be eliminated if we moved the baseline to OCaml 4.02. Rich.

....alexandre at gmail.com> wrote: > > On Mon, Nov 9, 2020 at 6:52 PM Fāng-ruì Sòng <maskray at google.com> wrote: > > Recent libm.a and libm.so are actually linker scripts > > > > % cat /usr/lib/x86_64-linux-gnu/libm.a > > /* GNU ld script > > */ > > OUTPUT_FORMAT(elf64-x86-64) > > GROUP ( /usr/lib/x86_64-linux-gnu/libm-2.31.a > > /usr/lib/x86_64-linux-gnu/libmvec.a ) > > % cat /usr/lib/x86_64-linux-gnu/libm.so > > /* GNU ld script > > */ > > OUTPUT_FORMAT(elf64-x86-64) > > GROUP ( /lib/x86_64-linux-gnu/libm.so.6 AS...

...e"; [ L"debug" ], Getopt.Int ("level", set_debug), s_"Set debug level"; [ S 'B' ], Getopt.Set_string ("path", basepath), s_"Base path of diskimage-builder library"; ] in let argspec = argspec @ Output_format.extra_args () in - let opthandle = create_standard_options argspec ~anon_fun:append_element usage_msg in + let opthandle = create_standard_options argspec ~anon_fun:append_element ~machine_readable:true usage_msg in Getopt.parse opthandle; let debug = !debug in @@ -226,13 +223,12 @@ rea...

...nce" "--qemu-boot"; if not do_copy then - error (f_"--no-copy and '-o glance' cannot be used at the same time"); + error_option_cannot_be_used_in_output_mode "glance" "--no-copy"; Output_glance.output_glance (), output_format, output_alloc @@ -356,9 +361,9 @@ read the man page virt-v2v(1). let output_storage = match output_storage with None -> "default" | Some os -> os in if qemu_boot then - error (f_"-o libvirt: --qemu-boot option cannot be used in this output mode&q...

...+++++++++++++ > v2v/virt-v2v.pod | 5 +++++ > 5 files changed, 43 insertions(+), 14 deletions(-) > > diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml > index 4f651825a..6aba4afb5 100644 > --- a/v2v/cmdline.ml > +++ b/v2v/cmdline.ml > @@ -44,6 +44,7 @@ type cmdline = { > output_format : string option; > output_name : string option; > print_source : bool; > + print_target : bool; > root_choice : root_choice; > } > > @@ -53,6 +54,7 @@ let parse_cmdline () = > let do_copy = ref true in > let machine_readable = ref false in > let p...

Some simple refactoring of virt-resize. I originally had the idea that we could turn virt-resize into a library (cf. virt-customize) and use it from virt-builder, but I now don't think that would make any meaningful difference. In particular we'd still have to open the handle the same number of times. These two patches are left over from my work on that. Rich.

...ven recompiled with -fveclib=none but it did not change anything. > And I believe that -fveclib=mvec will start working with LLVM-12. > > I have no idea what pulls libmvec in. Recent libm.a and libm.so are actually linker scripts % cat /usr/lib/x86_64-linux-gnu/libm.a /* GNU ld script */ OUTPUT_FORMAT(elf64-x86-64) GROUP ( /usr/lib/x86_64-linux-gnu/libm-2.31.a /usr/lib/x86_64-linux-gnu/libmvec.a ) % cat /usr/lib/x86_64-linux-gnu/libm.so /* GNU ld script */ OUTPUT_FORMAT(elf64-x86-64) GROUP ( /lib/x86_64-linux-gnu/libm.so.6 AS_NEEDED ( /lib/x86_64-linux-gnu/libmvec.so.1 ) ) > Regards, >...

...7b8d 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -58,6 +58,7 @@ let rec main () = let source = open_source input print_source in let source = amend_source source output_name network_map in let overlays = create_overlays source.s_disks in + let targets = init_targets overlays source output output_format in (* Open the guestfs handle. *) message (f_"Opening 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. - *...

...view.php/77/112/leroy-cug2010.pdf --- v2v/cmdline.ml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml index 6aba4afb5..fdd0f2614 100644 --- a/v2v/cmdline.ml +++ b/v2v/cmdline.ml @@ -627,11 +627,9 @@ read the man page virt-v2v(1). output_format, output_alloc in { - compressed = compressed; debug_overlays = debug_overlays; - do_copy = do_copy; in_place = in_place; network_map = network_map; - output_alloc = output_alloc; output_format = output_format; - output_name = output_name; - print_source = print_source; print_tar...

...dline.ml +++ b/v2v/cmdline.ml @@ -32,6 +32,7 @@ let parse_cmdline () = let do_copy = ref true in let input_conn = ref "" in let input_format = ref "" in + let in_place = ref false in let machine_readable = ref false in let output_conn = ref "" in let output_format = ref "" in @@ -147,6 +148,7 @@ let parse_cmdline () = "-ic", Arg.Set_string input_conn, "uri " ^ s_"Libvirt URI"; "-if", Arg.Set_string input_format, "format " ^ s_"Input format (for -i disk)"; + &q...

...l +++ b/v2v/v2v.ml @@ -144,40 +144,7 @@ let create_overlays src_disks = ov_virtual_size = vsize; ov_source = source } ) src_disks -let rec main () = - (* Handle the command line. *) - let input, output, - debug_gc, debug_overlays, do_copy, network_map, no_trim, - output_alloc, output_format, output_name, print_source, root_choice = - Cmdline.parse_cmdline () in - - (* Print the version, easier than asking users to tell us. *) - if verbose () then - printf "%s: %s %s (%s)\n%!" - prog Config.package_name Config.package_version Config.host_cpu; - - if debug_gc the...

RHV was connecting to the VMware source in order to find out the virtual disk size of the source disk(s), duplicating logic that virt-v2v already provides. This makes that information available using a new ‘virt-v2v --print-target option’. Note in order to get all the information, this has to actually perform the conversion step, so it takes 30 seconds or so before we reach the point where the

Store the machine-readable flag globally, just like done for verbose/debug/etc, and enhance create_standard_options to provide --machine-readable automatically. --- common/mlstdutils/std_utils.ml | 4 ++++ common/mlstdutils/std_utils.mli | 7 +++++-- common/mltools/tools_utils.ml | 7 ++++++- common/mltools/tools_utils.mli | 5 ++++- 4 files changed, 19 insertions(+), 4 deletions(-) diff

...dib: source dib "die" script in some phases dib: change hooks path when running extra-data.d scripts dib: re-read list of scripts when running in-chroot hooks dib: cleanup logs at end of build copy-out: new 'excludes' optional argument dib: add appliance check hook in Output_format daemon: move make_exclude_from_file as common helper New API: mksquashfs dib: add squashfs output format appliance/packagelist.in | 2 + daemon/Makefile.am | 1 + daemon/daemon.h | 2 + daemon/guestfsd.c | 62 +++++++++++++++++ daemon/squashf...