search for: xpath_to_str

When importing from VMware via the libvirt driver, the libvirt driver can add an empty source bridge name: <interface type='bridge'> <mac address='00:01:02:03:04:05:06'/> <source bridge=''/> </interface> Replicate what we do on the -i ova path, and map these to "eth0", "eth1" etc. This also includes a bunch

...om> --- v2v/input_ova.ml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/v2v/input_ova.ml b/v2v/input_ova.ml index d640d4a..46b6bb6 100644 --- a/v2v/input_ova.ml +++ b/v2v/input_ova.ml @@ -202,9 +202,7 @@ object (* Search for vm name. *) let name = - xpath_to_string "/ovf:Envelope/ovf:VirtualSystem/ovf:Name/text()" "" in - if name = "" then - error (f_"could not parse ovf:Name from OVF document"); + xpath_to_string "/ovf:Envelope/ovf:VirtualSystem/ovf:Name/text()" "default" in (...

...changed, 3 insertions(+), 5 deletions(-) > > diff --git a/v2v/input_ova.ml b/v2v/input_ova.ml > index d640d4a..46b6bb6 100644 > --- a/v2v/input_ova.ml > +++ b/v2v/input_ova.ml > @@ -202,9 +202,7 @@ object > > (* Search for vm name. *) > let name = > - xpath_to_string "/ovf:Envelope/ovf:VirtualSystem/ovf:Name/text()" "" in > - if name = "" then > - error (f_"could not parse ovf:Name from OVF document"); > + xpath_to_string "/ovf:Envelope/ovf:VirtualSystem/ovf:Name/text()" "default&qu...

...ler parent_id in + let parent_id = xpath_to_int "rasd:Parent/text()" 0 in + let controller = + match parent_id with + | 0 -> None + | id -> parent_controller id in Xml.xpathctx_set_current_context xpathctx n; let file_id = xpath_to_string "rasd:HostResource/text()" "" in @@ -255,14 +258,17 @@ object Xml.xpathctx_set_current_context xpathctx n; let id = xpath_to_int "rasd:ResourceType/text()" 0 in assert (id = 14 || id = 15 || id = 16); - let parent_id = xpath_to_int...

...if nr_nodes < 1 then None else ( (* Ignore everything except the first <graphics> device. *) - let node = Xml.xpathobj_node doc obj 0 in + let node = Xml.xpathobj_node obj 0 in Xml.xpathctx_set_current_context xpathctx node; let keymap = match xpath_to_string "@keymap" "" with "" -> None | k -> Some k in @@ -150,7 +150,7 @@ let parse_libvirt_xml ?conn xml = if nr_nodes < 1 then None else ( (* Ignore everything except the first <sound> device. *) - let node = Xml.xpathobj_node doc obj...

...if nr_nodes < 1 then None else ( (* Ignore everything except the first <graphics> device. *) - let node = Xml.xpathobj_node doc obj 0 in + let node = Xml.xpathobj_node obj 0 in Xml.xpathctx_set_current_context xpathctx node; let keymap = match xpath_to_string "@keymap" "" with "" -> None | k -> Some k in @@ -150,7 +150,7 @@ let parse_libvirt_xml ?conn xml = if nr_nodes < 1 then None else ( (* Ignore everything except the first <sound> device. *) - let node = Xml.xpathobj_node doc obj...

In version 2: - No substantial change, I just tidied up the code a bit. - Removed one case where whitespace changes had crept in. Rich.

OVA not a real standard. Colour me surprised ...

...t_id = xpath_to_int "rasd:Parent/text()" 0 in > + let controller = > + match parent_id with > + | 0 -> None > + | id -> parent_controller id in > > Xml.xpathctx_set_current_context xpathctx n; > let file_id = xpath_to_string "rasd:HostResource/text()" "" in > @@ -255,14 +258,17 @@ object > Xml.xpathctx_set_current_context xpathctx n; > let id = xpath_to_int "rasd:ResourceType/text()" 0 in > assert (id = 14 || id = 15 || id = 16); > - let...

This patch series adds stable bus and slot numbers for removable drives (CDs and floppies) when the guest is converted using virt-v2v or virt-p2v. Previously we were a bit random about this. After this patch series, the bus and slot numbers and preserved if at all possible. BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1238053 Rich.