search for: target_format

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

...- fun t -> try unlink t.target_file with _ -> () - ) targets - ) - ); - let nr_disks = List.length targets in - mapi ( - fun i t -> - message (f_"Copying disk %d/%d to %s (%s)") - (i+1) nr_disks t.target_file t.target_format; - if verbose () then printf "%s%!" (string_of_target t); - - (* We noticed that qemu sometimes corrupts the qcow2 file on - * exit. This only seemed to happen with lazy_refcounts was - * used. The symptom was that the header wasn't written back...

..., allow output to a block device or + * symlink to a block device. In this case we don't + * create/overwrite the block device. (RHBZ#1868690). *) - (* What output preallocation mode should we use? *) - let preallocation = - match t.target_format, cmdline.output_alloc with - | ("raw"|"qcow2"), Sparse -> Some "sparse" - | ("raw"|"qcow2"), Preallocated -> Some "full" - | _ -> None (* ignore -oa flag for other formats *) in - let comp...

...data when creating a transfer. With the NBD backend, we can specify qcow2 disk format. I think we need a way to expose the capabilities of the output to the user. For example, can we use qcow2 format. Issues: - I hacked qemu-img convert command line to always use -O raw instead of "-O t.target_format" since oVirt always starts qemu-nbd with the actual disk format. This works for this plugin, but may be wrong for other plugins. --- v2v/output_rhv_upload.ml | 5 ++--- v2v/rhv-upload-plugin.py | 19 +++++++++++++++++++ v2v/v2v.ml | 4 +++- 3 files changed, 24 insertions(+...

...gets input output = > > | TargetURI uri -> uri in > > [ "qemu-img"; "convert" ] @ > > (if not (quiet ()) then [ "-p" ] else []) @ > > - [ "-n"; "-f"; "qcow2"; "-O"; t.target_format ] @ > > + (* XXX When using NBD we must use raw format, not the > target_format > > + * which is the disk format. commpressed format will also not > work. *) > > + [ "-n"; "-f"; "qcow2"; "-O"; "raw" ] @ &...

...tFile filename -> qemu_input_filename filename + | TargetURI uri -> uri in + let cmd = + [ "qemu-img"; "convert" ] @ + (if not (quiet ()) then [ "-p" ] else []) @ + [ "-n"; "-f"; "qcow2"; "-O"; target.target_format ] @ + (if compressed then [ "-c" ] else []) @ + [ target.target_overlay.ov_overlay_file; filename ] in + message (f_"Copying disk to %s (%s)") filename target.target_format; + if run_command cmd <> 0 then + error (f_"qemu-img command failed, see e...

..."file.driver", JSON.String "null-co"; + "file.size", JSON.String "1E"; + ] in + let target_file = TargetURI ("json:" ^ JSON.string_of_doc json_params) in - (* While it's not intended that output drivers can set the - * target_format field (thus overriding the -of option), in - * this special case of -o null it is reasonable. - *) - let target_format = "raw" in + (* While it's not intended that output drivers can set the + * target_format field (thus overriding the -of option), in + * t...

...symlink to a block device. In this case we don't > > + * create/overwrite the block device. (RHBZ#1868690). > > *) > > - (* What output preallocation mode should we use? *) > > - let preallocation = > > - match t.target_format, cmdline.output_alloc with > > - | ("raw"|"qcow2"), Sparse -> Some "sparse" > > - | ("raw"|"qcow2"), Preallocated -> Some "full" > > - | _ -> None (* ignore -oa flag for other for...

...ce or > + * symlink to a block device. In this case we don't > + * create/overwrite the block device. (RHBZ#1868690). > *) > - (* What output preallocation mode should we use? *) > - let preallocation = > - match t.target_format, cmdline.output_alloc with > - | ("raw"|"qcow2"), Sparse -> Some "sparse" > - | ("raw"|"qcow2"), Preallocated -> Some "full" > - | _ -> None (* ignore -oa flag for other formats *) in >...

This patch series lifts the previous restriction that virt-v2v would refuse to convert a guest to Glance that had more than one disk. The first patch is just better documentation for the Glance output mode. The second patch contains the change (best viewed with 'git diff -w' since it is mostly a whitespace change). virt-v2v -o glance will now create multiple disks called: - guestname

...2v/output_glance.ml @@ -73,12 +73,6 @@ object if i == 0 then source.s_name else sprintf "%s-disk%d" source.s_name (i+1) in - let cmd = [ "glance"; "image-create"; "--name"; name; - "--disk-format=" ^ target_format; - "--container-format=bare"; "--file"; target_file ] in - if run_command cmd <> 0 then - error (f_"glance: image upload to glance failed, see earlier errors"); - (* Set the properties (ie. metadata). *) let mi...

...index 8de48aec..a6a52294 100644 --- a/v2v/types.ml +++ b/v2v/types.ml @@ -530,7 +530,7 @@ class virtual output = object method check_target_firmware (_ : guestcaps) (_ : target_firmware) = () method override_output_format (_ : overlay) = (None : string option) method transfer_format t = t.target_format - method virtual prepare_targets : string -> (string * overlay) list -> target_file list + method virtual prepare_targets : string -> (string * overlay) list -> guestcaps -> target_file list method disk_create = (open_guestfs ())#disk_create method disk_copied (_ : target) (_...

...le } - ) targets + let json_params = [ + "file.driver", JSON.String "null-co"; + "file.size", JSON.String "1E"; + ] in + let target_file = "json:" ^ JSON.string_of_doc json_params in + (* XXX It's not really right to set target_format here, but + * it works. + *) + let target_format = "raw" in + List.map (fun t -> { t with target_file; target_format }) targets method create_metadata _ _ _ _ _ _ = () + + (* Stops the main program from calling g#disk_create to try to create + * the null device. +...

.... In this case we don't > > > + * create/overwrite the block device. (RHBZ#1868690). > > > *) > > > - (* What output preallocation mode should we use? *) > > > - let preallocation = > > > - match t.target_format, cmdline.output_alloc with > > > - | ("raw"|"qcow2"), Sparse -> Some "sparse" > > > - | ("raw"|"qcow2"), Preallocated -> Some "full" > > > - | _ -> None (* ignore -oa fla...

...overlay file: %s + overlay device name: %s +overlay virtual disk size: %Ld + overlay source qemu URI: %s " ov.ov_overlay_file ov.ov_sd @@ -304,12 +303,9 @@ and target_file = | TargetURI of string let string_of_target t = - sprintf "\ -target_file = %s -target_format = %s -target_estimated_size = %s -target_overlay = %s -target_overlay.ov_source = %s + sprintf " target file: %s + target format: %s +target estimated size: %s " (match t.target_file with | TargetFile s -> "[file] " ^ s @@ -317,8 +313,6 @@ target_...

...ed 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 = None; - target_actual_size = None; - target_overlay = ov } - ) overlays in - let targets = output#prepare_targets source targets in - (* Inspection - this also mounts up the filesystems. *) message (f_"Inspecting the over...

This adds --print-target. In addition, v2 provides a machine-readable version (in JSON format). All of the record -> JSON boilerplate in this patch could be eliminated if we moved the baseline to OCaml 4.02. Rich.

..._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 ] @ > + (* XXX When using NBD we must use raw format, not the target_format > + * which is the disk format. commpressed format will also not work. *) > + [ "-n"; "-f"; "qcow2"; "-O"; "raw" ] @ This is going to break al...

...> > > | TargetURI uri -> uri in > > > [ "qemu-img"; "convert" ] @ > > > (if not (quiet ()) then [ "-p" ] else []) @ > > > - [ "-n"; "-f"; "qcow2"; "-O"; t.target_format ] @ > > > + (* XXX When using NBD we must use raw format, not the > > target_format > > > + * which is the disk format. commpressed format will also not > > work. *) > > > + [ "-n"; "-f"; "qcow2"; "-O&quo...

...9;t > > > > + * create/overwrite the block device. (RHBZ#1868690). > > > > *) > > > > - (* What output preallocation mode should we use? *) > > > > - let preallocation = > > > > - match t.target_format, cmdline.output_alloc with > > > > - | ("raw"|"qcow2"), Sparse -> Some "sparse" > > > > - | ("raw"|"qcow2"), Preallocated -> Some "full" > > > > - | _ -> None (*...