From: Jim Fehlig <jfehlig@suse.com>
Date: Fri, 24 Apr 2015 20:11:26 +0000 (-0600)
Subject: libxl: initialize sdl.opengl defbool in libxlMakeVfb
X-Git-Tag: v1.2.15-rc1~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=247b2c53883f9b51339120284e963ed29d4ab404;p=thirdparty%2Flibvirt.git

libxl: initialize sdl.opengl defbool in libxlMakeVfb

Commit bf32462b missed initializing sdl.opengl.  Without the
initialization, libvirtd will be terminated by an assert from libxl:

Assertion `!libxl_defbool_is_default(db)' failed.

Reported-by: Olaf Hering <olaf@aepfle.de>
---

diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
index 55bd21b8d4..53f327bd10 100644
--- a/src/libxl/libxl_conf.c
+++ b/src/libxl/libxl_conf.c
@@ -1243,6 +1243,7 @@ libxlMakeVfb(virPortAllocatorPtr graphicsports,
         case VIR_DOMAIN_GRAPHICS_TYPE_SDL:
             libxl_defbool_set(&x_vfb->sdl.enable, 1);
             libxl_defbool_set(&x_vfb->vnc.enable, 0);
+            libxl_defbool_set(&x_vfb->sdl.opengl, 0);
             if (VIR_STRDUP(x_vfb->sdl.display, l_vfb->data.sdl.display) < 0)
                 return -1;
             if (VIR_STRDUP(x_vfb->sdl.xauthority, l_vfb->data.sdl.xauth) < 0)