search for: name_from_disk

Don't use "default", choose a better default name if <Name> is not present in the OVF. Rich.

Simple code motion. --- v2v/Makefile.am | 2 ++ v2v/input_disk.ml | 21 ++------------------- v2v/name_from_disk.ml | 41 +++++++++++++++++++++++++++++++++++++++++ v2v/name_from_disk.mli | 24 ++++++++++++++++++++++++ 4 files changed, 69 insertions(+), 19 deletions(-) create mode 100644 v2v/name_from_disk.ml create mode 100644 v2v/name_from_disk.mli diff --git a/v2v/Makefile.am b/v2v/Makefile.am index 5c1...

...om the basename of the OVA file instead. For example: virt-v2v -i ova /path/to/myguest.ova [...] would use "myguest" as the name (assuming no <Name> was present). Modifies the behaviour of commit 1ae4252c93c685cb8561b55c1231502b37212b5a. --- v2v/input_ova.ml | 3 ++- v2v/name_from_disk.ml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/v2v/input_ova.ml b/v2v/input_ova.ml index 974caeb..c1dff71 100644 --- a/v2v/input_ova.ml +++ b/v2v/input_ova.ml @@ -23,6 +23,7 @@ open Common_utils open Types open Utils +open Name_from_disk class input_ova ova = let...

On Friday, 9 September 2016 15:09:56 CEST Richard W.M. Jones wrote: > Simple code motion. > --- > v2v/Makefile.am | 2 ++ > v2v/input_disk.ml | 21 ++------------------- > v2v/name_from_disk.ml | 41 +++++++++++++++++++++++++++++++++++++++++ > v2v/name_from_disk.mli | 24 ++++++++++++++++++++++++ > 4 files changed, 69 insertions(+), 19 deletions(-) > create mode 100644 v2v/name_from_disk.ml > create mode 100644 v2v/name_from_disk.mli Looks good -- I'd have put it in...

On Friday, 8 December 2017 17:02:30 CET Richard W.M. Jones wrote: > This enhances the existing VMX input support allowing it to be > used over SSH to the ESXi server. > > The original command (for local .vmx files) was: > > $ virt-v2v -i vmx guest.vmx -o local -os /var/tmp > > Adding ‘-it ssh’ and using an SSH remote path gives the new syntax: > > $ virt-v2v \

