[Pkg-libvirt-commits] [libguestfs] 172/266: v2v: Remove the Types.overlay ov_source_format field.

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to annotated tag debian/1%1.27.35-1
in repository libguestfs.

commit 5800d96e7a5fce47187dcf74a7d43fa9c385b8b5
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Mon Aug 25 20:27:44 2014 +0100

    v2v: Remove the Types.overlay ov_source_format field.
    
    Not used by anything and unlikely to be useful.
---
 v2v/types.ml  | 3 ---
 v2v/types.mli | 5 ++---
 v2v/v2v.ml    | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/v2v/types.ml b/v2v/types.ml
index 576736a..8182aa1 100644
--- a/v2v/types.ml
+++ b/v2v/types.ml
@@ -124,7 +124,6 @@ type overlay = {
   ov_sd : string;
   ov_virtual_size : int64;
   ov_source_file : string;
-  ov_source_format : string option;
 }
 
 let string_of_overlay ov =
@@ -135,7 +134,6 @@ ov_target_format = %s
 ov_sd = %s
 ov_virtual_size = %Ld
 ov_source_file = %s
-ov_source_format = %s
 "
     ov.ov_overlay
     ov.ov_target_file
@@ -143,7 +141,6 @@ ov_source_format = %s
     ov.ov_sd
     ov.ov_virtual_size
     ov.ov_source_file
-    (match ov.ov_source_format with None -> "None" | Some s -> s)
 
 type inspect = {
   i_root : string;
diff --git a/v2v/types.mli b/v2v/types.mli
index a2ef094..a1b2ba0 100644
--- a/v2v/types.mli
+++ b/v2v/types.mli
@@ -74,11 +74,10 @@ type overlay = {
   ov_sd : string;            (** sdX libguestfs name of disk. *)
   ov_virtual_size : int64;   (** Virtual disk size in bytes. *)
 
-  (* Note: the next two fields are for information only and must not
-   * be opened/copied/etc.
+  (* Note: The ov_source_file is for information ONLY (eg. printing
+   * error messages).  It must NOT be opened/read/modified.
    *)
   ov_source_file : string;          (** qemu URI for source file. *)
-  ov_source_format : string option; (** Source file format, if known. *)
 }
 (** Disk overlays and destination disks. *)
 
diff --git a/v2v/v2v.ml b/v2v/v2v.ml
index 1f3546f..74295fc 100644
--- a/v2v/v2v.ml
+++ b/v2v/v2v.ml
@@ -264,7 +264,7 @@ and initialize_target ~verbose g
           ov_target_file = "";
           ov_target_format = format;
           ov_sd = sd; ov_virtual_size = vsize;
-          ov_source_file = qemu_uri; ov_source_format = backing_format }
+          ov_source_file = qemu_uri }
     ) overlays in
   let overlays = output#prepare_output source overlays in
   overlays

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git