From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Date: Mon, 16 Aug 2010 12:33:54 +0000 (+0100)
Subject: tools/libxl: Support pv qemu without any vfbs
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~11640
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=aa70182b712c64769dfa1d4304f53c0deedf0a9b;p=xen.git

tools/libxl: Support pv qemu without any vfbs

Pv qemu provides backends for vfbs and consoles; even if no vfbs are
given can still be useful for the console backends.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---

diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
index 98fdbe8a56..0d09adfd9e 100644
--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
@@ -2592,17 +2592,20 @@ static int libxl_build_xenpv_qemu_args(libxl_gc *gc,
     libxl_ctx *ctx = libxl_gc_owner(gc);
     memset(info, 0x00, sizeof(libxl_device_model_info));
 
-    info->vnc = vfb->vnc;
-    if (vfb->vnclisten)
-        info->vnclisten = libxl_strdup(gc, vfb->vnclisten);
-    info->vncdisplay = vfb->vncdisplay;
-    info->vncunused = vfb->vncunused;
-    if (vfb->vncpasswd)
-        info->vncpasswd = vfb->vncpasswd;
-    if (vfb->keymap)
-        info->keymap = libxl_strdup(gc, vfb->keymap);
-    info->sdl = vfb->sdl;
-    info->opengl = vfb->opengl;
+    if (vfb != NULL) {
+        info->vnc = vfb->vnc;
+        if (vfb->vnclisten)
+            info->vnclisten = libxl_strdup(gc, vfb->vnclisten);
+        info->vncdisplay = vfb->vncdisplay;
+        info->vncunused = vfb->vncunused;
+        if (vfb->vncpasswd)
+            info->vncpasswd = vfb->vncpasswd;
+        if (vfb->keymap)
+            info->keymap = libxl_strdup(gc, vfb->keymap);
+        info->sdl = vfb->sdl;
+        info->opengl = vfb->opengl;
+    } else
+        info->nographic = 1;
     info->domid = domid;
     info->dom_name = libxl_domid_to_name(ctx, domid);
     info->device_model = libxl_abs_path(gc, "qemu-dm", libxl_libexec_path());