From bcd60820de1256ef4c36ced54efa1243902411f7 Mon Sep 17 00:00:00 2001

From: "Richard W.M. Jones" <rjones@redhat.com>

Date: Fri, 20 Jan 2023 09:58:10 +0000

Subject: [PATCH] Split long lines in messages

This commit splits up any long lines found in errors, warnings or

other messages.  OCaml ignores whitespace following "\<CR>" within a

string, eg:

  "long string \

   more stuff"

is parsed as:

  "long string more stuff"

Thanks: Laszlo Ersek, for working out the OCaml syntax for this

(cherry picked from commit d2b01e487ff4ef56d139a5e0f22efd9b2ed9b64c)

---

 convert/convert.ml               | 11 ++++++---

 convert/inspect_source.ml        | 42 ++++++++++++++++++++++++++------

 convert/target_bus_assignment.ml |  8 +++++-

 in-place/in_place.ml             | 16 +++++++++---

 input/OVA.ml                     | 14 ++++++++---

 input/OVF.ml                     | 10 +++++---

 input/input_disk.ml              |  6 +++--

 input/input_libvirt.ml           |  9 ++++---

 input/input_ova.ml               |  9 ++++---

 input/input_vcenter_https.ml     | 15 ++++++++----

 input/input_vddk.ml              | 16 +++++++++---

 input/input_xen_ssh.ml           |  9 ++++---

 input/nbdkit_vddk.ml             |  3 ++-

 input/parse_domain_from_vmx.ml   |  3 ++-

 input/parse_libvirt_xml.ml       | 28 ++++++++++++++-------

 input/vCenter.ml                 |  7 ++++--

 inspector/inspector.ml           | 26 ++++++++++++++------

 lib/create_ovf.ml                | 16 +++++++++---

 lib/libvirt_utils.ml             | 12 ++++++---

 lib/networks.ml                  | 15 ++++++++----

 lib/types.ml                     |  3 ++-

 lib/utils.ml                     |  7 ++++--

 output/create_libvirt_xml.ml     |  4 ++-

 output/output.ml                 |  3 ++-

 output/output_glance.ml          |  5 +++-

 output/output_kubevirt.ml        |  6 +++--

 output/output_libvirt.ml         | 20 ++++++++++++---

 output/output_null.ml            |  3 ++-

 output/output_openstack.ml       | 24 ++++++++++++------

 output/output_qemu.ml            |  3 ++-

 output/output_rhv.ml             | 36 +++++++++++++++++++++------

 output/output_rhv_upload.ml      | 39 ++++++++++++++++++++---------

 output/output_vdsm.ml            | 16 ++++++++----

 v2v/v2v.ml                       | 26 ++++++++++++++------

 34 files changed, 343 insertions(+), 127 deletions(-)

diff --git a/convert/convert.ml b/convert/convert.ml

index 8d62f6d4..d0d5b773 100644

--- a/convert/convert.ml

+++ b/convert/convert.ml

