search for: prepare_targets

...3 ++- 13 files changed, 14 insertions(+), 13 deletions(-) diff --git a/v2v/output_glance.ml b/v2v/output_glance.ml index 0eb8b5e6..21e8cc62 100644 --- a/v2v/output_glance.ml +++ b/v2v/output_glance.ml @@ -59,7 +59,7 @@ object method supported_firmware = [ TargetBIOS; TargetUEFI ] - method prepare_targets _ overlays = + method prepare_targets _ overlays _ = (* Write targets to a temporary local file - see above for reason. *) List.map (fun (_, ov) -> TargetFile (tmpdir // ov.ov_sd)) overlays diff --git a/v2v/output_json.ml b/v2v/output_json.ml index 29c4a1d0..b23420a7 100644 --- a/v2...

...f_"output format should be 'raw' or 'qcow2'.\n\nUse the '-of <format>' option to select a different output format for the converted guest.\n\nOther output formats are not supported at the moment, although might be considered in future."); - - (* output#prepare_targets will fill in the target_file field. - * estimate_target_size will fill in the target_estimated_size field. - * actual_target_size will fill in the target_actual_size field. - *) - { target_file = ""; target_format = format; - target_estimated_size =...

...dded as disks to a guestfs handle * let inspect = Inspect_source.inspect_source g in let guestcaps = do_convert g inspect output in This does inspection + conversion. (The real do_convert function takes the source struct as parameter, but it is not really used.) * let targets = output#prepare_targets overlays in copy_targets targets input output This creates the target disks and copies them. (The real output#prepare_targets method takes the source struct as a parameter, but the actual objects only use the source.s_name and .s_hypervisor fields). * output#create_metadata sou...

...e > >* let inspect = Inspect_source.inspect_source g in > let guestcaps = do_convert g inspect output in > > This does inspection + conversion. (The real do_convert function > takes the source struct as parameter, but it is not really used.) > >* let targets = output#prepare_targets overlays in > copy_targets targets input output > > This creates the target disks and copies them. (The real > output#prepare_targets method takes the source struct as a > parameter, but the actual objects only use the source.s_name and > .s_hypervisor fields). >...

...ut_libvirt.ml @@ -76,8 +76,6 @@ class output_libvirt oc output_pool = object | None -> sprintf "-o libvirt -os %s" output_pool | Some uri -> sprintf "-o libvirt -oc %s -os %s" uri output_pool - method supported_firmware = [ TargetBIOS; TargetUEFI ] - method prepare_targets source targets = (* Get the capabilities from libvirt. *) let xml = Libvirt_utils.capabilities ?conn:oc () in @@ -140,6 +138,8 @@ class output_libvirt oc output_pool = object { t with target_file = target_file } ) targets + method supported_firmware = [ TargetBIOS; Target...

On Thu, Oct 10, 2019 at 03:33:25PM +0100, Richard W.M. Jones wrote: >On Wed, Oct 09, 2019 at 02:19:46PM +0200, Martin Kletzander wrote: >> Even though this option is not to be used according to the manual, it: >> >> a) still might be useful even for machine-readable logs >> >> b) should not break the machine-readable output > >I'm a bit confused what

It seems we're missing this in rhv-upload. Unfortunately I'm not able to test it at the moment. Tomáš Golembiovský (1): v2v: -o rhv-upload: install RHV tools v2v/output_rhv_upload.ml | 3 +++ 1 file changed, 3 insertions(+) -- 2.17.0

Store the Libvirt.Connect.t object as instance variable, so it can be used also outside of prepare_targets. Use a private method to access it, so there is no need to directly use the Lazy object. --- v2v/output_libvirt.ml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/v2v/output_libvirt.ml b/v2v/output_libvirt.ml index 30857c572..e62e43bb8 100644 --- a/v2v/output_...

...(* 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. @@ -213,7 +180,43 @@ let rec main () = target_actual_size = None; target_overlay = ov } ) overlays in - let targets = output#prepare_targets source targets in + + output#prepare_targets source targets + +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_cmdli...

