search for: f_

...nsertions(+), 5 deletions(-) diff --git a/builder/cmdline.ml b/builder/cmdline.ml index 7aa0c45..67a279d 100644 --- a/builder/cmdline.ml +++ b/builder/cmdline.ml @@ -234,11 +234,11 @@ read the man page virt-builder(1). ) | `List -> if format <> None then - error (f_"virt-builder --list: use '--list-format', not '--format'"); + error (f_"--list: use '--list-format', not '--format'"); (match args with | [] -> "" | _ -> - error (f_"virt-builder --list does...

.... --- v2v/cmdline.ml | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml index a72aa49..c294e57 100644 --- a/v2v/cmdline.ml +++ b/v2v/cmdline.ml @@ -334,6 +334,11 @@ read the man page virt-v2v(1). error (f_"expecting an OVA file name on the command line") in Input_ova.input_ova filename in + (* Common error message. *) + let error_option_cannot_be_used_in_output_mode mode opt = + error (f_"-o %s: %s option cannot be used in this output mode") mode opt + in + (* Pa...

...ize/resize.ml b/resize/resize.ml index 81bb270..a3ea9be 100644 --- a/resize/resize.ml +++ b/resize/resize.ml @@ -310,7 +310,7 @@ read the man page virt-resize(1). let infile = try (infile, URI.parse_uri infile) with Invalid_argument "URI.parse_uri" -> - error (f_"error parsing URI '%s'. Look for error messages printed above.") + error (f_"error parsing URI '%s'. Look for error messages printed above") infile in infile, outfile, align_first, alignment, copy_boot_loader, @@ -406,7 +406,7 @@ read the...

...pr " }\n"; diff --git a/resize/resize.ml b/resize/resize.ml index 8e4bb1b16..174f1c699 100644 --- a/resize/resize.ml +++ b/resize/resize.ml @@ -170,7 +170,7 @@ let main () = let expand = ref "" in let set_expand s = if s = "" then error (f_"empty --expand option") - else if !expand <> "" then error (f_"--expand option given twice") + else if !expand <> "" then error (f_"--expand option given more than once") else expand := s in let expand_content...

...29f 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -84,35 +84,8 @@ let rec main () = check_free_space mpstats; check_target_free_space mpstats source targets output; - (* Conversion. *) - let guestcaps = - (match inspect.i_product_name with - | "unknown" -> - message (f_"Converting the guest to run on KVM") - | prod -> - message (f_"Converting %s to run on KVM") prod - ); - - (* RHEV doesn't support serial console so remove any on conversion. *) - let keep_serial_console = output#keep_serial_console in - - let conversi...

...t a/builder/builder.ml b/builder/builder.ml index e59c763b2..95f32edaf 100644 --- a/builder/builder.ml +++ b/builder/builder.ml @@ -96,7 +96,7 @@ let selected_cli_item cmdline index = name = arg && cmdline.arch = normalize_arch a ) index with Not_found -> - error (f_"cannot find os-version '%s' with architecture '%s'.\nUse --list to list available guest types.") + error (f_"cannot find os-version ‘%s’ with architecture ‘%s’.\nUse --list to list available guest types.") arg cmdline.arch in item @@ -318,7 +31...

...str.[String.length str - 1] <> '/' then str ^ "/" else str -let object_find_optional key = function - | Yajl_object o -> - (match List.filter (fun (k, _) -> k = key) (Array.to_list o) with - | [(k, v)] -> Some v - | [] -> None - | _ -> error (f_"more than value for the key '%s'") key) - | _ -> error (f_"the value of the key '%s' is not an object") key - -let object_find key yv = - match object_find_optional key yv with - | None -> error (f_"missing value for the key '%s'") key...

...-------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/v2v/v2v.ml b/v2v/v2v.ml index 633c29f..afffde2 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -103,26 +103,7 @@ let rec main () = g#shutdown (); g#close (); - (* Does the guest require UEFI on the target? *) - message (f_"Checking if the guest needs BIOS or UEFI to boot"); - let target_firmware = - match source.s_firmware with - | BIOS -> TargetBIOS - | UEFI -> TargetUEFI - | UnknownFirmware -> - if inspect.i_uefi then TargetUEFI else TargetBIOS in - let supported_firmware = ou...

...insertions(+), 59 deletions(-) diff --git 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_sou...

...rtions(+), 8 deletions(-) diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml index f417dea..a72aa49 100644 --- 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:...

...let libvirturi = ref "" in - let format = ref "" in - let output = ref "" in - let machine_readable = ref false in - let unversioned = ref false in - let prefix = ref None in - - let set_file arg = - if !file <> None then - error (f_"--add option can only be given once"); - let uri = - try URI.parse_uri arg - with Invalid_argument "URI.parse_uri" -> - error (f_"error parsing URI '%s'. Look for error messages printed above.") arg in - file := Some uri -...

...v2v.ml @@ -371,6 +371,34 @@ let check_target_free_space mpstats source targets output = output#check_target_free_space source targets +let do_convert g inspect source keep_serial_console = + (* Conversion. *) + (match inspect.i_product_name with + | "unknown" -> + message (f_"Converting the guest to run on KVM") + | prod -> + message (f_"Converting %s to run on KVM") prod + ); + + let conversion_name, convert = + try Modules_list.find_convert_module inspect + with Not_found -> + error (f_"virt-v2v is unable to convert this...

...hine_readable = !machine_readable in let network_map = !network_map in let no_trim = !no_trim in @@ -313,6 +316,8 @@ read the man page virt-v2v(1). Input_ova.input_ova filename in (* 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 = match output_mode with | `Glance -> @@ -409,6 +414,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, net...

