mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-26 18:41:17 +00:00
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
This commit is contained in:
parent
e676a699e8
commit
b751b46bc5
@ -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>
|
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
|
* src/xend_internal.c src/xm_internal.c: fix fully virt network
|
||||||
|
@ -61,8 +61,10 @@
|
|||||||
|
|
||||||
#ifdef WITH_RHEL5_API
|
#ifdef WITH_RHEL5_API
|
||||||
#define XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU 0
|
#define XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU 0
|
||||||
|
#define XEND_CONFIG_MIN_VERS_PVFB_NEWCONF 2
|
||||||
#else
|
#else
|
||||||
#define XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU 3
|
#define XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU 3
|
||||||
|
#define XEND_CONFIG_MIN_VERS_PVFB_NEWCONF 3
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -5411,7 +5413,7 @@ xenDaemonFormatSxpr(virConnectPtr conn,
|
|||||||
|
|
||||||
|
|
||||||
/* PV graphics for xen <= 3.0.4, or HVM graphics for xen <= 3.1.0 */
|
/* 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)) {
|
(hvm && xendConfigVersion < 4)) {
|
||||||
if (def->graphics &&
|
if (def->graphics &&
|
||||||
xenDaemonFormatSxprGraphicsOld(conn, def->graphics, &buf, xendConfigVersion) < 0)
|
xenDaemonFormatSxprGraphicsOld(conn, def->graphics, &buf, xendConfigVersion) < 0)
|
||||||
@ -5433,7 +5435,7 @@ xenDaemonFormatSxpr(virConnectPtr conn,
|
|||||||
|
|
||||||
/* New style PV graphics config xen >= 3.0.4,
|
/* New style PV graphics config xen >= 3.0.4,
|
||||||
* or HVM graphics config xen >= 3.0.5 */
|
* or HVM graphics config xen >= 3.0.5 */
|
||||||
if ((xendConfigVersion >= 3 && !hvm) ||
|
if ((xendConfigVersion >= XEND_CONFIG_MIN_VERS_PVFB_NEWCONF && !hvm) ||
|
||||||
(xendConfigVersion >= 4 && hvm)) {
|
(xendConfigVersion >= 4 && hvm)) {
|
||||||
if (def->graphics &&
|
if (def->graphics &&
|
||||||
xenDaemonFormatSxprGraphicsNew(conn, def->graphics, &buf) < 0)
|
xenDaemonFormatSxprGraphicsNew(conn, def->graphics, &buf) < 0)
|
||||||
|
@ -50,8 +50,10 @@
|
|||||||
|
|
||||||
#ifdef WITH_RHEL5_API
|
#ifdef WITH_RHEL5_API
|
||||||
#define XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU 0
|
#define XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU 0
|
||||||
|
#define XEND_CONFIG_MIN_VERS_PVFB_NEWCONF 2
|
||||||
#else
|
#else
|
||||||
#define XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU 3
|
#define XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU 3
|
||||||
|
#define XEND_CONFIG_MIN_VERS_PVFB_NEWCONF 3
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* The true Xen limit varies but so far is always way
|
/* The true Xen limit varies but so far is always way
|
||||||
@ -2055,7 +2057,7 @@ virConfPtr xenXMDomainConfigFormat(virConnectPtr conn,
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (def->graphics) {
|
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 (def->graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_SDL) {
|
||||||
if (xenXMConfigSetInt(conf, "sdl", 1) < 0)
|
if (xenXMConfigSetInt(conf, "sdl", 1) < 0)
|
||||||
goto no_memory;
|
goto no_memory;
|
||||||
|
Loading…
Reference in New Issue
Block a user