search for: copy_target

...ce output output_format in + let targets = + init_targets overlays source output output_format compressed in Copying (overlays, targets) ) else In_place in @@ -132,7 +133,7 @@ let rec main () = let targets = if not do_copy then targets - else copy_targets targets input output output_alloc in + else copy_targets targets input output output_alloc compressed in (* Create output metadata. *) message (f_"Creating output metadata"); @@ -247,7 +248,7 @@ and create_overlays src_disks = ov_virtual_size = vsize; o...

...1:15 Richard W.M. Jones <rjones@redhat.com> wrote: > On Wed, Nov 20, 2019 at 03:06:55AM +0200, Nir Soffer wrote: > > diff --git a/v2v/v2v.ml b/v2v/v2v.ml > > index 03590c9e..58bb06c3 100644 > > --- a/v2v/v2v.ml > > +++ b/v2v/v2v.ml > > @@ -739,7 +739,9 @@ and copy_targets cmdline targets input output = > > | TargetURI uri -> uri in > > [ "qemu-img"; "convert" ] @ > > (if not (quiet ()) then [ "-p" ] else []) @ > > - [ "-n"; "-f"; "qcow2"; &quot...

I'm interested to hear opinions on whether this makes the code clearer, or not. This is virt-v2v, but many other virt-* tools work the same way, and analogous changes could be made. Currently when command line argument parsing is done in 'cmdline.ml' the list of parsed parameters is passed to the main program in a very long tuple. Each parameter is strongly typed, but not named (so

...es -> guestcaps -> inspect -> target_firmware -> unit (** Called after conversion and copying to create metadata and do any finalization. *) diff --git a/v2v/v2v.ml b/v2v/v2v.ml index 277d8f2c7a3e..1bd2225f7334 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -687,10 +687,10 @@ and copy_targets cmdline targets input output = fun i t -> (match t.target_file with | TargetFile s -> - message (f_"Copying disk %d/%d to %s (%s)") + message (f_"Preparing disk %d/%d in %s (%s)") (i+1) nr_disks s t.target_format;...

...would not normally +make sense on a block device. + =head2 Minimal XML for -i libvirtxml option When using the I<-i libvirtxml> option, you have to supply some diff --git a/v2v/v2v.ml b/v2v/v2v.ml index 73edff2c4..a70310891 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -683,7 +683,10 @@ and copy_targets cmdline targets input output = fun t -> match t.target_file with | TargetURI _ -> () - | TargetFile s -> try unlink s with _ -> () + | TargetFile filename -> + if not (is_block_device filename) then ( + try u...

..." + sig = inspect.signature(types.ImageTransfer) + return "format" in sig.parameters + # oVirt imageio operations def parse_transfer_url(transfer): diff --git a/v2v/v2v.ml b/v2v/v2v.ml index 03590c9e..58bb06c3 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -739,7 +739,9 @@ and copy_targets cmdline targets input output = | TargetURI uri -> uri in [ "qemu-img"; "convert" ] @ (if not (quiet ()) then [ "-p" ] else []) @ - [ "-n"; "-f"; "qcow2"; "-O"; t.target_format ] @ +...

...estimate (human_size estimate) - actual (human_size actual) - pc; - if pc < 0. then printf " ! ESTIMATE TOO LOW !"; - printf "\n%!"; - ); - - t - ) targets - ) (* do_copy *) in + else copy_targets targets input output output_alloc in (* Create output metadata. *) message (f_"Creating output metadata"); @@ -825,6 +713,119 @@ and get_target_firmware inspect guestcaps source output = target_firmware +and delete_target_on_exit = ref true + +and copy_targets targets inpu...

