search for: kvmuid

...lib/lib -I$(top_builddir)/gnulib/lib \ diff --git a/v2v/Makefile.am b/v2v/Makefile.am index 7435d5c..cbc14be 100644 --- a/v2v/Makefile.am +++ b/v2v/Makefile.am @@ -86,7 +86,7 @@ SOURCES_ML = \ v2v.ml SOURCES_C = \ - $(top_srcdir)/mllib/mkdtemp-c.c \ + ../mllib/mkdtemp-c.c \ domainxml-c.c \ kvmuid-c.c \ utils-c.c \ -- 2.5.0

...-97,12 +97,7 @@ SOURCES_ML = \ v2v.ml SOURCES_C = \ - $(top_srcdir)/fish/progress.c \ - $(top_srcdir)/fish/file-edit.c \ - $(top_srcdir)/mllib/progress-c.c \ $(top_srcdir)/mllib/mkdtemp-c.c \ - $(top_srcdir)/customize/crypt-c.c \ - $(top_srcdir)/customize/perl_edit-c.c \ domainxml-c.c \ kvmuid-c.c \ utils-c.c \ @@ -117,8 +112,7 @@ virt_v2v_CPPFLAGS = \ -I. \ -I$(top_builddir) \ -I$(shell $(OCAMLC) -where) \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/fish + -I$(top_srcdir)/src virt_v2v_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \ $(LIBXML2_CFLAGS) \ @@ -129,20 +123,10 @@ BOBJE...

...doc -> string - (** Serialize {!doc} object as a string. *) diff --git a/v2v/Makefile.am b/v2v/Makefile.am index 8bf8f07..dafe27e 100644 --- a/v2v/Makefile.am +++ b/v2v/Makefile.am @@ -37,7 +37,6 @@ SOURCES_MLI = \ input_libvirt.mli \ input_libvirtxml.mli \ input_ova.mli \ - JSON.mli \ kvmuid.mli \ linux.mli \ modules_list.mli \ @@ -62,7 +61,6 @@ SOURCES_ML = \ xml.ml \ domainxml.ml \ DOM.ml \ - JSON.ml \ kvmuid.ml \ vCenter.ml \ xen.ml \ @@ -122,6 +120,7 @@ BOBJECTS = \ $(top_builddir)/mllib/progress.cmo \ $(top_builddir)/mllib/config.cmo \ $(top_builddir)/mllib/m...

See earlier thread on libvir-list: https://www.redhat.com/archives/libvir-list/2015-September/thread.html#00201 Libvirt >= 1.2.20 supplies the correct dcPath parameter. If it is available in the libvirt XML, use it, otherwise fall back to the old method of trying to guess it from the vpx:// path. Patches 1, 2 and 4 are just refactoring around this change. Rich.

.. and a lot of refactoring. https://bugzilla.redhat.com/show_bug.cgi?id=1167623 Rich.

https://bugzilla.redhat.com/show_bug.cgi?id=1167623

...heck_storage_domain domain_class os mp | server, export -> @@ -172,7 +172,7 @@ object (* See if we can write files as UID:GID 36:36. *) let () = - let testfile = esd_mp // esd_uuid // string_random8 () in + let testfile = esd_mp // esd_uuid // String.random8 () in Kvmuid.make_file kvmuid_t testfile ""; let stat = stat testfile in Kvmuid.unlink kvmuid_t testfile; diff --git a/v2v/output_vdsm.ml b/v2v/output_vdsm.ml index 670d8ba..a5656b1 100644 --- a/v2v/output_vdsm.ml +++ b/v2v/output_vdsm.ml @@ -80,7 +80,7 @@ object (List.length ta...

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

Commits 3c27f3d91e1566854747bbe844186783fc84f3a8 and 1b6f0daa9ae7fcc94e389232d0c397816cda973d added an internal API for running commands asynchronously. It is only used by the copy-in and copy-out APIs. Unfortunately this made the command code very complex: it was almost impossible to redirect stderr to a file, and there were a lot of long-range dependencies through the file. It was also buggy:

Hide/prevent the use of bad string functions like String.lowercase. These are replaced by safe functions that won't break UTF-8 strings. Other miscellaneous refactoring. Rich.

...utput_rhev verbose os vmtype output_alloc = +class output_rhev os vmtype output_alloc = (* Create a UID-switching handle. If we're not root, create a dummy * one because we cannot switch UIDs. *) @@ -113,7 +113,7 @@ class output_rhev verbose os vmtype output_alloc = else Kvmuid.create () in object - inherit output verbose + inherit output method as_options = sprintf "-o rhev -os %s%s" os @@ -163,10 +163,10 @@ object *) method prepare_targets _ targets = let mp, uuid = - mount_and_check_storage_domain verbose (s_"Export Storage...