xen config: No vfb in HVM guest configuration

This causes an implicit vkbd device to be added which takes
6min to finally fail being initialized in the guest.

http://lists.xen.org/archives/html/xen-devel/2012-04/msg00409.html

Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

diff --git a/AUTHORS b/AUTHORS
index 2077306c29e07923d60c07f61d4f74f4125a6576..66938cbe54b1160f044f5c3c41affc1dfbf0ed42 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -229,6 +229,7 @@ Patches have also been contributed by:
   Stef Walter          <stefw@gnome.org>
   Christian Benvenuti  <benve@cisco.com>
   Ilja Livenson        <ilja.livenson@gmail.com>
+  Stefan Bader         <stefan.bader@canonical.com>
 
   [....send patches to get your name here....]
 

diff --git a/src/xenxs/xen_sxpr.c b/src/xenxs/xen_sxpr.c
index b26b2bc5e0f5df0cbcff13441733b0ff08ae4b0a..e1bbd7668af4489fe46a1e514622d449fae0398d 100644 (file)
--- a/src/xenxs/xen_sxpr.c
+++ b/src/xenxs/xen_sxpr.c
@@ -2464,9 +2464,8 @@ xenFormatSxpr(virConnectPtr conn,
             }
         }
 
-        /* PV graphics for xen <= 3.0.4, or HVM graphics for xen <= 3.1.0 */
-        if ((!hvm && xendConfigVersion < XEND_CONFIG_MIN_VERS_PVFB_NEWCONF) ||
-            (hvm && xendConfigVersion < XEND_CONFIG_VERSION_3_1_0)) {
+        /* PV graphics for xen <= 3.0.4, or HVM graphics */
+        if (hvm || (xendConfigVersion < XEND_CONFIG_MIN_VERS_PVFB_NEWCONF)) {
             if ((def->ngraphics == 1) &&
                 xenFormatSxprGraphicsOld(def->graphics[0],
                                          &buf, xendConfigVersion) < 0)
@@ -2578,10 +2577,8 @@ xenFormatSxpr(virConnectPtr conn,
     if (xenFormatSxprAllPCI(def, &buf) < 0)
         goto error;
 
-    /* New style PV graphics config xen >= 3.0.4,
-     * or HVM graphics config xen >= 3.0.5 */
-    if ((xendConfigVersion >= XEND_CONFIG_MIN_VERS_PVFB_NEWCONF && !hvm) ||
-        (xendConfigVersion >= XEND_CONFIG_VERSION_3_1_0 && hvm)) {
+    /* New style PV graphics config xen >= 3.0.4 */
+    if (!hvm && (xendConfigVersion >= XEND_CONFIG_MIN_VERS_PVFB_NEWCONF)) {
         if ((def->ngraphics == 1) &&
             xenFormatSxprGraphicsNew(def->graphics[0], &buf) < 0)
             goto error;

diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c
index 8e24fd528dac4af6c6a605a9ebd1668113d72154..d65e97aa9a11870165fe29a754fc676dda0ff10f 100644 (file)
--- a/src/xenxs/xen_xm.c
+++ b/src/xenxs/xen_xm.c
@@ -1779,7 +1779,7 @@ virConfPtr xenFormatXM(virConnectPtr conn,
     }
 
     if (def->ngraphics == 1) {
-        if (xendConfigVersion < (hvm ? XEND_CONFIG_VERSION_3_1_0 : XEND_CONFIG_MIN_VERS_PVFB_NEWCONF)) {
+        if (hvm || (xendConfigVersion < XEND_CONFIG_MIN_VERS_PVFB_NEWCONF)) {
             if (def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_SDL) {
                 if (xenXMConfigSetInt(conf, "sdl", 1) < 0)
                     goto no_memory;