...d but not available. I can also not build libguestfs from git becuase setting up common submodule in ./autogen.sh fails. v2v/v2v.ml | 1 + 1 file changed, 1 insertion(+) diff --git a/v2v/v2v.ml b/v2v/v2v.ml index 4655b883..03590c9e 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -741,6 +741,7 @@ and copy_targets cmdline targets input output = (if not (quiet ()) then [ "-p" ] else []) @ [ "-n"; "-f"; "qcow2"; "-O"; t.target_format ] @ (if cmdline.compressed then [ "-c" ] else []) @ + [ "-S"; "64k&qu...

...ly make sense" is too extreme. > > Maybe something like: > > Typically l<of raw> is used for block devices but other formats such as > qcow2 can be useful in some cases. Sure, I will adjust this. I knew that RHV was using it. > > @@ -713,27 +716,33 @@ and copy_targets cmdline targets input output = > > > > (match t.target_file with > > | TargetFile filename -> > > - (* It turns out that libguestfs's disk creation code is > > - * considerably more flexible and easier to use than > > -...

...ases. > + > =head2 Minimal XML for -i libvirtxml option > > When using the I<-i libvirtxml> option, you have to supply some > diff --git a/v2v/v2v.ml b/v2v/v2v.ml > index 73edff2c4..a70310891 100644 > --- a/v2v/v2v.ml > +++ b/v2v/v2v.ml > @@ -683,7 +683,10 @@ and copy_targets cmdline targets input output = > fun t -> > match t.target_file with > | TargetURI _ -> () > - | TargetFile s -> try unlink s with _ -> () > + | TargetFile filename -> > + if not (is_block_device filename...

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

...); + message (f_"Assigning disks to buses"); + let target_buses = target_bus_assignment source targets guestcaps in + if verbose () then + printf "%s%!" (string_of_target_buses target_buses); - let targets = - if not do_copy then targets - else copy_targets targets input output output_alloc in + let targets = + if not do_copy then targets + else copy_targets targets input output output_alloc in - (* Create output metadata. *) - message (f_"Creating output metadata"); - output#create_metadata source targets target_...

...ixes commit e29296cfa20dd691995832940a30fe2e6b98149a. Thanks: Pino Toscano for suggesting the fix. --- v2v/v2v.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v2v/v2v.ml b/v2v/v2v.ml index 54a2b3998..363699701 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -744,7 +744,7 @@ and copy_targets cmdline targets input output = let cmd = let filename = match t.target_file with - | TargetFile filename -> "file:" ^ filename + | TargetFile filename -> qemu_input_filename filename | TargetURI uri -> uri in [ Gue...

...get_buses -> guestcaps -> inspect -> target_firmware -> unit (** Called after conversion and copying to create metadata and do any finalization. *) diff --git a/v2v/v2v.ml b/v2v/v2v.ml index c056aa787..4ee15663f 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -792,7 +792,14 @@ and copy_targets cmdline targets input output = pc; if pc < 0. then eprintf " ! ESTIMATE TOO LOW !"; eprintf "\n%!"; - ) + ); + + (* Let the output mode know that the disk was copied successfully, + * so it can perform any operations wi...

On Wed, Nov 20, 2019 at 03:06:55AM +0200, Nir Soffer wrote: > diff --git a/v2v/v2v.ml b/v2v/v2v.ml > index 03590c9e..58bb06c3 100644 > --- a/v2v/v2v.ml > +++ b/v2v/v2v.ml > @@ -739,7 +739,9 @@ and copy_targets cmdline targets input output = > | TargetURI uri -> uri in > [ "qemu-img"; "convert" ] @ > (if not (quiet ()) then [ "-p" ] else []) @ > - [ "-n"; "-f"; "qcow2"; "-O"; t.target_...

...redhat.com> wrote: > > > On Wed, Nov 20, 2019 at 03:06:55AM +0200, Nir Soffer wrote: > > > diff --git a/v2v/v2v.ml b/v2v/v2v.ml > > > index 03590c9e..58bb06c3 100644 > > > --- a/v2v/v2v.ml > > > +++ b/v2v/v2v.ml > > > @@ -739,7 +739,9 @@ and copy_targets cmdline targets input output = > > > | TargetURI uri -> uri in > > > [ "qemu-img"; "convert" ] @ > > > (if not (quiet ()) then [ "-p" ] else []) @ > > > - [ "-n"; "-f"; &quo...

...dle * 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 source targets guestcaps insp...

...> > Maybe something like: > > > > Typically l<of raw> is used for block devices but other formats such as > > qcow2 can be useful in some cases. > > Sure, I will adjust this. I knew that RHV was using it. > > > > @@ -713,27 +716,33 @@ and copy_targets cmdline targets input output = > > > > > > (match t.target_file with > > > | TargetFile filename -> > > > - (* It turns out that libguestfs's disk creation code is > > > - * considerably more flexible and easier...

This series is an 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. Roman Kagan (3): v2v: add --in-place mode v2v: document --in-place v2v: add test for --in-place ---

...f_overlay ov); + printf "%s\n" (string_of_target t) + ) (List.combine overlays targets); + exit 0 + ) + ); + (* Copy overlays to target (for [--in-place] this does nothing). *) (match conversion_mode with | In_place -> () @@ -685,6 +701,7 @@ and copy_targets cmdline targets input output = message (f_"Copying disk %d/%d to qemu URI %s (%s)") (i+1) nr_disks s t.target_format ); + debug "%s" (string_of_overlay t.target_overlay); debug "%s" (string_of_target t); (* We...