Fix PVFB version check for RHEL-5

* src/xend_internal.c src/xm_internal.c: fix paravirt framebuffer
  handling since it was backoprted for RHEL-5, patch by Markus
  Armbruster
daniel

diff --git a/ChangeLog b/ChangeLog
index 9a339538a4e6e61aba6acaf7ce4e174a350a513e..f1f7afe47ba28876cb12dfd9df636989659627bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jan 19 20:47:18 CET 2009 Daniel Veillard <veillard@redhat.com>
+
+       * src/xend_internal.c src/xm_internal.c: fix paravirt framebuffer
+         handling since it was backoprted for RHEL-5, patch by Markus
+         Armbruster
+
 Mon Jan 19 19:10:08 CET 2009 Daniel Veillard <veillard@redhat.com>
 
        * src/xend_internal.c src/xm_internal.c: fix fully virt network

diff --git a/src/xend_internal.c b/src/xend_internal.c
index e0c61e8761957b283ec152193ed8eaa3c995a876..df4b5e5d453db7882fd6e64a0a6f89922021b720 100644 (file)
--- a/src/xend_internal.c
+++ b/src/xend_internal.c
@@ -61,8 +61,10 @@
 
 #ifdef WITH_RHEL5_API
 #define XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU 0
+#define XEND_CONFIG_MIN_VERS_PVFB_NEWCONF 2
 #else
 #define XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU 3
+#define XEND_CONFIG_MIN_VERS_PVFB_NEWCONF 3
 #endif
 
 /**
@@ -5411,7 +5413,7 @@ xenDaemonFormatSxpr(virConnectPtr conn,
 
 
         /* PV graphics for xen <= 3.0.4, or HVM graphics for xen <= 3.1.0 */
-        if ((!hvm && xendConfigVersion < 3) ||
+        if ((!hvm && xendConfigVersion < XEND_CONFIG_MIN_VERS_PVFB_NEWCONF) ||
             (hvm && xendConfigVersion < 4)) {
             if (def->graphics &&
                 xenDaemonFormatSxprGraphicsOld(conn, def->graphics, &buf, xendConfigVersion) < 0)
@@ -5433,7 +5435,7 @@ xenDaemonFormatSxpr(virConnectPtr conn,
 
     /* New style PV graphics config xen >= 3.0.4,
      * or HVM graphics config xen >= 3.0.5 */
-    if ((xendConfigVersion >= 3 && !hvm) ||
+    if ((xendConfigVersion >= XEND_CONFIG_MIN_VERS_PVFB_NEWCONF && !hvm) ||
         (xendConfigVersion >= 4 && hvm)) {
         if (def->graphics &&
             xenDaemonFormatSxprGraphicsNew(conn, def->graphics, &buf) < 0)

diff --git a/src/xm_internal.c b/src/xm_internal.c
index 308c76680795cc50a36e1a17ff16078c02cd0b78..07cdeaa0317ad5ebc523b25fb51f63bbdb11c0a7 100644 (file)
--- a/src/xm_internal.c
+++ b/src/xm_internal.c
@@ -50,8 +50,10 @@
 
 #ifdef WITH_RHEL5_API
 #define XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU 0
+#define XEND_CONFIG_MIN_VERS_PVFB_NEWCONF 2
 #else
 #define XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU 3
+#define XEND_CONFIG_MIN_VERS_PVFB_NEWCONF 3
 #endif
 
 /* The true Xen limit varies but so far is always way
@@ -2055,7 +2057,7 @@ virConfPtr xenXMDomainConfigFormat(virConnectPtr conn,
     }
 
     if (def->graphics) {
-        if (priv->xendConfigVersion < (hvm ? 4 : 3)) {
+        if (priv->xendConfigVersion < (hvm ? 4 : XEND_CONFIG_MIN_VERS_PVFB_NEWCONF)) {
             if (def->graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_SDL) {
                 if (xenXMConfigSetInt(conf, "sdl", 1) < 0)
                     goto no_memory;