search for: s_hypervisor

...uot; ["unit", "KiB"] [PCData (Int64.to_string memory_k)]; diff --git a/v2v/input_disk.ml b/v2v/input_disk.ml index 624644532..43b901a88 100644 --- a/v2v/input_disk.ml +++ b/v2v/input_disk.ml @@ -80,6 +80,7 @@ class input_disk input_format disk = object let source = { s_hypervisor = UnknownHV; s_name = name; s_orig_name = name; + s_genid = None; s_memory = 2048L *^ 1024L *^ 1024L; (* 2048 MB *) s_vcpu = 1; (* 1 vCPU is a safe default *) s_cpu_vendor = None; diff --git a/v2v/input_ova.ml b/v2v/input_ova.ml index c4711f9...

...uot;] [PCData (Int64.to_string memory_k)]; > diff --git a/v2v/input_disk.ml b/v2v/input_disk.ml > index 624644532..43b901a88 100644 > --- a/v2v/input_disk.ml > +++ b/v2v/input_disk.ml > @@ -80,6 +80,7 @@ class input_disk input_format disk = object > let source = { > s_hypervisor = UnknownHV; > s_name = name; s_orig_name = name; > + s_genid = None; > s_memory = 2048L *^ 1024L *^ 1024L; (* 2048 MB *) > s_vcpu = 1; (* 1 vCPU is a safe default *) > s_cpu_vendor = None; > diff --git a/v2v/input_ova.ml b/...

...if print_source then ( - printf (f_"Source guest information (--print-source option):\n"); - printf "\n"; - printf "%s\n" (string_of_source source); - exit 0 - ); - - if verbose () then printf "%s%!" (string_of_source source); - - (match source.s_hypervisor with - | OtherHV hv -> - warning (f_"unknown source hypervisor ('%s') in metadata") hv - | _ -> () - ); - - assert (source.s_name <> ""); - assert (source.s_memory > 0L); - assert (source.s_vcpu >= 1); - if source.s_disks = [] then - error...

...in + (match source.s_cpu_model with + | None -> () + | Some model -> + push_back content_subnodes (e "CustomCpuName" [] [PCData model]) + ); + (* Add the <Origin/> element if we can. *) (match origin_of_source_hypervisor source.s_hypervisor with | None -> () -- 2.12.1

...ts = output#prepare_targets overlays in > copy_targets targets input output > > This creates the target disks and copies them. (The real > output#prepare_targets method takes the source struct as a > parameter, but the actual objects only use the source.s_name and > .s_hypervisor fields). > >* output#create_metadata source targets guestcaps inspect > > This creates the target metadata. > >What you want -- copy done elsewhere, convert in place, create metadata -- >is a very different flow. It could look something like this: > >* let overlays =...

...ally used.) * let targets = output#prepare_targets overlays in copy_targets targets input output This creates the target disks and copies them. (The real output#prepare_targets method takes the source struct as a parameter, but the actual objects only use the source.s_name and .s_hypervisor fields). * output#create_metadata source targets guestcaps inspect This creates the target metadata. What you want -- copy done elsewhere, convert in place, create metadata -- is a very different flow. It could look something like this: * let overlays = create_overlays source.s_disks in...

...ote: Upper case in the .meta, mixed case in the OVF. *) @@ -238,11 +247,29 @@ let rec create_ovf source targets guestcaps inspect let vmtype = match vmtype with `Desktop -> "0" | `Server -> "1" in let ostype = get_ostype inspect in - let origin = - match source.s_hypervisor with - | VMware -> 1 - | Xen -> 2 - | _ -> 0 in + let content_fields = [ + e "Name" [] [PCData source.s_name]; + e "TemplateId" [] [PCData "00000000-0000-0000-0000-000000000000"]; + e "TemplateName" [] [PCData "Blank"]; +...

On Thu, Oct 10, 2019 at 03:33:25PM +0100, Richard W.M. Jones wrote: >On Wed, Oct 09, 2019 at 02:19:46PM +0200, Martin Kletzander wrote: >> Even though this option is not to be used according to the manual, it: >> >> a) still might be useful even for machine-readable logs >> >> b) should not break the machine-readable output > >I'm a bit confused what

