[PATCH] v2v: convert libvirt display listen configuration (RHBZ#1174073)
Read the listen configuration from the XML of libvirt domains, restoring it when writing new libvirt XMLs. --- v2v/input_disk.ml | 3 ++- v2v/input_libvirtxml.ml | 26 ++++++++++++++++++++++++-- v2v/output_libvirt.ml | 11 +++++++++++ v2v/types.ml | 15 +++++++++++++-- v2v/types.mli | 5 +++++ 5 files changed, 55 insertions(+), 5 deletions(-) diff --git a/v2v/input_disk.ml b/v2v/input_disk.ml index 969c43c..2c70368 100644 --- a/v2v/input_disk.ml +++ b/v2v/input_disk.ml @@ -86,7 +86,8 @@ class input_disk verbose input_format disk = object s_vcpu = 1; (* 1 vCPU is a safe default *) s_features = [ "acpi"; "apic"; "pae" ]; s_display = - Some { s_display_type = Window; s_keymap = None; s_password = None }; + Some { s_display_type = Window; s_keymap = None; s_password = None; + s_listen = LNone }; s_disks = [disk]; s_removables = []; s_nics = [network]; diff --git a/v2v/input_libvirtxml.ml b/v2v/input_libvirtxml.ml index d0d0e95..4fb6358 100644 --- a/v2v/input_libvirtxml.ml +++ b/v2v/input_libvirtxml.ml @@ -95,14 +95,36 @@ let parse_libvirt_xml ~verbose xml = match xpath_to_string "@keymap" "" with "" -> None | k -> Some k in let password = match xpath_to_string "@passwd" "" with "" -> None | pw -> Some pw in + let listen = + let obj = Xml.xpath_eval_expression xpathctx "listen" in + let nr_nodes = Xml.xpathobj_nr_nodes obj in + if nr_nodes < 1 then LNone + else ( + (* Use only the first <listen> configuration. *) + match xpath_to_string "listen[1]/@type" "" with + | "" -> LNone + | "address" -> + (match xpath_to_string "listen[1]/@address" "" with + | "" -> LNone + | a -> LAddress a + ) + | "network" -> + (match xpath_to_string "listen[1]/@network" "" with + | "" -> LNone + | n -> LNetwork n + ) + | t -> + warning (f_"<listen type='%s'> in the input libvirt XML was ignored") t; + LNone + ) in match xpath_to_string "@type" "" with | "" -> None | "vnc" -> Some { s_display_type = VNC; - s_keymap = keymap; s_password = password } + s_keymap = keymap; s_password = password; s_listen = listen } | "spice" -> Some { s_display_type = Spice; - s_keymap = keymap; s_password = password } + s_keymap = keymap; s_password = password; s_listen = listen } | "sdl"|"desktop" as t -> warning (f_"virt-v2v does not support local displays, so <graphics type='%s'> in the input libvirt XML was ignored") t; None diff --git a/v2v/output_libvirt.ml b/v2v/output_libvirt.ml index 8220096..64dc2dc 100644 --- a/v2v/output_libvirt.ml +++ b/v2v/output_libvirt.ml @@ -229,6 +229,17 @@ let create_libvirt_xml ?pool source targets guestcaps target_features = (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 + append_child sub graphics + | LNone -> ()) + | _ -> ()); video, graphics in diff --git a/v2v/types.ml b/v2v/types.ml index f1088fb..2677e34 100644 --- a/v2v/types.ml +++ b/v2v/types.ml @@ -62,8 +62,13 @@ and source_display = { s_display_type : s_display_type; s_keymap : string option; s_password : string option; + s_listen : display_listen; } and s_display_type = Window | VNC | Spice +and display_listen = + | LNone + | LAddress of string + | LNetwork of string let rec string_of_source s = sprintf " source name: %s @@ -162,11 +167,17 @@ and string_of_source_nic { s_mac = mac; s_vnet = vnet; s_vnet_type = typ } = | Some mac -> " mac: " ^ mac) and string_of_source_display { s_display_type = typ; - s_keymap = keymap; s_password = password } = - sprintf "%s%s%s" + s_keymap = keymap; s_password = password; + s_listen = listen } = + sprintf "%s%s%s%s" (match typ with Window -> "window" | VNC -> "vnc" | Spice -> "spice") (match keymap with None -> "" | Some km -> " " ^ km) (match password with None -> "" | Some _ -> " with password") + (match listen with + | LNone -> "" + | LAddress a -> sprintf " listening on address %s" a + | LNetwork n -> sprintf " listening on network %s" n + ) type overlay = { ov_overlay_file : string; diff --git a/v2v/types.mli b/v2v/types.mli index 3cfdb18..f42bbd9 100644 --- a/v2v/types.mli +++ b/v2v/types.mli @@ -82,8 +82,13 @@ and source_display = { s_keymap : string option; (** Guest keymap. *) s_password : string option; (** If required, password to access the display. *) + s_listen : display_listen; (** Listen address. *) } and s_display_type = Window | VNC | Spice +and display_listen = + | LNone + | LAddress of string (** Listen address. *) + | LNetwork of string (** Listen network. *) val string_of_source : source -> string val string_of_source_disk : source_disk -> string -- 2.1.0
On Tue, Apr 14, 2015 at 10:40:57AM +0200, Pino Toscano wrote:
and s_display_type = Window | VNC | Spice +and display_listen = + | LNone + | LAddress of string + | LNetwork of string
Can we call this type 's_display_listen' for consistency? I was trying to see if OVF (input) files have some concept of port or address, but they don't appear to. Anyway, ACK with the above change. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-df lists disk usage of guests without needing to install any software inside the virtual machine. Supports Linux and Windows. http://people.redhat.com/~rjones/virt-df/
On Tuesday 14 April 2015 10:05:46 Richard W.M. Jones wrote:
On Tue, Apr 14, 2015 at 10:40:57AM +0200, Pino Toscano wrote:
and s_display_type = Window | VNC | Spice +and display_listen = + | LNone + | LAddress of string + | LNetwork of string
Can we call this type 's_display_listen' for consistency?
Makes sense, changed.
I was trying to see if OVF (input) files have some concept of port or address, but they don't appear to.
Anyway, ACK with the above change.
Pushed with the aforementioned change. Thanks, -- Pino Toscano
participants (2)
-
Pino Toscano -
Richard W.M. Jones