search for: a8b33f66f

In previous discussion here: https://www.redhat.com/archives/libguestfs/2017-December/thread.html#00027 we preferred to use ssh://... URLs instead of server:/path. However the URL approach had the problem that the user had to replace spaces with %20 in the paths. However since using space gives an error, we can replace spaces with %20 safely in code, thus removing one obstacle from users.

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 \

...+ */ + +#ifndef GUESTFS_LIBXML2_UTILS_H_ +#define GUESTFS_LIBXML2_UTILS_H_ + +#include <libxml/uri.h> + +/* libxml2-utils.c */ +extern xmlURIPtr guestfs_int_parse_nonstandard_uri (const char *uri); + +#endif /* GUESTFS_LIBXML2_UTILS_H_ */ diff --git a/v2v/input_vmx.ml b/v2v/input_vmx.ml index a8b33f66f..b97fac700 100644 --- a/v2v/input_vmx.ml +++ b/v2v/input_vmx.ml @@ -38,11 +38,11 @@ type vmx_source = let vmx_source_of_arg input_transport arg = match input_transport, arg with | None, arg -> File arg - | Some `SSH, arg -> + | Some `SSH, uri -> let uri = - try Xml.par...

An alternate solution to: https://www.redhat.com/archives/libguestfs/2017-December/msg00035.html "[PATCH] v2v: -i vmx: Allow ssh URLs to use spaces." is to classify all URLs processed by libguestfs as either ordinary URLs or the special non-standard URLs that we use for things like ‘virt-v2v -i vmx’ and ‘guestfish --add’. For the non-standard URLs, provide a wrapper around

...- s_cpu_sockets = cpu_sockets; - s_cpu_cores = cpu_cores; - s_cpu_threads = None; (* XXX *) + s_cpu_topology = cpu_topology; s_features = []; (* XXX *) s_firmware = firmware; s_display = None; (* XXX *) diff --git a/v2v/input_vmx.ml b/v2v/input_vmx.ml index a8b33f66f..f79e89139 100644 --- a/v2v/input_vmx.ml +++ b/v2v/input_vmx.ml @@ -436,17 +436,18 @@ object | None -> 1 | Some i -> i in - let cpu_sockets, cpu_cores = + let cpu_topology = match Parse_vmx.get_int vmx ["cpuid"; "coresPerSocket"] with - |...