This series is a second attempt to add a mode of virt-v2v operation where it leaves the config and disk image conversion, rollback on errors, registering with the destination hypervisor, etc. to a third-party toolset, and performs only tuning of the guest OS to run in the KVM-based hypervisor. The first 14 patches are just refactoring and rearrangement of the code, factoring the implementation

...ary of changes:\n\n"; > > - List.iter ( > - fun ({ p_name = name; p_part = { G.part_size = oldsize }} as p) -> > + let rec print_summary p = > let text = > match p.p_operation with > | OpCopy -> > - sprintf (f_"%s: This partition will be left alone.") name > + sprintf (f_"%s: This partition will be left alone.") p.p_name > | OpIgnore -> > - sprintf (f_"%s: This partition will be created, but the contents will be ignored (ie. not cop...

...ne arguments: if Sys.command cmd <> 0 then In functional languages, function application is written: f a b c meaning call function `f' with 3 parameters `a', `b' and `c'. Function application binds tightest, so: f a b c + 3 means (f a b c) + 3 > + error (f_"error running command: %s") cmd > + exit 1; The error function already calls exit (see mllib/common_utils.ml). What you're actually doing here is exploiting a bug in ocaml-gettext where it prevents the compiler from correctly detecting extra parameters passed to a printf-l...

This patch is easier to read if you use the 'git show -w' option. Also observe that: fun a -> ( fun () -> (* code *) ) (ie. returning a closure) is identical to: fun a () -> (* code *) Rich.

...3 files changed, 32 insertions(+), 8 deletions(-) diff --git a/customize/customize_run.ml b/customize/customize_run.ml index d4950a2..b96e40c 100644 --- a/customize/customize_run.ml +++ b/customize/customize_run.ml @@ -50,7 +50,7 @@ let run (g : Guestfs.guestfs) root (ops : ops) = warning (f_"log file %s: %s (ignored)") logfile (Printexc.to_string exn) in (* Useful wrapper for scripts. *) - let do_run ~display cmd = + let do_run ~display ?(warn_failed_no_network = false) cmd = if not guest_arch_compatible then error (f_"host cpu (%s) and guest arch (%s)...

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.

...--- a/builder/index_parser.ml +++ b/builder/index_parser.ml @@ -25,7 +25,7 @@ open Utils open Printf open Unix -let get_index ~downloader ~sigchecker { Sources.uri; proxy } = +let get_index ~downloader ~sigchecker ?(template = false) { Sources.uri; proxy } = let corrupt_file () = error (f_"The index file downloaded from ‘%s’ is corrupt.\nYou need to ask the supplier of this file to fix it and upload a fixed version.") uri in @@ -99,8 +99,23 @@ let get_index ~downloader ~sigchecker { Sources.uri; proxy } = let arch = try Index.Arch (List.assoc (&qu...