From 671a0fcc1ee68c178852fbed9a44e123ccf9b73c Mon Sep 17 00:00:00 2001

From: Mike Latimer <mlatimer@suse.com>

Date: Mon, 25 Mar 2019 14:38:00 +0000

Subject: [PATCH] v2v: Fix default graphics driver for SUSE guests.

See discussion in this upstream thread:

https://www.redhat.com/archives/libguestfs/2019-February/thread.html#00047

Thanks: Mike Latimer, Pino Toscano.

(cherry picked from commit 612f170e6062f2ff74643b6096b7e0765b52cfbd)

---

 v2v/convert_linux.ml | 5 +----

 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml

index b4b2f24c4..f9e811c8d 100644

--- a/v2v/convert_linux.ml

+++ b/v2v/convert_linux.ml

@@ -104,7 +104,7 @@ let convert (g : G.guestfs) inspect source output rcaps =

     let video =

       match rcaps.rcaps_video with

-      | None -> get_display_driver ()

+      | None -> QXL

       | Some video -> video in

     let block_type =

@@ -783,9 +783,6 @@ let convert (g : G.guestfs) inspect source output rcaps =

     else

       true

-  and get_display_driver () =

-    if family = `SUSE_family then Cirrus else QXL

-

   and configure_display_driver video =

     let video_driver = match video with QXL -> "qxl" | Cirrus -> "cirrus" in

-- 

2.21.0