[Pkg-libvirt-commits] [libguestfs] 43/179: v2v: -i libvirt/libvirtxml: Give a better warning for local displays (RHBZ#1150880).

[Hilko Bengen]

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

bengen pushed a commit to branch experimental
in repository libguestfs.

commit 626d85d80be994065951b5f17706ca33ca5fc152
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Thu Oct 9 10:15:55 2014 +0100

    v2v: -i libvirt/libvirtxml: Give a better warning for local displays (RHBZ#1150880).
---
 v2v/input_libvirtxml.ml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/v2v/input_libvirtxml.ml b/v2v/input_libvirtxml.ml
index e67a494..984db18 100644
--- a/v2v/input_libvirtxml.ml
+++ b/v2v/input_libvirtxml.ml
@@ -98,8 +98,11 @@ let parse_libvirt_xml ~verbose
       | "spice" ->
         Some { s_display_type = `Spice;
                s_keymap = keymap; s_password = password }
+      | "sdl"|"desktop" as t ->
+        warning ~prog (f_"virt-v2v does not support local displays, so <graphics type='%s'> in the input libvirt XML was ignored") t;
+        None
       | t ->
-        warning ~prog (f_"display <graphics type='%s'> was ignored") t;
+        warning ~prog (f_"display <graphics type='%s'> in the input libvirt XML was ignored") t;
         None
     ) in
 

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