[Pkg-libvirt-commits] [libguestfs] 11/146: v2v: -i ova: XML is case-sensitive, so replace 'InstanceId' with 'InstanceID'.

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch master
in repository libguestfs.

commit f1cda31465b926d1d9a65f841cb9245573206f2b
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Tue Nov 18 12:35:38 2014 +0000

    v2v: -i ova: XML is case-sensitive, so replace 'InstanceId' with 'InstanceID'.
    
    (cherry picked from commit 78f6d3aff59ab0a539b8f2a90b88a2b6f7c994f6)
---
 v2v/input_ova.ml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/v2v/input_ova.ml b/v2v/input_ova.ml
index 3aa1182..2c4a35a 100644
--- a/v2v/input_ova.ml
+++ b/v2v/input_ova.ml
@@ -171,9 +171,11 @@ object
         Xml.xpathctx_set_current_context xpathctx n;
         let address = xpath_to_int "rasd:AddressOnParent/text()" 0 in
         let parent_id = xpath_to_int "rasd:Parent/text()" 0 in
-        (* Probably the parent controller. *)
-        let expr = sprintf "/ovf:Envelope/ovf:VirtualSystem/ovf:VirtualHardwareSection/ovf:Item[rasd:InstanceId/text()=%d]/rasd:ResourceType/text()" parent_id in
+
+        (* Find the parent controller. *)
+        let expr = sprintf "/ovf:Envelope/ovf:VirtualSystem/ovf:VirtualHardwareSection/ovf:Item[rasd:InstanceID/text()=%d]/rasd:ResourceType/text()" parent_id in
         let controller = xpath_to_int expr 0 in
+
         (* 6: iscsi controller, 5: ide. assuming scsi or ide *)
         let target_dev =
           match controller with
@@ -243,9 +245,11 @@ object
         assert (id = 14 || id = 15 || id = 16);
         let address = xpath_to_int "rasd:AddressOnParent/text()" 0 in
         let parent_id = xpath_to_int "rasd:Parent/text()" 0 in
-        (* Probably the parent controller. *)
-        let expr = sprintf "/ovf:Envelope/ovf:VirtualSystem/ovf:VirtualHardwareSection/ovf:Item[rasd:InstanceId/text()=%d]/rasd:ResourceType/text()" parent_id in
+
+        (* Find the parent controller. *)
+        let expr = sprintf "/ovf:Envelope/ovf:VirtualSystem/ovf:VirtualHardwareSection/ovf:Item[rasd:InstanceID/text()=%d]/rasd:ResourceType/text()" parent_id in
         let controller = xpath_to_int expr 0 in
+
         (* 6: iscsi controller, 5: ide. assuming scsi or ide *)
         let target_dev =
           match controller with

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git