search for: laddress

...- a/v2v/input_libvirtxml.ml +++ b/v2v/input_libvirtxml.ml @@ -96,24 +96,31 @@ let parse_libvirt_xml ?conn xml = let nr_nodes = Xml.xpathobj_nr_nodes obj in if nr_nodes < 1 then ( match xpath_string "@listen" with - | None -> LNone | Some a -> LAddress a + | None -> LNoListen | Some a -> LAddress a ) else ( (* Use only the first <listen> configuration. *) match xpath_string "listen[1]/@type" with - | None -> LNone + | None -> LNoListen | Some "ad...

...cket None + | Some n -> LSocket (Some n) ) | Some "none" -> LNone diff --git a/v2v/types.ml b/v2v/types.ml index 3c92357..d802e19 100644 --- a/v2v/types.ml +++ b/v2v/types.ml @@ -85,7 +85,7 @@ and s_display_listen = | LNoListen | LAddress of string | LNetwork of string - | LSocket of string + | LSocket of string option | LNone and source_video = Source_other_video of string | @@ -232,7 +232,8 @@ and string_of_source_display { s_display_type = typ; | LNoListen -> "" | LAddress a -> sprintf "...

...r ("keymap", km) graphics + | _ -> ()); + (match source.s_display with + | Some { s_password = Some pw } -> append_attr ("passwd", pw) graphics + | _ -> ()); + (match source.s_display with + | Some { s_listen = listen } -> (match listen with - | LAddress a -> - let sub = e "listen" [ "type", "address"; "address", a ] [] in - append_child sub graphics - | LNetwork n -> - let sub = e "listen" [ "type", "network"; "network", n ] [] in -...

...model option; s_vnet : string; s_vnet_orig : string; s_vnet_type : vnet_type; } +and s_nic_model = Source_rtl8139 | Source_e1000 | Source_virtio_net and vnet_type = Bridge | Network and source_display = { s_display_type : s_display_type; @@ -81,6 +84,8 @@ and s_display_listen = | LAddress of string | LNetwork of string +and source_video = Source_Cirrus | Source_QXL + and source_sound = { s_sound_model : source_sound_model; } @@ -95,6 +100,7 @@ hypervisor type: %s CPU features: %s firmware: %s display: %s + video: %s sound: %s disks...

...g : string; s_vnet_type : vnet_type; } +and s_nic_model = Source_other_nic of string | + Source_rtl8139 | Source_e1000 | Source_virtio_net and vnet_type = Bridge | Network and source_display = { s_display_type : s_display_type; @@ -81,6 +85,9 @@ and s_display_listen = | LAddress of string | LNetwork of string +and source_video = Source_other_video of string | + Source_Cirrus | Source_QXL + and source_sound = { s_sound_model : source_sound_model; } @@ -95,6 +102,7 @@ hypervisor type: %s CPU features: %s firmware: %s display:...

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

...g : string; s_vnet_type : vnet_type; } +and s_nic_model = Source_other_nic of string | + Source_rtl8139 | Source_e1000 | Source_virtio_net and vnet_type = Bridge | Network and source_display = { s_display_type : s_display_type; @@ -81,6 +85,9 @@ and s_display_listen = | LAddress of string | LNetwork of string +and source_video = Source_other_video of string | + Source_Cirrus | Source_QXL + and source_sound = { s_sound_model : source_sound_model; } @@ -95,6 +102,7 @@ hypervisor type: %s CPU features: %s firmware: %s display:...

...network type. *) } -(** Network adapter models. *) +(** Network adapter models (in ascending order of preference). *) and s_nic_model = Source_rtl8139 | Source_e1000 | Source_virtio_net (** Network interfaces. *) and vnet_type = Bridge | Network @@ -107,7 +107,7 @@ and s_display_listen = | LAddress of string (** Listen address. *) | LNetwork of string (** Listen network. *) -(** Video adapter model. *) +(** Video adapter model (in ascending order of preference). *) and source_video = Source_Cirrus | Source_QXL and source_sound = { diff --git a/v2v/v2v.ml b/v2v...

.... *) } -(** Network adapter models. *) +(** Network adapter models (in ascending order of preference). *) and s_nic_model = Source_other_nic of string | Source_rtl8139 | Source_e1000 | Source_virtio_net (** Network interfaces. *) @@ -108,7 +108,7 @@ and s_display_listen = | LAddress of string (** Listen address. *) | LNetwork of string (** Listen network. *) -(** Video adapter model. *) +(** Video adapter model (in ascending order of preference). *) and source_video = Source_other_video of string | Source_Cirrus | Source_QXL...

The decision on which device type to use for disks, network and video cards on output used to be taken deep inside the converting functions. This is not always desirable. In particular, there are scenarios when this decision is made before the convertion takes place. E.g. in in-place mode, the decisions are taken and the output VM configuration is created outside of v2v tool. This patchset

The decision on which device type to use for disks, network and video cards on output used to be taken deep inside the converting functions. This is not always desirable. In particular, there are scenarios when this decision is made before the convertion takes place. E.g. in in-place mode, the decisions are taken and the output VM configuration is created outside of v2v tool. This patchset

...odels. *) > +(** Network adapter models (in ascending order of preference). *) > and s_nic_model = Source_other_nic of string | > Source_rtl8139 | Source_e1000 | Source_virtio_net > (** Network interfaces. *) > @@ -108,7 +108,7 @@ and s_display_listen = > | LAddress of string (** Listen address. *) > | LNetwork of string (** Listen network. *) > > -(** Video adapter model. *) > +(** Video adapter model (in ascending order of preference). *) > and source_video = Source_other_video of string | >...

The decision on which device type to use for disks, network and video cards on output used to be taken deep inside the converting functions. This is not always desirable. In particular, there are scenarios when this decision is made before the convertion takes place. E.g. in in-place mode, the decisions are taken and the output VM configuration is created outside of v2v tool. This patchset

The decision on which device type to use for disks, network and video cards on output used to be taken deep inside the converting functions. This is not always desirable. In particular, there are scenarios when this decision is made before the convertion takes place. E.g. in in-place mode, the decisions are taken and the output VM configuration is created outside of v2v tool. This patchset

...ref [ + "type", JSON.String display_type; + ] in + + push_optional_string display "keymap" d.s_keymap; + push_optional_string display "password" d.s_password; + + let listen = + match d.s_listen with + | LNoListen -> None + | LAddress address -> + Some [ + "type", JSON.String "address"; + "address", JSON.String address; + ] + | LNetwork network -> + Some [ + "type", JSON.String "network"; + "network&...

...ref [ + "type", JSON.String display_type; + ] in + + push_optional_string display "keymap" d.s_keymap; + push_optional_string display "password" d.s_password; + + let listen = + match d.s_listen with + | LNoListen -> None + | LAddress address -> + Some [ + "type", JSON.String "address"; + "address", JSON.String address; + ] + | LNetwork network -> + Some [ + "type", JSON.String "network"; + "network&...

This series adds a new output mode for virt-v2v, called -o json. It produces local files, just like -o local, although the metadata produced is a JSON file with data that v2v collected in the conversion process. This can be useful for converting to unsupported destinations, still based on QEMU/KVM. In addition to a simple different metadata, it offers a way to relocate the disks, with

This series adds a new output mode for virt-v2v, called -o json. It produces local files, just like -o local, although the metadata produced is a JSON file with data that v2v collected in the conversion process. This can be useful for converting to unsupported destinations, still based on QEMU/KVM. In addition to a simple different metadata, it offers a way to relocate the disks, with