search for: append_child

...tr ("passwd", pw) graphics + | _ -> ()); + (match source.s_display with + | Some { s_listen = listen } -> (match listen with - | LAddress a -> - let sub = e "listen" [ "type", "address"; "address", a ] [] in - append_child sub graphics - | LNetwork n -> - let sub = e "listen" [ "type", "network"; "network", n ] [] in - append_child sub graphics - | LNone -> ()) - | _ -> ()); - (match source.s_display with - | Some { s_port = Some p } -&...

...arget_buses guestcaps (match source.s_display with | Some { s_listen = listen } -> (match listen with + | LNoListen -> () | LAddress a -> let sub = e "listen" [ "type", "address"; "address", a ] [] in append_child sub graphics | LNetwork n -> let sub = e "listen" [ "type", "network"; "network", n ] [] in append_child sub graphics - | LNone -> ()) + | LSocket s -> + let sub = e "listen" [ "type&q...

...l index 19e0a52..c276109 100644 --- a/v2v/create_libvirt_xml.ml +++ b/v2v/create_libvirt_xml.ml @@ -249,7 +249,9 @@ let create_libvirt_xml ?pool source target_buses guestcaps let sub = e "listen" [ "type", "network"; "network", n ] [] in append_child sub graphics | LSocket s -> - let sub = e "listen" [ "type", "socket"; "socket", s ] [] in + let attrs = [ "type", "socket" ] @ + (match s with None -> [] | Some s -> [ "socket", s ])...

...uot;, generated_by; - ] [] in + ] in + (match t.target_actual_size with + | None -> () + | Some actual_size -> + List.push_back attrs ("ovf:size", Int64.to_string actual_size) + ); + e "File" !attrs [] in append_child disk references; (* Add disk to DiskSection. *) diff --git a/v2v/test-v2v-o-rhv.ovf.expected b/v2v/test-v2v-o-rhv.ovf.expected index 1deec9c9d..7bcc456c5 100644 --- a/v2v/test-v2v-o-rhv.ovf.expected +++ b/v2v/test-v2v-o-rhv.ovf.expected @@ -2,7 +2,7 @@ <ovf:Envelope xmlns:rasd='htt...

Just refactoring, no change. --- sparsify/cmdline.ml | 49 +++++++++++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/sparsify/cmdline.ml b/sparsify/cmdline.ml index ce2b913..bd49e71 100644 --- a/sparsify/cmdline.ml +++ b/sparsify/cmdline.ml @@ -98,6 +98,7 @@ read the man page virt-sparsify(1). let check_tmpdir = !check_tmpdir in let

...;features/*" in + + let features = ref [] in + for i = 0 to Xml.xpathobj_nr_nodes obj - 1 do + let feature_node = Xml.xpathobj_node doc obj i in + let feature_name = Xml.node_name feature_node in + features := feature_name :: !features + done; + !features + ) + let append_child child = function | PCData _ | Comment _ -> assert false | Element e -> e.e_children <- e.e_children @ [child] @@ -33,15 +69,48 @@ let append_attr attr = function | PCData _ | Comment _ -> assert false | Element e -> e.e_attrs <- e.e_attrs @ [attr] -let create_libvir...

v2 -> v3: - Changes to the Curl API suggested by Pino.

v1 -> v2: - Fixed the bug with precedence of if / @. - Add some imperative list operators inspired by Perl, and use those for constructing the Curl arguments, and more. Rich.

Deep in the discussion of this bug, unfortunately mostly in private comments: https://bugzilla.redhat.com/show_bug.cgi?id=1594515 we decided it'd be more flexible for RHV if we had a way to map individual NICs to target networks and bridges. This can be done by adding a new --mac option so you can specify the exact mapping you need: $ virt-v2v [...] \ --mac

v2 -> v3: - Renamed List.assoc_ -> List.assoc_lbl. - Rebased on top of current master branch. Rich.

In Std_utils we already extend Char and String. These commits take it a little further by extending List and adding a new Option submodule. All basically simple refactoring. Rich.

This time including the first commit ...