...recheck : unit -> unit diff --git a/v2v/input_vmx.ml b/v2v/input_vmx.ml index c50217b9e..3032eba96 100644 --- a/v2v/input_vmx.ml +++ b/v2v/input_vmx.ml @@ -21,14 +21,82 @@ open Scanf open Std_utils open Tools_utils +open Unix_utils open Common_gettext.Gettext open Types open Utils open Name_from_disk -let rec find_disks vmx vmx_filename = - find_scsi_disks vmx vmx_filename @ find_ide_disks vmx vmx_filename +type vmx_source = + | File of string (* local file or NFS *) + | SSH of string option * string * string (* SSH username, server, path *) + +(* The single filenam...

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

...xpath_string = xpath_eval identity let xpath_int = xpath_eval int_of_string let xpath_int64 = xpath_eval Int64.of_string diff --git a/v2v/input_vmx.ml b/v2v/input_vmx.ml index b72161a82..c48a0155a 100644 --- a/v2v/input_vmx.ml +++ b/v2v/input_vmx.ml @@ -26,8 +26,6 @@ open Types open Utils open Name_from_disk -external identity : 'a -> 'a = "%identity" - let rec find_disks vmx vmx_filename = find_scsi_disks vmx vmx_filename @ find_ide_disks vmx vmx_filename diff --git a/v2v/v2v_unit_tests.ml b/v2v/v2v_unit_tests.ml index 51284a9aa..7f98e09d3 100644 --- a/v2v/v2v_unit_tests.m...

...from_ova.ml \ linux.ml \ windows.ml \ windows_virtio.ml \ diff --git a/v2v/input_ova.ml b/v2v/input_ova.ml index 9a6a615..a0a42a7 100644 --- a/v2v/input_ova.ml +++ b/v2v/input_ova.ml @@ -24,7 +24,7 @@ open Unix_utils open Types open Utils -open Xpath_helpers +open Parse_ovf_from_ova open Name_from_disk (* Return true if [libvirt] supports ["json:"] pseudo-URLs and accepts the @@ -211,262 +211,97 @@ object disk mf mode disk actual mode disk expected; ) else - warning (f_"unable to parse line from manifest file: %S") line -...

...; + s_genid = None; (* XXX *) s_memory = memory; s_vcpu = vcpu; s_cpu_vendor = None; diff --git a/v2v/input_vmx.ml b/v2v/input_vmx.ml index 1a8015545..a5caf906b 100644 --- a/v2v/input_vmx.ml +++ b/v2v/input_vmx.ml @@ -426,6 +426,27 @@ object | File filename -> name_from_disk filename | SSH uri -> name_from_disk (path_of_uri uri) in + let genid = + (* XXX NOT yet tested against VMware. *) + let genid = Parse_vmx.get_int64 vmx ["vm"; "genid"] + and genidX = Parse_vmx.get_int64 vmx ["vm"; "genidX"] i...

...100644 --- a/v2v/Makefile.am +++ b/v2v/Makefile.am @@ -58,14 +58,10 @@ SOURCES_MLI = \ utils.mli \ vCenter.mli \ windows.mli \ - windows_virtio.mli \ - xml.mli \ - xpath_helpers.mli + windows_virtio.mli SOURCES_ML = \ types.ml \ - xml.ml \ - xpath_helpers.ml \ uefi.ml \ utils.ml \ name_from_disk.ml \ @@ -103,8 +99,7 @@ SOURCES_ML = \ SOURCES_C = \ domainxml-c.c \ - utils-c.c \ - xml-c.c + utils-c.c if HAVE_OCAML @@ -118,7 +113,6 @@ virt_v2v_CPPFLAGS = \ -I$(top_srcdir)/src virt_v2v_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \ - $(LIBXML2_CFLAGS) \ $(LIBVIRT_CFLAGS) BOBJ...

...s_memory = memory; > s_vcpu = vcpu; > s_cpu_vendor = None; > diff --git a/v2v/input_vmx.ml b/v2v/input_vmx.ml > index 1a8015545..a5caf906b 100644 > --- a/v2v/input_vmx.ml > +++ b/v2v/input_vmx.ml > @@ -426,6 +426,27 @@ object > | File filename -> name_from_disk filename > | SSH uri -> name_from_disk (path_of_uri uri) in > > + let genid = > + (* XXX NOT yet tested against VMware. *) > + let genid = Parse_vmx.get_int64 vmx ["vm"; "genid"] > + and genidX = Parse_vmx.get_int64 vmx ["vm&...

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.

The first patch was previously posted here: https://www.redhat.com/archives/libguestfs/2017-December/msg00018.html That patch hasn't changed except that I made the ‘input_transport’ variable type-safe. The second patch adds a significant new mode for liberating data from VMware: the ability to copy VMs over SSH directly from ESXi hypervisors. Although this requires enabling SSH access (a

...+++++++++++++++++++++++++++++++++++++ v2v/output_kubevirt.mli | 24 +++++++++++ 4 files changed, 150 insertions(+) diff --git a/v2v/Makefile.am b/v2v/Makefile.am index f36731750..2f6953463 100644 --- a/v2v/Makefile.am +++ b/v2v/Makefile.am @@ -66,6 +66,7 @@ SOURCES_MLI = \ modules_list.mli \ name_from_disk.mli \ output_glance.mli \ + output_kubevirt.mli \ output_libvirt.mli \ output_local.mli \ output_null.mli \ @@ -132,6 +133,7 @@ SOURCES_ML = \ output_rhv_upload_precheck_source.ml \ output_rhv_upload.ml \ output_vdsm.ml \ + output_kubevirt.ml \ inspect_source.ml \ target_bus_assig...

v2: - 1/3: same as in previous version - 2/3: add check for libvirt version - 3/3: restore the disabled test The libvirt patch [2] that should fix our problem with 'raw' driver that is mentioned in [1] was merged. To realy fix things, there is at least one thing we have to change on our side. We have to be explicit about the driver in the JSON we generate. [1]

...+ v2v/nbdkit.mli | 47 ++++++ 4 files changed, 374 insertions(+), 246 deletions(-) diff --git a/v2v/Makefile.am b/v2v/Makefile.am index 84b56d259..2aa4b675e 100644 --- a/v2v/Makefile.am +++ b/v2v/Makefile.am @@ -78,6 +78,7 @@ SOURCES_MLI = \ measure_disk.mli \ modules_list.mli \ name_from_disk.mli \ + nbdkit.mli \ networks.mli \ openstack_image_properties.mli \ output_glance.mli \ @@ -119,6 +120,7 @@ SOURCES_ML = \ var_expander.ml \ python_script.ml \ name_from_disk.ml \ + nbdkit.ml \ vCenter.ml \ libvirt_utils.ml \ DOM.ml \ diff --git a/v2v/input_libvirt_vddk.ml b/v2v/...

...644 --- a/v2v/Makefile.am +++ b/v2v/Makefile.am @@ -98,6 +98,7 @@ SOURCES_MLI = \ utils.mli \ v2v.mli \ vCenter.mli \ + var_expander.mli \ windows.mli \ windows_virtio.mli @@ -106,6 +107,7 @@ SOURCES_ML = \ types.ml \ uefi.ml \ utils.ml \ + var_expander.ml \ python_script.ml \ name_from_disk.ml \ vCenter.ml \ @@ -442,7 +444,7 @@ TESTS += \ endif if HAVE_OCAML_PKG_OUNIT -TESTS += v2v_unit_tests +TESTS += v2v_unit_tests var_expander_tests endif if ENABLE_APPLIANCE @@ -651,7 +653,7 @@ EXTRA_DIST += \ # Unit tests. check_PROGRAMS = if HAVE_OCAML_PKG_OUNIT -check_PROGRAMS += v2...

...174 insertions(+), 3 deletions(-) diff --git a/v2v/Makefile.am b/v2v/Makefile.am index 97dd44ec9..e1fee77b0 100644 --- a/v2v/Makefile.am +++ b/v2v/Makefile.am @@ -63,6 +63,7 @@ SOURCES_MLI = \ linux.mli \ linux_bootloaders.mli \ linux_kernels.mli \ + measure_disk.mli \ modules_list.mli \ name_from_disk.mli \ networks.mli \ @@ -139,6 +140,7 @@ SOURCES_ML = \ output_vdsm.ml \ inspect_source.ml \ target_bus_assignment.ml \ + measure_disk.ml \ networks.ml \ cmdline.ml \ v2v.ml @@ -203,6 +205,7 @@ OCAMLCLIBS = \ -lqemuopts \ $(LIBVIRT_LIBS) \ $(LIBXML2_LIBS) \ + $(JANSSON_LIBS) \...

...182 insertions(+), 3 deletions(-) diff --git a/v2v/Makefile.am b/v2v/Makefile.am index 97dd44ec9..e1fee77b0 100644 --- a/v2v/Makefile.am +++ b/v2v/Makefile.am @@ -63,6 +63,7 @@ SOURCES_MLI = \ linux.mli \ linux_bootloaders.mli \ linux_kernels.mli \ + measure_disk.mli \ modules_list.mli \ name_from_disk.mli \ networks.mli \ @@ -139,6 +140,7 @@ SOURCES_ML = \ output_vdsm.ml \ inspect_source.ml \ target_bus_assignment.ml \ + measure_disk.ml \ networks.ml \ cmdline.ml \ v2v.ml @@ -203,6 +205,7 @@ OCAMLCLIBS = \ -lqemuopts \ $(LIBVIRT_LIBS) \ $(LIBXML2_LIBS) \ + $(JANSSON_LIBS) \...