[Libguestfs] virt-v2v: default graphics driver for SUSE guests

[Richard W.M. Jones]

On Thu, Feb 28, 2019 at 04:38:14PM -0700, Mike Latimer wrote:
> Hi Pino,
> 
> On 2/26/19 5:52 PM, Mike Latimer wrote:
> > On 2/21/19 3:07 AM, Pino Toscano wrote:
> >> My question is: is using cirrus still the best choice for SUSE guests?
> >> If not, what about using qxl as well, as done for any non-SUSE guest?
> >> (We can also do that depending on the version of the guest, in case
> >> only newer SUSE versions work fine with qxl).
> > At the time of my commit, we had to use cirrus. However, I believe all
> > the currently supported SUSE versions should now work with qxl. Let me
> > verify that, and hopefully the exception can be removed.
> 
> After a bit of checking, defaulting to qxl for SUSE guests is a better
> choice, and should work fine for all versions we expect to encounter in
> the wild. Do you mind pulling this out yourself, or would you prefer I
> submit a patch containing this change? I've moved on to other things,
> and really only have enough bandwidth for a minimal change like:
> 
> diff -Nurp a/v2v/convert_linux.ml b/v2v/convert_linux.ml
> --- a/v2v/convert_linux.ml    2019-02-28 16:30:58.668800431 -0700
> +++ b/v2v/convert_linux.ml    2019-02-28 16:33:14.729907825 -0700
> @@ -104,7 +104,7 @@ let convert (g : G.guestfs) inspect sour
>  
>      let video =
>        match rcaps.rcaps_video with
> -      | None -> get_display_driver ()
> +      | None -> QLX
>        | Some video -> video in
>  
>      let block_type =
> @@ -771,9 +771,6 @@ let convert (g : G.guestfs) inspect sour
>      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
> 
> I'd be happy to submit this as an official patch, or just let you do it
> with some of your planned changes.

This is fine, ACK.

I'll push it if it hasn't gone upstream already.

Thanks,

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
Fedora Windows cross-compiler. Compile Windows programs, test, and
build Windows installers. Over 100 libraries supported.
http://fedoraproject.org/wiki/MinGW