...ass output_libvirt oc output_pool = object capabilities_doc <- Some doc; (* Does the domain already exist on the target? (RHBZ#889082) *) - if Libvirt_utils.domain_exists conn source.s_name then ( + if Libvirt_utils.domain_exists self#conn source.s_name then ( if source.s_hypervisor = Physical then (* virt-p2v user *) error (f_"a libvirt domain called ‘%s’ already exists on the target.\n\nIf using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or delete the existing domain on the target using the ‘virsh undefine’ command.") so...

...ole. + *) + let msg = sn_ "this guest has a passthrough host device which will be ignored" + "this guest has passthrough host devices which will be ignored" + nr_nodes in + warning "%s" msg + ) + in + ({ s_hypervisor = hypervisor; s_name = name; s_orig_name = name; -- 2.13.5

...convert does not need the source parameter. I think it could > >just be passed the .s_name field instead. > > > >(2) output#prepare_targets doesn't really need the source struct, but > >could probably get away with being passed just the .s_name field and > >maybe .s_hypervisor. > > > >(3) source.s_disks and the rest of the source struct seem to have > >sufficiently different usage that we can consider separating them. > > > >These changes would reduce coupling between stages. > > > To be honest I do not know what you are trying to...

...e. + *) + let msg = sn_ "this guest has a direct network interface which will be ignored" + "this guest has direct network interfaces which will be ignored" + nr_nodes in + warning "%s" msg + ) + in + ({ s_hypervisor = hypervisor; s_name = name; s_orig_name = name; -- 2.20.1

...ge (f_"Opening the source %s") input#as_options; let source = input#source () in @@ -68,7 +54,6 @@ let rec main () = printf "%s\n" (string_of_source source); exit 0 ); - if verbose () then printf "%s%!" (string_of_source source); (match source.s_hypervisor with @@ -87,6 +72,9 @@ let rec main () = assert (disk.s_qemu_uri <> ""); ) source.s_disks; + source + +let amend_source source output_name network_map = (* Map source name. *) let source = match output_name with @@ -97,26 +85,43 @@ let rec main () = | So...

...ervisor type: %s memory: %Ld (bytes) nr vCPUs: %d + CPU vendor: %s + CPU model: %s + CPU topology: sockets: %s cores/socket: %s threads/core: %s CPU features: %s firmware: %s display: %s @@ -118,6 +126,11 @@ NICs: (string_of_source_hypervisor s.s_hypervisor) s.s_memory s.s_vcpu + (match s.s_cpu_vendor with None -> "" | Some v -> v) + (match s.s_cpu_model with None -> "" | Some v -> v) + (match s.s_cpu_sockets with None -> "-" | Some v -> string_of_int v) + (match s.s_cpu_cores with...

...45..fbf616c3d 100644 --- a/v2v/types.ml +++ b/v2v/types.ml @@ -18,8 +18,9 @@ open Printf -open Common_gettext.Gettext +open Std_utils open Tools_utils +open Common_gettext.Gettext (* Types. See types.mli for documentation. *) @@ -126,8 +127,8 @@ NICs: (string_of_source_hypervisor s.s_hypervisor) s.s_memory s.s_vcpu - (match s.s_cpu_vendor with None -> "" | Some v -> v) - (match s.s_cpu_model with None -> "" | Some v -> v) + (Option.default "" s.s_cpu_vendor) + (Option.default "" s.s_cpu_model) (match s.s_cpu_so...

...] in + let uri = + sprintf "json:%s" (JSON.string_of_doc ~fmt:JSON.Compact doc) in + debug "json: %s" uri; + uri + ) in + + { disk.source_disk with s_qemu_uri = qemu_uri } + ) disks in let source = { s_hypervisor = VMware; @@ -481,7 +316,7 @@ object s_sound = None; s_disks = disks; s_removables = removables; - s_nics = List.rev !nics; + s_nics = nics; } in source diff --git a/v2v/parse_ovf_from_ova.ml b/v2v/parse_ovf_from_ova.ml new file mode 100644 index 0000000.....

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.

v2 -> v3: - Changes to the Curl API suggested by Pino.

v1 -> v2: - Fixed the bug with precedence of if / @. - Add some imperative list operators inspired by Perl, and use those for constructing the Curl arguments, and more. Rich.

...lass output_libvirt oc output_pool = object capabilities_doc <- Some doc; (* Does the domain already exist on the target? (RHBZ#889082) *) - if Libvirt_utils.domain_exists ?conn:oc source.s_name then ( + if Libvirt_utils.domain_exists conn source.s_name then ( if source.s_hypervisor = Physical then (* virt-p2v user *) error (f_"a libvirt domain called ‘%s’ already exists on the target.\n\nIf using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or delete the existing domain on the target using the ‘virsh undefine’ command.") so...