[libvirt] [PATCH] xen config: No vfb in HVM guest configuration

[Stefan Bader]

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 at canonical.com>
---
 src/xenxs/xen_sxpr.c |   11 ++++-------
 src/xenxs/xen_xm.c   |    2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/xenxs/xen_sxpr.c b/src/xenxs/xen_sxpr.c
index b26b2bc..b2f98f6 100644
--- 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 (!hmv && (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 8e24fd52..d65e97a 100644
--- 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;
-- 
1.7.9.1