search for: parse_memori

Provide a helper function rather than having callers read the file and then parse the string. --- mllib/xml.ml | 4 ++++ mllib/xml.mli | 3 +++ 2 files changed, 7 insertions(+) diff --git a/mllib/xml.ml b/mllib/xml.ml index e67245188..78e75b8f2 100644 --- a/mllib/xml.ml +++ b/mllib/xml.ml @@ -67,6 +67,10 @@ let parse_memory xml = Gc.finalise free_docptr docptr; docptr +let parse_file

No need to read the whole OVF file in memory and parse that -- let libxml2 parse it directly. --- v2v/parse_ovf_from_ova.ml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/v2v/parse_ovf_from_ova.ml b/v2v/parse_ovf_from_ova.ml index 27761d23..5acf7070 100644 --- a/v2v/parse_ovf_from_ova.ml +++ b/v2v/parse_ovf_from_ova.ml @@ -36,8 +36,7 @@ type ovf_disk = { } let

Now that we have a Libvirt.Pool object for the output storage pool, query it to get its name instead of reading it from the XML. The result is unchanged. --- v2v/output_libvirt.ml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/v2v/output_libvirt.ml b/v2v/output_libvirt.ml index 0247e5ad..dfd5d1a3 100644 --- a/v2v/output_libvirt.ml +++ b/v2v/output_libvirt.ml @@

There is already a libosinfo reading function located in src folder to get the iso informations. Provide a similar but more generic function to be used in ocaml tools. --- mllib/Makefile.am | 12 ++++++++-- mllib/osinfo.ml | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++ mllib/osinfo.mli | 21 ++++++++++++++++++ mllib/osinfopath.ml | 1 + 4 files changed, 96 insertions(+), 2

To allow other pieces of code to process XML files easily, move the xml.ml* and xpath_helpers.ml* from v2v to mllib. --- docs/C_SOURCE_FILES | 2 +- mllib/Makefile.am | 9 ++++++-- {v2v => mllib}/xml-c.c | 47 +++++++++++++++++++------------------- {v2v => mllib}/xml.ml | 49 ++++++++++++++++++++++------------------ {v2v =>

Some ova files have their ovf and other files inside a folder rather than at the root of the tarball. Consider the paths relative to the ovf file to cover this case too. --- v2v/Makefile.am | 1 + v2v/input_ova.ml | 3 +- v2v/test-v2v-i-ova-subfolders.sh | 88 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 91 insertions(+), 1 deletion(-) create mode

Store the Libvirt.Connect.t object as instance variable, so it can be used also outside of prepare_targets. Use a private method to access it, so there is no need to directly use the Lazy object. --- v2v/output_libvirt.ml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/v2v/output_libvirt.ml b/v2v/output_libvirt.ml index 30857c572..e62e43bb8 100644 ---

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

On Thursday 19 May 2016 17:26:12 Cédric Bosdonnat wrote: > Some ova files have their ovf and other files inside a folder rather > than at the root of the tarball. Consider the paths relative to the > ovf file to cover this case too. > --- Ouch... this standard is getting more funky implementations, I see... what is the producer of this kind of ova? A couple of notes below. >

If you free an xmlDocPtr before any xmlXPathObjectPtrs that reference the doc, you'll get valgrind errors like this: ==7390== Invalid read of size 4 ==7390== at 0x4EB8BC6: xmlXPathFreeNodeSet (xpath.c:4185) ==7390== by 0x4EB8CC5: xmlXPathFreeObject (xpath.c:5492) ==7390== by 0x400A56: main (in /tmp/test) ==7390== Address 0x60c0928 is 8 bytes inside a block of size 120

If you free an xmlDocPtr before any xmlXPathObjectPtr 's that reference the doc, you'll get valgrind errors like this: ==7390== Invalid read of size 4 ==7390== at 0x4EB8BC6: xmlXPathFreeNodeSet (xpath.c:4185) ==7390== by 0x4EB8CC5: xmlXPathFreeObject (xpath.c:5492) ==7390== by 0x400A56: main (in /tmp/test) ==7390== Address 0x60c0928 is 8 bytes inside a block of size

Currently -i libvirtxml mode only works for local files or NBD disks. The purpose of NBD is to support virt-p2v. This change adds support for network disks over http or https, ie: <disk type='network' device='disk'> <driver name='qemu' type='raw'/> <source protocol="http" name="/scratch/disk.img">

Instead of using ‘xpath_(string|int|int64)_default’ we can write the equivalent code using ‘Option.default’. This is not quite so concise, but may be easier to understand. eg: xpath_int_default xctx "xpath_expr" 10 -> Option.default 10 (xpath_int xctx "xpath_expr") --- common/mltools/xpath_helpers.ml | 12 ------------ common/mltools/xpath_helpers.mli | 6 ------

Hi, I am trying to add xmlXPathRegisterNs() to v2v/xml-c.c but I get a seg fault, the signature should be: http://xmlsoft.org/html/libxml-xpathInternals.html#xmlXPathRegisterNs I think I am wrong in CAMLparam and CAMLlocal..., Following is the patch: =================================================================================== diff --git a/v2v/xml-c.c b/v2v/xml-c.c index 4c9bc77..a917c24

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

Enhance the Libvirt_utils module with libvirt connection objects, and read-only and read-writen open functions for them; adapt the rest of the mini-binding to use these objects, instead of opening + closing libvirt connections every time. This has different improvements: a) a libvirt connection is reused for different API calls, improving the communication with remote (input) servers b)

Implement what old virt-v2v did (from lib/Sys/VirtConvert/Connection/LibVirtTarget.pm) Thanks: Tingting Zheng, Matthew Booth --- v2v/output_libvirt.ml | 118 ++++++++++++++++++++++++++++++++++++++++++++++--- v2v/output_libvirt.mli | 2 +- v2v/output_local.ml | 13 +++++- v2v/test-v2v-i-ova.xml | 5 ++- 4 files changed, 128 insertions(+), 10 deletions(-) diff --git

Mixing the XML parsing with the other functions of this module made it very hard to understand. Splitting the XML parsing into another module simplifies the flow considerably. This is just code refactoring and should not affect the semantics. --- v2v/Makefile.am | 2 + v2v/input_ova.ml | 323 +++++++++++---------------------------------- v2v/parse_ovf_from_ova.ml | 226

Currently virt-v2v has few custom C-based functions for libvirt operations, which are limited in what they do, and there is a lot of duplicated code. Instead, switch to ocaml-libvirt for all the libvirt interaction currently done by the Libvirt_utils module. This has few advantages: - each input & output module now opens a libvirt connection only once, only when needed - no need to pass

A couple of patches cleaning up the -i ova code. These are both just refactoring (or should be at any rate). The second patch is best viewed with 'git show -w' to exclude whitespace changes. Rich.