@@ -181,12 +181,14 @@ and check_guest_free_space inspect mpstats =

       let needed_bytes = Int64.of_int needed_megabytes *^ 1024L *^ 1024L in

       if free_bytes < needed_bytes then (

         let mb i = Int64.to_float i /. 1024. /. 1024. in

-        error (f_"not enough free space for conversion on filesystem ‘%s’.  %.1f MB free < %d MB needed")

+        error (f_"not enough free space for conversion on filesystem ‘%s’.  \

+                  %.1f MB free < %d MB needed")

           mp_path (mb free_bytes) needed_megabytes

       );

       (* Not all the filesystems have inode counts. *)

       if files > 0L && ffree < needed_inodes then

-        error (f_"not enough available inodes for conversion on filesystem ‘%s’.  %Ld inodes available < %Ld inodes needed")

+        error (f_"not enough available inodes for conversion on \

+                  filesystem ‘%s’.  %Ld inodes available < %Ld inodes needed")

           mp_path ffree needed_inodes

   ) mpstats

@@ -210,7 +212,10 @@ and do_fstrim g inspect =

       if mounted then (

         try g#fstrim "/"

         with G.Error msg ->

-          warning (f_"fstrim on guest filesystem %s failed.  Usually you can ignore this message.  To find out more read \"Trimming\" in virt-v2v(1).\n\nOriginal message: %s") dev msg

+          warning (f_"fstrim on guest filesystem %s failed.  Usually you \

+                      can ignore this message.  To find out more read \

+                      \"Trimming\" in virt-v2v(1).\n\n\

+                      Original message: %s") dev msg

       )

   ) fses

diff --git a/convert/inspect_source.ml b/convert/inspect_source.ml

index a0d9f148..9a6fdab7 100644

--- a/convert/inspect_source.ml

+++ b/convert/inspect_source.ml

@@ -45,8 +45,13 @@ let rec inspect_source root_choice g =

       (try g#mount dev mp

        with G.Error msg ->

          if mp = "/" then ( (* RHBZ#1145995 *)

-           if String.find msg "Windows" >= 0 && String.find msg "NTFS partition is in an unsafe state" >= 0 then

-             error (f_"unable to mount the disk image for writing. This has probably happened because Windows Hibernation or Fast Restart is being used in this guest. You have to disable this (in the guest) in order to use virt-v2v.\n\nOriginal error message: %s") msg

+           if String.find msg "Windows" >= 0 &&

+                String.find msg "NTFS partition is in an unsafe state" >= 0 then

+             error (f_"unable to mount the disk image for writing. This has \

+                       probably happened because Windows Hibernation or \

+                       Fast Restart is being used in this guest. You have \

+                       to disable this (in the guest) in order to use \

+                       virt-v2v.\n\nOriginal error message: %s") msg

            else

              error "%s" msg

          )

@@ -63,7 +68,12 @@ let rec inspect_source root_choice g =

         (try g#touch file

          with G.Error msg ->

            if g#last_errno () = G.Errno.errno_EROFS then

-             error (f_"filesystem was mounted read-only, even though we asked for it to be mounted read-write.  This usually means that the filesystem was not cleanly unmounted.  Possible causes include trying to convert a guest which is running, or using Windows Hibernation or Fast Restart.\n\nOriginal error message: %s") msg

+             error (f_"filesystem was mounted read-only, even though we \

+                       asked for it to be mounted read-write.  This usually \

+                       means that the filesystem was not cleanly unmounted.  \

+                       Possible causes include trying to convert a guest \

+                       which is running, or using Windows Hibernation or \

+                       Fast Restart.\n\nOriginal error message: %s") msg

            else

              error (f_"could not write to the guest filesystem: %s") msg

         );

@@ -128,7 +138,12 @@ let rec inspect_source root_choice g =

 and choose_root root_choice g = function

   | [] ->

-     error (f_"inspection could not detect the source guest (or physical machine).\n\nAssuming that you are running virt-v2v/virt-p2v on a source which is supported (and not, for example, a blank disk), then this should not happen.\n\nNo root device found in this operating system image.");

+     error (f_"inspection could not detect the source guest \

+               (or physical machine).\n\nAssuming that you are \

+               running virt-v2v/virt-p2v on a source which is \

+               supported (and not, for example, a blank disk), \

+               then this should not happen.\n\nNo root device \

+               found in this operating system image.");

   | [root] -> root (* only one root, so return it *)

   | roots ->

      (* If there are multiple roots, use the [--root] option supplied

@@ -138,7 +153,9 @@ and choose_root root_choice g = function

      | AskRoot ->

         (* List out the roots and ask the user to choose. *)

         printf "\n***\n";

-        printf (f_"Dual- or multi-boot operating system detected.  Choose the root filesystem\nthat contains the main operating system from the list below:\n");

+        printf (f_"Dual- or multi-boot operating system detected.  \

+                   Choose the root filesystem\nthat contains the main \

+                   operating system from the list below:\n");

         printf "\n";

         List.iteri (

           fun i root ->

@@ -165,7 +182,9 @@ and choose_root root_choice g = function

         List.nth roots (!i - 1)

       | SingleRoot ->

-        error (f_"multi-boot operating systems are not supported by virt-v2v. Use the --root option to change how virt-v2v handles this.")

+        error (f_"multi-boot operating systems are not supported by \

+                  virt-v2v. Use the --root option to change how virt-v2v \

+                  handles this.")

       | FirstRoot ->

         let root = List.hd roots in

@@ -185,7 +204,10 @@ and choose_root root_choice g = function

 and reject_if_not_installed_image g root =

   let fmt = g#inspect_get_format root in

   if fmt <> "installed" then

-    error (f_"libguestfs thinks this is not an installed operating system (it might be, for example, an installer disk or live CD).  If this is wrong, it is probably a bug in libguestfs.  root=%s fmt=%s") root fmt

+    error (f_"libguestfs thinks this is not an installed operating \

+              system (it might be, for example, an installer disk \

+              or live CD).  If this is wrong, it is probably a bug \

+              in libguestfs.  root=%s fmt=%s") root fmt

 (* Wrapper around g#inspect_list_applications2 which, for RPM

  * guests, on failure tries to rebuild the RPM database before

@@ -275,5 +297,9 @@ and sanity_check_inspection inspect =

 and error_if_unknown fieldname value =

   if value = "unknown" then

-    error (f_"inspection could not detect the source guest (or physical machine).\n\nAssuming that you are running virt-v2v/virt-p2v on a source which is supported (and not, for example, a blank disk), then this should not happen.\n\nInspection field ‘%s’ was ‘unknown’.")

+    error (f_"inspection could not detect the source guest (or \

+              physical machine).\n\nAssuming that you are running \

+              virt-v2v/virt-p2v on a source which is supported (and \

+              not, for example, a blank disk), then this should not \

+              happen.\n\nInspection field ‘%s’ was ‘unknown’.")

           fieldname

diff --git a/convert/target_bus_assignment.ml b/convert/target_bus_assignment.ml

index f8675cf2..54c9516b 100644

--- a/convert/target_bus_assignment.ml

+++ b/convert/target_bus_assignment.ml

@@ -81,7 +81,13 @@ let rec target_bus_assignment source_disks source_removables guestcaps =

            ignore (insert_after bus 0 t)

         | Some desired_slot_nr ->

            if not (insert_after bus desired_slot_nr t) then

-             warning (f_"removable %s device in slot %d clashes with another disk, so it has been moved to a higher numbered slot on the same bus.  This may mean that this removable device has a different name inside the guest (for example a CD-ROM originally called /dev/hdc might move to /dev/hdd, or from D: to E: on a Windows guest).")

+             warning (f_"removable %s device in slot %d clashes with another \

+                         disk, so it has been moved to a higher numbered slot \

+                         on the same bus.  This may mean that this removable \

+                         device has a different name inside the guest (for \

+                         example a CD-ROM originally called /dev/hdc might \

+                         move to /dev/hdd, or from D: to E: on a Windows \

+                         guest).")

                      (match r.s_removable_type with

                       | CDROM -> s_"CD-ROM"

                       | Floppy -> s_"floppy disk")

diff --git a/in-place/in_place.ml b/in-place/in_place.ml

index 7e531bc4..55541814 100644

--- a/in-place/in_place.ml

+++ b/in-place/in_place.ml

@@ -104,7 +104,8 @@ let rec main () =

      *)

     let rec error_unless_ip_addr what addr =

       if not (PCRE.matches mac_ip_re addr) then

-        error (f_"cannot parse --mac ip %s: doesn’t look like “%s” is an IP address") what addr

+        error (f_"cannot parse --mac ip %s: doesn’t look like “%s” is \

+                  an IP address") what addr

     in

     error_unless_ip_addr "ipaddr" if_ip_address;

     Option.may (error_unless_ip_addr "gw") if_default_gateway;

@@ -115,7 +116,8 @@ let rec main () =

       | Some len ->

          let len =

            try int_of_string len with

-           | Failure _ -> error (f_"cannot parse --mac ip prefix length field as an integer: %s") len in

+           | Failure _ -> error (f_"cannot parse --mac ip prefix length \

+                                    field as an integer: %s") len in

          if len < 0 || len > 128 then

            error (f_"--mac ip prefix length field is out of range");

          Some len in

@@ -254,7 +256,8 @@ read the man page virt-v2v-in-place(1).

           let { Xml.uri_server = server; uri_scheme = scheme } =

             try Xml.parse_uri orig_uri

             with Invalid_argument msg ->

-              error (f_"could not parse '-ic %s'.  Original error message was: %s")

+              error (f_"could not parse '-ic %s'.  Original error \

+                        message was: %s")

                 orig_uri msg in

           match server, scheme with

@@ -357,7 +360,12 @@ and check_host_free_space () =

   debug "check_host_free_space: large_tmpdir=%s free_space=%Ld"

         large_tmpdir free_space;

   if free_space < 1_073_741_824L then

-    error (f_"insufficient free space in the conversion server temporary directory %s (%s).\n\nEither free up space in that directory, or set the LIBGUESTFS_CACHEDIR environment variable to point to another directory with more than 1GB of free space.\n\nSee also the virt-v2v(1) manual, section \"Minimum free space check in the host\".")

+    error (f_"insufficient free space in the conversion server temporary \

+              directory %s (%s).\n\nEither free up space in that directory, \

+              or set the LIBGUESTFS_CACHEDIR environment variable to point \

+              to another directory with more than 1GB of free space.\n\n\

+              See also the virt-v2v(1) manual, section \"Minimum free \

+              space check in the host\".")

           large_tmpdir (human_size free_space)

 let () = run_main_and_handle_errors main

diff --git a/input/OVA.ml b/input/OVA.ml

index 09ceee98..e26059bf 100644

--- a/input/OVA.ml

+++ b/input/OVA.ml

@@ -118,11 +118,15 @@ let rec parse_ova ova =

              untar ~format ova tmpdir;

              tmpdir, Directory

           | `Zip | `GZip | `XZ | `Unknown ->

-             error (f_"%s: unsupported file format\n\nFormats which we currently understand for '-i ova' are: tar (uncompressed, compress with gzip or xz), zip") ova

+             error (f_"%s: unsupported file format\n\nFormats which we \

+                       currently understand for '-i ova' are: tar \

+                       (uncompressed, compress with gzip or xz), zip") ova

          )

       | `Unknown ->

-         error (f_"%s: unsupported file format\n\nFormats which we currently understand for '-i ova' are: tar (uncompressed, compress with gzip or xz), zip") ova

+         error (f_"%s: unsupported file format\n\nFormats which we \

+                   currently understand for '-i ova' are: tar (uncompressed, \

+                   compress with gzip or xz), zip") ova

     ) in

   (* Exploded path must be absolute (RHBZ#1155121). *)

@@ -140,7 +144,8 @@ let rec parse_ova ova =

    * so it is readable by qemu.qemu.  This is libvirt bug RHBZ#890291.

    *)

   if Unix.geteuid () = 0 && backend_is_libvirt () then (

-    warning (f_"making OVA directory public readable to work around libvirt bug https://bugzilla.redhat.com/1045069");

+    warning (f_"making OVA directory public readable to work around \

+                libvirt bug https://bugzilla.redhat.com/1045069");

     let what =

       match ova_type with

       | Directory -> [ top_dir ]

@@ -348,7 +353,8 @@ let resolve_href ({ top_dir; ova_type } as t) href =

      (try

         let filename = Realpath.realpath filename in

         if not (String.is_prefix filename real_top_dir) then

-          error (f_"-i ova: invalid OVA file: path ‘%s’ references a file outside the archive") href;

+          error (f_"-i ova: invalid OVA file: path ‘%s’ references a file \

+                    outside the archive") href;

         Some (LocalFile filename)

       with

         Unix_error (ENOENT, "realpath", _) -> None

diff --git a/input/OVF.ml b/input/OVF.ml

index 16c0b09c..48d5a684 100644

--- a/input/OVF.ml

+++ b/input/OVF.ml

@@ -99,7 +99,8 @@ let rec parse_ovf_from_ova ovf_filename =

     | "bios" -> BIOS

     | "efi" -> UEFI

     | s ->

-       error (f_"unknown Config:firmware value %s (expected \"bios\" or \"efi\")") s in

+       error (f_"unknown Config:firmware value %s (expected \"bios\" \

+                 or \"efi\")") s in

   name, memory, vcpu, cpu_topology, firmware,

   parse_disks xpathctx, parse_removables xpathctx, parse_nics xpathctx

@@ -254,10 +255,13 @@ and parent_controller xpathctx id =

   | Some 6 -> Some Source_SCSI

   | Some 20 -> Some Source_SATA

   | None ->

-     warning (f_"ova disk has no parent controller, please report this as a bug supplying the *.ovf file extracted from the ova");

+     warning (f_"ova disk has no parent controller, please report this as \

+                 a bug supplying the *.ovf file extracted from the ova");

      None

   | Some controller ->

-     warning (f_"ova disk has an unknown VMware controller type (%d), please report this as a bug supplying the *.ovf file extracted from the ova")

+     warning (f_"ova disk has an unknown VMware controller type (%d), please \

+                 report this as a bug supplying the *.ovf file extracted \

+                 from the ova")

              controller;

      None

diff --git a/input/input_disk.ml b/input/input_disk.ml

index 508adf9d..279250fe 100644

--- a/input/input_disk.ml

+++ b/input/input_disk.ml

@@ -40,7 +40,8 @@ module Disk = struct

       error (f_"no -io (input options) are allowed here");

     if args = [] then

-      error (f_"-i disk: expecting a disk image (filename) on the command line");

+      error (f_"-i disk: expecting a disk image (filename) \

+                on the command line");

     (* Check the input files exist and are readable. *)

     List.iter (fun disk -> access disk [R_OK]) args;

@@ -88,7 +89,8 @@ module Disk = struct

     (* Check nbdkit is installed. *)

     if not (Nbdkit.is_installed ()) then

-      error (f_"nbdkit is not installed or not working.  It is required to use ‘-i disk’.");

+      error (f_"nbdkit is not installed or not working.  It is required to \

+                use ‘-i disk’.");

     if not (Nbdkit.probe_plugin "file") then

       error (f_"nbdkit-file-plugin is not installed or not working");

diff --git a/input/input_libvirt.ml b/input/input_libvirt.ml

index 9311e89a..9e40fab5 100644

--- a/input/input_libvirt.ml

+++ b/input/input_libvirt.ml

@@ -38,7 +38,8 @@ let rec get_source_from_libvirt options args =

     match args with

     | [arg] -> arg

     | _ ->

-       error (f_"-i libvirt: expecting a libvirt guest name on the command line") in

+       error (f_"-i libvirt: expecting a libvirt guest name \

+                 on the command line") in

   (* Connect to the hypervisor. *)

   let conn =

@@ -55,7 +56,8 @@ and get_source_from_libvirt_xml _ args =

     match args with

     | [arg] -> arg

     | _ ->

-       error (f_"-i libvirtxml: expecting a libvirt XML filename on the command line") in

+       error (f_"-i libvirtxml: expecting a libvirt XML filename \

+                 on the command line") in

   let xml = read_whole_file xmlfile in

   let source, disks = parse_libvirt_xml xml in

   source, disks

@@ -63,7 +65,8 @@ and get_source_from_libvirt_xml _ args =

 and setup_servers options dir disks =

   (* Check nbdkit is installed. *)

   if not (Nbdkit.is_installed ()) then

-    error (f_"nbdkit is not installed or not working.  It is required to use ‘-i libvirt|libvirtxml’.");

+    error (f_"nbdkit is not installed or not working.  It is required to \

+              use ‘-i libvirt|libvirtxml’.");

   if not (Nbdkit.probe_plugin "file") then

     error (f_"nbdkit-file-plugin is not installed or not working");

diff --git a/input/input_ova.ml b/input/input_ova.ml

index 8ec1f802..7404acc3 100644

--- a/input/input_ova.ml

+++ b/input/input_ova.ml

@@ -76,14 +76,16 @@ module OVA = struct

         match r with

         | Checksums.Good_checksum -> ()

         | Checksums.Mismatched_checksum (_, actual) ->

-           error (f_"-i ova: corrupt OVA: checksum of disk %s does not match manifest (actual = %s, expected = %s)")

+           error (f_"-i ova: corrupt OVA: checksum of disk %s does not match \

+                     manifest (actual = %s, expected = %s)")

              filename actual (Checksums.string_of_csum_t csum)

         | Checksums.Missing_file ->

            (* RHBZ#1570407: Some OVA files generated by VMware

             * reference non-existent components in the *.mf file.

             * Generate a warning and ignore it.

             *)

-           warning (f_"manifest has a checksum for non-existent file %s (ignored)")

+           warning (f_"manifest has a checksum for non-existent file %s \

+                       (ignored)")

              filename

     ) manifest;

@@ -234,5 +236,6 @@ module OVA = struct

     else None

   and error_missing_href href =

-    error (f_"-i ova: OVF references file ‘%s’ which was not found in the OVA archive") href

+    error (f_"-i ova: OVF references file ‘%s’ which was not found \

+              in the OVA archive") href

 end

diff --git a/input/input_vcenter_https.ml b/input/input_vcenter_https.ml

index 863f3a00..7c505296 100644

--- a/input/input_vcenter_https.ml

+++ b/input/input_vcenter_https.ml

@@ -67,14 +67,16 @@ module VCenterHTTPS = struct

       match args with

       | [arg] -> arg

       | _ ->

-         error (f_"-i libvirt: expecting a libvirt guest name on the command line") in

+         error (f_"-i libvirt: expecting a libvirt guest name \

+                   on the command line") in

     (* -ip is required in this mode, see RHBZ#1960087 *)

     let password_file =

       match options.input_password with

       | Some file -> file

       | None ->

-         error (f_"-i libvirt: expecting -ip passwordfile parameter for vCenter connection") in

+         error (f_"-i libvirt: expecting -ip passwordfile parameter for \

+                   vCenter connection") in

     (* -ic must be set and it must contain a server.  This is

      * enforced by virt-v2v.

@@ -83,7 +85,8 @@ module VCenterHTTPS = struct

       match options.input_conn with

       | Some ic -> ic

       | None ->

-         error (f_"-i libvirt: expecting -ic parameter for vcenter connection") in

+         error (f_"-i libvirt: expecting -ic parameter for \

+                   vcenter connection") in

     let uri =

       try Xml.parse_uri input_conn

@@ -95,7 +98,8 @@ module VCenterHTTPS = struct

       match uri with

       | { Xml.uri_server = Some server } -> server

       | { Xml.uri_server = None } ->

-         error (f_"-i libvirt: expecting -ic parameter to contain vcenter server name") in

+         error (f_"-i libvirt: expecting -ic parameter to contain \

+                   vcenter server name") in

     (* Connect to the hypervisor. *)

     let conn =

@@ -116,7 +120,8 @@ module VCenterHTTPS = struct

       match xpath_string xpathctx "/domain/vmware:datacenterpath" with

       | Some dcPath -> dcPath

       | None ->

-         error (f_"vcenter: <vmware:datacenterpath> was not found in the XML.  You need to upgrade to libvirt ≥ 1.2.20.") in

+         error (f_"vcenter: <vmware:datacenterpath> was not found in the XML.  \

+                   You need to upgrade to libvirt ≥ 1.2.20.") in

     List.iteri (

       fun i { d_format = format; d_type } ->

diff --git a/input/input_vddk.ml b/input/input_vddk.ml

index e48495d3..6444ce18 100644

--- a/input/input_vddk.ml

+++ b/input/input_vddk.ml

@@ -95,14 +95,18 @@ information on these settings.

     (* thumbprint is mandatory. *)

     if not (List.mem_assoc "thumbprint" io_options) then

-      error (f_"You must pass the ‘-io vddk-thumbprint’ option with the SSL thumbprint of the VMware server.  To find the thumbprint, see the nbdkit-vddk-plugin(1) manual.  See also the virt-v2v-input-vmware(1) manual.");

+      error (f_"You must pass the ‘-io vddk-thumbprint’ option with the \

+                SSL thumbprint of the VMware server.  To find the thumbprint, \

+                see the nbdkit-vddk-plugin(1) manual.  See also the \

+                virt-v2v-input-vmware(1) manual.");

     (* Get the guest name. *)

     let guest =

       match args with

       | [arg] -> arg

       | _ ->

-         error (f_"-i libvirt: expecting a libvirt guest name on the command line") in

+         error (f_"-i libvirt: expecting a libvirt guest name \

+                   on the command line") in

     (* -ic must be set and it must contain a server.  This is

      * enforced by virt-v2v.

@@ -111,7 +115,8 @@ information on these settings.

       match options.input_conn with

       | Some ic -> ic

       | None ->

-         error (f_"-i libvirt: expecting -ic parameter for vcenter connection") in

+         error (f_"-i libvirt: expecting -ic parameter \

+                   for vcenter connection") in

     if not options.read_only then

       error (f_"in-place mode does not work with VDDK source");

@@ -143,7 +148,10 @@ information on these settings.

       match xpath_string "/domain/vmware:moref" with

       | Some moref -> moref

       | None ->

-         error (f_"<vmware:moref> was not found in the output of ‘virsh dumpxml \"%s\"’.  The most likely reason is that libvirt is too old, try upgrading libvirt to ≥ 3.7.") guest in

+         error (f_"<vmware:moref> was not found in the output of \

+                   ‘virsh dumpxml \"%s\"’.  The most likely reason is that \

+                   libvirt is too old, try upgrading \

+                   libvirt to ≥ 3.7.") guest in

     (* It probably never happens that the server name can be missing

      * from the libvirt URI, but we need a server name to pass to

diff --git a/input/input_xen_ssh.ml b/input/input_xen_ssh.ml

index 0aad36a8..b583bd55 100644

--- a/input/input_xen_ssh.ml

+++ b/input/input_xen_ssh.ml

@@ -54,14 +54,16 @@ module XenSSH = struct

       match args with

       | [arg] -> arg

       | _ ->

-         error (f_"-i libvirt: expecting a libvirt guest name on the command line") in

+         error (f_"-i libvirt: expecting a libvirt guest name \

+                   on the command line") in

     (* -ic must be set. *)

     let input_conn =

       match options.input_conn with

       | Some ic -> ic

       | None ->

-         error (f_"-i libvirt: expecting -ic parameter for Xen over SSH connection") in

+         error (f_"-i libvirt: expecting -ic parameter for \

+                   Xen over SSH connection") in

     let uri =

       try Xml.parse_uri input_conn

@@ -82,7 +84,8 @@ module XenSSH = struct

       match uri.Xml.uri_server with

       | Some server -> server

       | None ->

-         error (f_"‘-ic %s’ URL does not contain a host name field") input_conn in

+         error (f_"‘-ic %s’ URL does not contain a host name field")

+           input_conn in

     let port =

       match uri.uri_port with

diff --git a/input/nbdkit_vddk.ml b/input/nbdkit_vddk.ml

index 9609c442..86d9b1a9 100644

--- a/input/nbdkit_vddk.ml

+++ b/input/nbdkit_vddk.ml

@@ -70,7 +70,8 @@ let create_vddk ?bandwidth ?config ?cookie ?cor ?libdir ~moref

     | None -> ()

     | Some libdir ->

        if not (is_directory libdir) then

-         error (f_"‘-io vddk-libdir=%s’ does not point to a directory.  See the virt-v2v-input-vmware(1) manual.") libdir

+         error (f_"‘-io vddk-libdir=%s’ does not point to a directory.  \

+                   See the virt-v2v-input-vmware(1) manual.") libdir

   in

   (* Check that the VDDK plugin is installed and working.  We also

diff --git a/input/parse_domain_from_vmx.ml b/input/parse_domain_from_vmx.ml

index 7aca2c24..15ee093f 100644

--- a/input/parse_domain_from_vmx.ml

+++ b/input/parse_domain_from_vmx.ml

@@ -82,7 +82,8 @@ let scp_from_remote_to_temporary uri tmpdir filename =

   if verbose () then

     eprintf "%s\n%!" cmd;

   if Sys.command cmd <> 0 then

-    error (f_"could not copy the VMX file from the remote server, see earlier error messages");

+    error (f_"could not copy the VMX file from the remote server, \

+              see earlier error messages");

   localfile

 (* Test if [path] exists on the remote server. *)

diff --git a/input/parse_libvirt_xml.ml b/input/parse_libvirt_xml.ml

index 65693c98..123d09f4 100644

--- a/input/parse_libvirt_xml.ml

+++ b/input/parse_libvirt_xml.ml

@@ -44,7 +44,8 @@ let get_drive_slot str offset =

   let name = String.sub str offset (String.length str - offset) in

   try Some (drive_index name)

   with Invalid_argument _ ->

-       warning (f_"could not parse device name ‘%s’ from the source libvirt XML") str;

+       warning (f_"could not parse device name ‘%s’ \

+                   from the source libvirt XML") str;

        None

 let parse_libvirt_xml ?conn xml =

@@ -70,7 +71,8 @@ let parse_libvirt_xml ?conn xml =

   let hypervisor =

     match xpath_string "/domain/@type" with

     | None | Some "" ->

-       error (f_"in the libvirt XML metadata, <domain type='...'> is missing or empty")

+       error (f_"in the libvirt XML metadata, <domain type='...'> \

+                 is missing or empty")

     | Some s -> source_hypervisor_of_string s in

   let name =

     match xpath_string "/domain/name/text()" with

@@ -155,7 +157,8 @@ let parse_libvirt_xml ?conn xml =

           | Some "none" ->

             LNone

           | Some t ->

-            warning (f_"<listen type='%s'> in the input libvirt XML was ignored") t;

+            warning (f_"<listen type='%s'> in the input libvirt XML \

+                        was ignored") t;

             LNoListen

         ) in

       let port =

@@ -176,10 +179,13 @@ let parse_libvirt_xml ?conn xml =

                s_keymap = keymap; s_password = password; s_listen = listen;

                s_port = port }

       | Some ("sdl"|"desktop" as t) ->

-        warning (f_"virt-v2v does not support local displays, so <graphics type='%s'> in the input libvirt XML was ignored") t;

+        warning (f_"virt-v2v does not support local displays, so \

+                    <graphics type='%s'> in the input libvirt XML was ignored")

+          t;

         None

       | Some t ->

-        warning (f_"display <graphics type='%s'> in the input libvirt XML was ignored") t;

+        warning (f_"display <graphics type='%s'> in the input \

+                    libvirt XML was ignored") t;

         None

     ) in

@@ -297,7 +303,8 @@ let parse_libvirt_xml ?conn xml =

              sprintf "%s://%s%s%s" driver host port (uri_quote path) in

            add_disk format controller (HTTP url)

         | Some protocol, _, _ ->

-           warning (f_"<disk type='network'> with <source protocol='%s'> was ignored")

+           warning (f_"<disk type='network'> with <source protocol='%s'> \

+                       was ignored")

                    protocol

         )

       | Some "volume" ->

@@ -323,7 +330,8 @@ let parse_libvirt_xml ?conn xml =

              | None -> ()

             );

           | Some vol_type ->

-            warning (f_"<disk type='volume'> with <volume type='%s'> was ignored") vol_type

+            warning (f_"<disk type='volume'> with <volume type='%s'> \

+                        was ignored") vol_type

           )

         )

       | Some disk_type ->

@@ -364,13 +372,15 @@ let parse_libvirt_xml ?conn xml =

            let name = String.sub dev 2 (String.length dev - 2) in

            (try Some (int_of_string name)

             with Failure _ ->

-              warning (f_"could not parse device name ‘%s’ from the source libvirt XML") dev;

+              warning (f_"could not parse device name ‘%s’ \

+                          from the source libvirt XML") dev;

               None

            )

         | Some dev ->

            let rec loop = function

              | [] ->

-                warning (f_"<target dev='%s'> was ignored because the device name could not be recognized") dev;

+                warning (f_"<target dev='%s'> was ignored because \

+                            the device name could not be recognized") dev;

                 None

              | prefix :: rest ->

                 if String.is_prefix dev prefix then (

diff --git a/input/vCenter.ml b/input/vCenter.ml

index 8a1a5655..f3bc80e2 100644

--- a/input/vCenter.ml

+++ b/input/vCenter.ml

@@ -69,7 +69,9 @@ let rec start_nbdkit_for_path ?bandwidth ?cor ?password_file

       if uri.uri_user <> None then

         error (f_"vcenter: incorrect username or password")

       else

-        error (f_"vcenter: incorrect username or password.  You might need to specify the username in the URI like this: [vpx|esx|..]://USERNAME@[etc]")

+        error (f_"vcenter: incorrect username or password.  You might need \

+                  to specify the username in the URI like this: \

+                  [vpx|esx|..]://USERNAME@[etc]")

     );

     if status = "404" then (

@@ -150,7 +152,8 @@ and fetch_headers_from_url password_file uri sslverify https_url =

   (match uri.uri_user, password_file with

    | None, None -> ()

    | None, Some _ ->

-      warning (f_"-ip PASSWORD_FILE parameter ignored because 'user@' was not given in the URL")

+      warning (f_"-ip PASSWORD_FILE parameter ignored because \

+                  'user@' was not given in the URL")

    | Some user, None ->

       List.push_back curl_args ("user", Some user)

    | Some user, Some password_file ->

diff --git a/inspector/inspector.ml b/inspector/inspector.ml

index 222371d5..13d58df3 100644

--- a/inspector/inspector.ml

+++ b/inspector/inspector.ml

@@ -111,7 +111,8 @@ let rec main () =

      *)

     let rec error_unless_ip_addr what addr =

       if not (PCRE.matches mac_ip_re addr) then

-        error (f_"cannot parse --mac ip %s: doesn’t look like “%s” is an IP address") what addr

+        error (f_"cannot parse --mac ip %s: doesn’t look like “%s” \

+                  is an IP address") what addr

     in

     error_unless_ip_addr "ipaddr" if_ip_address;

     Option.may (error_unless_ip_addr "gw") if_default_gateway;

@@ -122,7 +123,8 @@ let rec main () =

       | Some len ->

          let len =

            try int_of_string len with

-           | Failure _ -> error (f_"cannot parse --mac ip prefix length field as an integer: %s") len in

+           | Failure _ -> error (f_"cannot parse --mac ip prefix \

+                                    length field as an integer: %s") len in

          if len < 0 || len > 128 then

            error (f_"--mac ip prefix length field is out of range");

          Some len in

@@ -191,7 +193,8 @@ A short summary of the options is given below.  For detailed help please

 read the man page virt-v2v-inspector(1).

 ")

       prog in

-  let opthandle = create_standard_options argspec ~anon_fun ~key_opts:true ~machine_readable:true usage_msg in

+  let opthandle = create_standard_options argspec ~anon_fun ~key_opts:true

+                    ~machine_readable:true usage_msg in

   Getopt.parse opthandle.getopt;

   (* Print the version, easier than asking users to tell us. *)

@@ -260,7 +263,8 @@ read the man page virt-v2v-inspector(1).

           let { Xml.uri_server = server; uri_scheme = scheme } =

             try Xml.parse_uri orig_uri