From b751b46bc565f3fdbd6dff32bb111abb6343c8ee Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Mon, 19 Jan 2009 19:49:30 +0000 Subject: [PATCH] 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 --- ChangeLog | 6 ++++++ src/xend_internal.c | 6 ++++-- src/xm_internal.c | 4 +++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9a339538a4..f1f7afe47b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Jan 19 20:47:18 CET 2009 Daniel Veillard + + * 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 * 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 e0c61e8761..df4b5e5d45 100644 --- 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 308c766807..07cdeaa031 100644 --- 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;