...Some (JSON_parser.object_get_string "rhv_cluster_cpu_architecture" json); if have_selinux then error_unless_nbdkit_compiled_with_selinux () @@ -290,7 +294,19 @@ object (* rhev-apt.exe will be installed (if available). *) method install_rhev_apt = true - method prepare_targets source_name overlays _ = + method prepare_targets source_name overlays guestcaps = + let rhv_cluster_name = + match List.assoc "rhv_cluster" json_params with + | JSON.String s -> s + | _ -> assert false in + (match rhv_cluster_cpu_architecture with + | None...

...format:"qcow2" ~cachemode:"unsafe" ~discard:"besteffort" - ~copyonread:true - ) overlays; + let g = open_guestfs () in + populate_overlays g overlays; g#launch (); @@ -261,6 +251,24 @@ and init_targets overlays source output output_format = output#prepare_targets source targets +and open_guestfs () = + (* Open the guestfs handle. *) + let g = new G.guestfs () in + g#set_identifier "v2v"; + if trace () then g#set_trace true; + if verbose () then g#set_verbose true; + g#set_network true; + g + +and populate_overlays (g:G.guestfs) overlays =...

...in + g#set_identifier "v2v"; + g#set_network true; (match conversion_mode with | Copying (overlays, _) -> populate_overlays g overlays | In_place -> populate_disks g source.s_disks @@ -284,15 +286,6 @@ and init_targets overlays source output output_format = output#prepare_targets source targets -and open_guestfs () = - (* Open the guestfs handle. *) - let g = new G.guestfs () in - g#set_identifier "v2v"; - if trace () then g#set_trace true; - if verbose () then g#set_verbose true; - g#set_network true; - g - and populate_overlays g overlays = (* Popul...

...s ())#get_cachedir () in > - let t = Mkdtemp.temp_dir ~base_dir "glance." in > - rmdir_on_exit t; > - t in > object > inherit output > > @@ -60,8 +50,12 @@ object > method supported_firmware = [ TargetBIOS; TargetUEFI ] > > method prepare_targets _ overlays _ = > - (* Write targets to a temporary local file - see above for reason. *) > - List.map (fun (_, ov) -> TargetFile (tmpdir // ov.ov_sd)) overlays > + (* Although glance can slurp in a stream from stdin, unfortunately > + * 'qemu-img convert' cannot...

Add support for qcow2 disk format, enabled by imageio NBD backend in RHV 4.3. To use this feature manually, you can run virt-v2v with "-of qcow2". Here is example run: Source disk: $ qemu-img info /var/tmp/fedora-30.img image: /var/tmp/fedora-30.img file format: raw virtual size: 6 GiB (6442450944 bytes) disk size: 1.15 GiB virt-v2v: $ ./run virt-v2v \ -v \ -i disk

This changes the infrastructure to allow the target_file to be a QEMU URI. Rich.

...ged, 25 insertions(+), 15 deletions(-) diff --git a/v2v/types.ml b/v2v/types.ml index 77f879200a26..2780f05fdfbf 100644 --- a/v2v/types.ml +++ b/v2v/types.ml @@ -521,6 +521,21 @@ class virtual output = object method override_output_format (_ : overlay) = (None : string option) method virtual prepare_targets : source -> (string * overlay) list -> target_buses -> guestcaps -> inspect -> target_firmware -> target_file list method disk_create = (open_guestfs ())#disk_create + method disk_copy target compressed = + let filename = + match target.target_file with + | Target...

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

...v2v/output_rhv_upload.ml index dc0d96d53..0152b8d5a 100644 --- a/v2v/output_rhv_upload.ml +++ b/v2v/output_rhv_upload.ml @@ -247,6 +247,9 @@ object method supported_firmware = [ TargetBIOS ] + (* rhev-apt.exe will be installed (if available). *) + method install_rhev_apt = true + method prepare_targets source targets = let output_name = source.s_name in let json_params = -- 2.17.0

...iles changed, 13 insertions(+), 1 deletion(-) diff --git a/v2v/types.ml b/v2v/types.ml index 77f879200..714b30014 100644 --- a/v2v/types.ml +++ b/v2v/types.ml @@ -521,6 +521,7 @@ class virtual output = object method override_output_format (_ : overlay) = (None : string option) method virtual prepare_targets : source -> (string * overlay) list -> target_buses -> guestcaps -> inspect -> target_firmware -> target_file list method disk_create = (open_guestfs ())#disk_create + method disk_copied (_ : target) (_ : int) (_ : int) = () method virtual create_metadata : source -> tar...

...on, and it's not really possible to intuit it by looking at the converted disk. > >However there are some action items: > > > >(1) do_convert does not need the source parameter. I think it could > >just be passed the .s_name field instead. > > > >(2) output#prepare_targets doesn't really need the source struct, but > >could probably get away with being passed just the .s_name field and > >maybe .s_hypervisor. > > > >(3) source.s_disks and the rest of the source struct seem to have > >sufficiently different usage that we can consider...