From 21eceae264b03cd5b81d1cedb54f716ba92ad366 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 10 Nov 2008 15:25:38 -0500 Subject: [PATCH] libvirt-0.2.2-pvfb-new-config.patch libvirt-0.3.3-pvfb-config.patch --- src/xend_internal.c | 4 ++-- src/xm_internal.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/xend_internal.c b/src/xend_internal.c index 038a6e4..8b08531 100644 --- a/src/xend_internal.c +++ b/src/xend_internal.c @@ -5404,7 +5404,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 < 2) || (hvm && xendConfigVersion < 4)) { if (def->graphics && xenDaemonFormatSxprGraphicsOld(conn, def->graphics, &buf, xendConfigVersion) < 0) @@ -5426,7 +5426,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 >= 2 && !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 9562c9a..aa122aa 100644 --- a/src/xm_internal.c +++ b/src/xm_internal.c @@ -1975,7 +1975,7 @@ virConfPtr xenXMDomainConfigFormat(virConnectPtr conn, } if (def->graphics) { - if (hvm || priv->xendConfigVersion < 3) { + if (hvm || priv->xendConfigVersion < 2) { if (def->graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_SDL) { if (xenXMConfigSetInt(conf, "sdl", 1) < 0) goto no_memory; -- 1.5.4.3