External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-29 17:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ignore old style vnc config on xen 3.0.5

Browse Source
This commit is contained in:
Daniel P. Berrange 2007-05-11 14:21:28 +00:00
parent 538d6e980b
commit 99370101de
2 changed files with 35 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Thu May 11 10:20:00 EST 2007 Daniel P. Berrange <berrange@redhat.com>
* src/xend_internal.c: Ignore old style VNC config for HVM
guests on Xen 3.0.5 or later
Thu May 11 09:34:00 EST 2007 Daniel P. Berrange <berrange@redhat.com> Thu May 11 09:34:00 EST 2007 Daniel P. Berrange <berrange@redhat.com>
* libvirt.spec.in: Added dep on dnsmasq * libvirt.spec.in: Added dep on dnsmasq

5
src/xend_internal.c
View File

@ -1689,7 +1689,9 @@ xend_parse_sexp_desc(virConnectPtr conn, struct sexpr *root, int xendConfigVersi
} }
} }
/* Graphics device (HVM <= 3.0.4, or PV <= 3.0.4) vnc config */ /* Graphics device (HVM <= 3.0.4, or PV <= 3.0.3) vnc config */
if ((hvm && xendConfigVersion < 4) ||
(!hvm && xendConfigVersion < 3)) {
tmp = sexpr_fmt_node(root, "domain/image/%s/vnc", hvm ? "hvm" : "linux"); tmp = sexpr_fmt_node(root, "domain/image/%s/vnc", hvm ? "hvm" : "linux");
if (tmp != NULL) { if (tmp != NULL) {
if (tmp[0] == '1') { if (tmp[0] == '1') {
@ -1719,6 +1721,7 @@ xend_parse_sexp_desc(virConnectPtr conn, struct sexpr *root, int xendConfigVersi
if (tmp[0] == '1') if (tmp[0] == '1')
virBufferAdd(&buf, " <graphics type='sdl'/>\n", 27 ); virBufferAdd(&buf, " <graphics type='sdl'/>\n", 27 );
} }
}
tty = xenStoreDomainGetConsolePath(conn, domid); tty = xenStoreDomainGetConsolePath(conn, domid);
if (tty) { if (tty) {