[Pkg-libvirt-commits] [libguestfs] 10/17: v2v: Add a source 'window' display type.

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to annotated tag debian/1%1.27.55-1
in repository libguestfs.

commit 2365c2dbccd84ff68919dd131624861da293bf44
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Fri Sep 26 14:01:37 2014 +0100

    v2v: Add a source 'window' display type.
    
    This maps to SDL/GTK, ie. qemu opening a window on the desktop.
    We only use it for -i disk -o qemu to help with debugging.
---
 v2v/input_disk.ml | 3 ++-
 v2v/types.ml      | 4 ++--
 v2v/types.mli     | 8 ++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/v2v/input_disk.ml b/v2v/input_disk.ml
index d79b23e..0b68ccf 100644
--- a/v2v/input_disk.ml
+++ b/v2v/input_disk.ml
@@ -84,7 +84,8 @@ class input_disk verbose input_format disk = object
       s_memory = 2048L *^ 1024L *^ 1024L; (* 2048 MB *)
       s_vcpu = 1;                         (* 1 vCPU is a safe default *)
       s_features = [ "acpi"; "apic"; "pae" ];
-      s_display = None;
+      s_display =
+        Some { s_display_type = `Window; s_keymap = None; s_password = None };
       s_disks = [disk];
       s_removables = [];
       s_nics = [network];
diff --git a/v2v/types.ml b/v2v/types.ml
index d5894bc..d6cf29c 100644
--- a/v2v/types.ml
+++ b/v2v/types.ml
@@ -49,7 +49,7 @@ and source_nic = {
 }
 and vnet_type = Bridge | Network
 and source_display = {
-  s_display_type : [`VNC|`Spice];
+  s_display_type : [`Window|`VNC|`Spice];
   s_keymap : string option;
   s_password : string option;
 }
@@ -110,7 +110,7 @@ and string_of_source_nic { s_mac = mac; s_vnet = vnet; s_vnet_type = typ } =
 and string_of_source_display { s_display_type = typ;
                                s_keymap = keymap; s_password = password } =
   sprintf "%s%s%s"
-    (match typ with `VNC -> "vnc" | `Spice -> "spice")
+    (match typ with `Window -> "window" | `VNC -> "vnc" | `Spice -> "spice")
     (match keymap with None -> "" | Some km -> " " ^ km)
     (match password with None -> "" | Some _ -> " with password")
 
diff --git a/v2v/types.mli b/v2v/types.mli
index 14eea3c..b5d6a8b 100644
--- a/v2v/types.mli
+++ b/v2v/types.mli
@@ -57,10 +57,10 @@ and source_nic = {
 and vnet_type = Bridge | Network
 
 and source_display = {
-  s_display_type : [`VNC|`Spice];       (** Display type. *)
-  s_keymap : string option;             (** Guest keymap. *)
-  s_password : string option;           (** If required, password to access
-                                            the display. *)
+  s_display_type : [`Window|`VNC|`Spice]; (** Display type. *)
+  s_keymap : string option;               (** Guest keymap. *)
+  s_password : string option;      (** If required, password to access
+                                       the display. *)
 }
 
 val string_of_source : source -> string

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git