search for: copy_doc

...it 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 file = + let xml = Common_utils.read_whole_file file in + parse_memory xml + external _copy_doc : docptr -> recursive:bool -> docptr = "mllib_xml_copy_doc" let copy_doc docptr ~recursive = let copy = _copy_doc docptr ~recursive in diff --git a/mllib/xml.mli b/mllib/xml.mli index 9b2bc5c18..92d4977a2 100644 --- a/mllib/xml.mli +++ b/mllib/xml.mli @@ -33,6 +33,9 @@ val parse...

...= xpathobjptr_val (xpathobjv); @@ -106,7 +107,7 @@ v2v_xml_free_xpathobjptr (value xpathobjv) } value -v2v_xml_parse_memory (value xmlv) +mllib_xml_parse_memory (value xmlv) { CAMLparam1 (xmlv); CAMLlocal1 (docv); @@ -128,7 +129,7 @@ v2v_xml_parse_memory (value xmlv) } value -v2v_xml_copy_doc (value docv, value recursivev) +mllib_xml_copy_doc (value docv, value recursivev) { CAMLparam2 (docv, recursivev); CAMLlocal1 (copyv); @@ -147,7 +148,7 @@ v2v_xml_copy_doc (value docv, value recursivev) } value -v2v_xml_to_string (value docv, value formatv) +mllib_xml_to_string (value do...

...eeing an object before all the C references to it are + * freed. *) -type node = doc * node_ptr +type xpathctx = doc_ptr * xpathctx_ptr +type xpathobj = xpathctx * xpathobj_ptr +type node = doc_ptr * node_ptr -external parse_memory : string -> doc = "v2v_xml_parse_memory" -external copy_doc : doc -> recursive:bool -> doc = "v2v_xml_copy_doc" +external free_doc_ptr : doc_ptr -> unit = "v2v_xml_free_doc_ptr" +external free_xpathctx_ptr : xpathctx_ptr -> unit = "v2v_xml_free_xpathctx_ptr" +external free_xpathobj_ptr : xpathobj_ptr -> unit = &q...

...llector, else we could + * end up freeing an object before all the C references to it are + * freed. *) +type xpathctx = doc * xpathctx_ptr +type xpathobj = xpathctx * xpathobj_ptr type node = doc * node_ptr -external parse_memory : string -> doc = "v2v_xml_parse_memory" -external copy_doc : doc -> recursive:bool -> doc = "v2v_xml_copy_doc" +external free_doc : doc -> unit = "v2v_xml_free_doc" +external _parse_memory : string -> doc = "v2v_xml_parse_memory" +let parse_memory xml = + let doc = _parse_memory xml in + Gc.finalise free_doc doc;...

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

Hi guys, Here is a v3 of the series, including changes to answer Richard's comments. Cédric Bosdonnat (10): mllib: factorize code to add Checksum.get_checksum function Move xml and xpath_helpers OCAML code to mllib mllib: add Xml.parse_file helper lib/osinfo.c: Extract xml processing into a callback lib: extract osinfo DB traversing API mllib: ocaml wrapper for lib/osinfo

...ring the boot test. This + * makes post-mortems a bit easier. + *) + let boot_disk = test ^ "-booted-sda" in + (new G.guestfs ())#disk_create boot_disk "qcow2" (-1L) + ~backingfile:converted_disk ~backingformat:"qcow2"; + + let boot_xml_doc = Xml.copy_doc converted_xml_doc ~recursive:true in + + (* We need to remember to change the XML to point to the boot overlay. *) + let () = + let xpathctx = Xml.xpath_new_context boot_xml_doc in + let xpath = + Xml.xpath_eval_expression xpathctx + "/domain/devices/disk[@devic...

As I'm now working through the enormous virt-v2v/virt-p2v bug list, we need a high quality set of tests to ensure that we don't accidentally regress some old OS/hypervisor combination while making changes. The test cases are going to be huge, so we cannot possibly distribute them in libguestfs. Furthermore many of them have licensing problems which means we cannot redistribute them at

Hi all, Here is a new version of the virt-builder-repository series taking care of Pino's comments. It has also been rebased on recent master. Cédric Bosdonnat (7): mllib: factorize code to add Checksum.get_checksum function Move xml and xpath_helpers OCAML code to mllib mllib: expose libosinfo DB reading functions in mllib builder: rename docs test script builder: add

This is just the utilities part of the patch series from: https://www.redhat.com/archives/libguestfs/2017-June/msg00103.html I believe this addresses everything raised in comments on that patch series. Rich.

This turned out to be rather more involved than I thought. We have lots of utility functions, spread all over the repository, with not a lot of structure. This moves many of them under common/ and structures them so there are clear dependencies. This doesn't complete the job by any means. Other items I had on my to-do list for this change were: - Split up mllib/common_utils into: -

This is a combination of: https://www.redhat.com/archives/libguestfs/2017-June/msg00046.html [PATCH 00/12] Refactor utility functions. plus: https://www.redhat.com/archives/libguestfs/2017-June/msg00023.html [PATCH v3 00/19] Allow APIs to be implemented in OCaml. with the second patches rebased on top of the utility refactoring, and some other adjustments and extensions. This passes

v5: https://www.redhat.com/archives/libguestfs/2017-June/msg00065.html Since v5, this now implements inspection almost completely for Linux and Windows guests. Rich.

v7 was: https://www.redhat.com/archives/libguestfs/2017-June/msg00169.html https://www.redhat.com/archives/libguestfs/2017-June/msg00184.html I believe this addresses all comments received so far. Also it now passes a test where I compared about 100 disk images processed with old and new virt-inspector binaries. The output is identical in all cases except one which is caused by a bug in blkid