From: Richard W.M. Jones Date: Thu, 3 Sep 2015 19:08:24 +0000 (+0100) Subject: Adapt for modified Xml.xpathobj_node API in libguestfs. X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=08e70aa3a6b6cb1b33752ab994ae95b149e7fd2e;p=virt-v2v-test-cases-nonfree.git Adapt for modified Xml.xpathobj_node API in libguestfs. In commit 3888582da89c757d0740d11c3a62433d748c85aa, the internal libguestfs API Xml.xpathobj_node changed its signature. Since we use this internal API, our code broke. Adapt to the new signature. --- diff --git a/windows-virtio/win_2012r2_x86_64.ml b/windows-virtio/win_2012r2_x86_64.ml index 7c5c49c..79de7af 100644 --- a/windows-virtio/win_2012r2_x86_64.ml +++ b/windows-virtio/win_2012r2_x86_64.ml @@ -8,7 +8,7 @@ let check_virtio_blk g root xml = let xpath = Xml.xpath_eval_expression xpathctx "/domain/devices/disk[@device=\"disk\"]/target/@bus" in let nr_nodes = Xml.xpathobj_nr_nodes xpath in assert (nr_nodes = 1); - let node = Xml.xpathobj_node xml xpath 0 in + let node = Xml.xpathobj_node xpath 0 in let node = Xml.node_as_string node in assert (node = "virtio") diff --git a/windows-virtio/win_81pro_x86_64.ml b/windows-virtio/win_81pro_x86_64.ml index a9e3d7b..47c03b6 100644 --- a/windows-virtio/win_81pro_x86_64.ml +++ b/windows-virtio/win_81pro_x86_64.ml @@ -8,7 +8,7 @@ let check_virtio_blk g root xml = let xpath = Xml.xpath_eval_expression xpathctx "/domain/devices/disk[@device=\"disk\"]/target/@bus" in let nr_nodes = Xml.xpathobj_nr_nodes xpath in assert (nr_nodes = 1); - let node = Xml.xpathobj_node xml xpath 0 in + let node = Xml.xpathobj_node xpath 0 in let node = Xml.node_as_string node in assert (node = "virtio")