External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-06 21:15:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

xen config: No vfb in HVM guest configuration

Browse Source 
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@canonical.com>
(cherry picked from commit fb98da0050)
This commit is contained in:
Stefan Bader 2012-04-05 18:44:35 +02:00 committed by Daniel P. Berrange
parent a791cde7cb
commit c5031e2d1d
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -229,6 +229,7 @@ Patches have also been contributed by:
Stef Walter <stefw@gnome.org> Stef Walter <stefw@gnome.org>
Christian Benvenuti <benve@cisco.com> Christian Benvenuti <benve@cisco.com>
Ilja Livenson <ilja.livenson@gmail.com> Ilja Livenson <ilja.livenson@gmail.com>
Stefan Bader <stefan.bader@canonical.com>
[....send patches to get your name here....] [....send patches to get your name here....]

11
src/xenxs/xen_sxpr.c
View File

@ -2464,9 +2464,8 @@ xenFormatSxpr(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 */
if ((!hvm && xendConfigVersion < XEND_CONFIG_MIN_VERS_PVFB_NEWCONF) || if (hvm || (xendConfigVersion < XEND_CONFIG_MIN_VERS_PVFB_NEWCONF)) {
(hvm && xendConfigVersion < XEND_CONFIG_VERSION_3_1_0)) {
if ((def->ngraphics == 1) && if ((def->ngraphics == 1) &&
xenFormatSxprGraphicsOld(def->graphics[0], xenFormatSxprGraphicsOld(def->graphics[0],
&buf, xendConfigVersion) < 0) &buf, xendConfigVersion) < 0)
@ -2578,10 +2577,8 @@ xenFormatSxpr(virConnectPtr conn,
if (xenFormatSxprAllPCI(def, &buf) < 0) if (xenFormatSxprAllPCI(def, &buf) < 0)
goto error; goto error;
/* 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 */ if (!hvm && (xendConfigVersion >= XEND_CONFIG_MIN_VERS_PVFB_NEWCONF)) {
if ((xendConfigVersion >= XEND_CONFIG_MIN_VERS_PVFB_NEWCONF && !hvm) ||
(xendConfigVersion >= XEND_CONFIG_VERSION_3_1_0 && hvm)) {
if ((def->ngraphics == 1) && if ((def->ngraphics == 1) &&
xenFormatSxprGraphicsNew(def->graphics[0], &buf) < 0) xenFormatSxprGraphicsNew(def->graphics[0], &buf) < 0)
goto error; goto error;

2
src/xenxs/xen_xm.c
View File

@ -1779,7 +1779,7 @@ virConfPtr xenFormatXM(virConnectPtr conn,
} }
if (def->ngraphics == 1) { 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 (def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_SDL) {
if (xenXMConfigSetInt(conf, "sdl", 1) < 0) if (xenXMConfigSetInt(conf, "sdl", 1) < 0)
goto no_memory; goto no_memory;