From df499286f518f16efef2ee975a3a2a53df7287a6 Mon Sep 17 00:00:00 2001

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

Date: Mon, 14 May 2018 10:16:58 +0100

Subject: [PATCH] RHEL 8: v2v: rhv-upload: Remove restriction on -oa sparse.

See: https://bugzilla.redhat.com/show_bug.cgi?id=1565681

and the v2v-devel private thread "Do we already support migration using FC?"

---

 v2v/output_rhv_upload.ml    | 11 +----------

 v2v/rhv-upload-plugin.py    |  4 +---

 v2v/virt-v2v-output-rhv.pod |  8 +-------

 3 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/v2v/output_rhv_upload.ml b/v2v/output_rhv_upload.ml

index e1d06867b..3f078157a 100644

--- a/v2v/output_rhv_upload.ml

+++ b/v2v/output_rhv_upload.ml

@@ -177,19 +177,11 @@ See also the virt-v2v-output-rhv(1) manual.")

       error (f_"nbdkit was compiled without SELinux support.  You will have to recompile nbdkit with libselinux-devel installed, or else set SELinux to Permissive mode while doing the conversion.")

   in

-  (* Output format/sparse must be raw/sparse.  We may be able to

-   * lift this limitation in future, but it requires changes on the

-   * RHV side.  See TODO file for details.  XXX

-   *)

+  (* Output format must be raw. *)

   let error_current_limitation required_param =

     error (f_"rhv-upload: currently you must use ‘%s’.  This restriction will be loosened in a future version.") required_param

   in

-  let error_unless_output_alloc_sparse () =

-    if output_alloc <> Sparse then

-      error_current_limitation "-oa sparse"

-  in

-

   (* JSON parameters which are invariant between disks. *)

   let json_params = [

     "verbose", JSON.Bool (verbose ());

@@ -249,7 +241,6 @@ object

     error_unless_ovirtsdk4_module_available ();

     error_unless_nbdkit_working ();

     error_unless_nbdkit_python_plugin_working ();

-    error_unless_output_alloc_sparse ();

     (* Python code prechecks. *)

     let precheck_fn = tmpdir // "v2vprecheck.json" in

     let fd = Unix.openfile precheck_fn [O_WRONLY; O_CREAT] 0o600 in

diff --git a/v2v/rhv-upload-plugin.py b/v2v/rhv-upload-plugin.py

index 14d4e37fb..c7f7a5e8b 100644

--- a/v2v/rhv-upload-plugin.py

+++ b/v2v/rhv-upload-plugin.py

@@ -142,10 +142,8 @@ def open(readonly):

             format = disk_format,

             initial_size = params['disk_size'],

             provisioned_size = params['disk_size'],

-            # XXX Ignores params['output_sparse'].

-            # Handling this properly will be complex, see:

             # https://www.redhat.com/archives/libguestfs/2018-March/msg00177.html

-            sparse = True,

+            sparse = params['output_sparse'],

             storage_domains = [

                 types.StorageDomain(

                     name = params['output_storage'],

diff --git a/v2v/virt-v2v-output-rhv.pod b/v2v/virt-v2v-output-rhv.pod

index 4520c9184..f6579a48e 100644

--- a/v2v/virt-v2v-output-rhv.pod

+++ b/v2v/virt-v2v-output-rhv.pod

@@ -5,7 +5,7 @@ virt-v2v-output-rhv - Using virt-v2v to convert guests to oVirt or RHV

 =head1 SYNOPSIS

  virt-v2v [-i* options] -o rhv-upload [-oc ENGINE_URL] -os STORAGE

-                        [-op PASSWORD] [-of raw]

+                        [-op PASSWORD]

                         [-oo rhv-cafile=FILE]

                         [-oo rhv-cluster=CLUSTER]

                         [-oo rhv-direct]

@@ -79,12 +79,6 @@ username is not specified then virt-v2v defaults to using

 C<admin@internal> which is the typical superuser account for oVirt

 instances.

-=item I<-of raw>

-

-Currently you must use I<-of raw> and you cannot use I<-oa preallocated>.

-

-These restrictions will be loosened in a future version.

-

 =item I<-op> F<password-file>

 A file containing a password to be used when connecting to the oVirt

-- 

2.26.2