mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-27 02:51:16 +00:00
Ignore old style vnc config on xen 3.0.5
This commit is contained in:
parent
538d6e980b
commit
99370101de
@ -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
|
||||||
|
@ -1689,35 +1689,38 @@ 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 */
|
||||||
tmp = sexpr_fmt_node(root, "domain/image/%s/vnc", hvm ? "hvm" : "linux");
|
if ((hvm && xendConfigVersion < 4) ||
|
||||||
if (tmp != NULL) {
|
(!hvm && xendConfigVersion < 3)) {
|
||||||
if (tmp[0] == '1') {
|
tmp = sexpr_fmt_node(root, "domain/image/%s/vnc", hvm ? "hvm" : "linux");
|
||||||
int port = xenStoreDomainGetVNCPort(conn, domid);
|
if (tmp != NULL) {
|
||||||
const char *listenAddr = sexpr_fmt_node(root, "domain/image/%s/vnclisten", hvm ? "hvm" : "linux");
|
if (tmp[0] == '1') {
|
||||||
const char *keymap = sexpr_fmt_node(root, "domain/image/%s/keymap", hvm ? "hvm" : "linux");
|
int port = xenStoreDomainGetVNCPort(conn, domid);
|
||||||
/* For Xen >= 3.0.3, don't generate a fixed port mapping
|
const char *listenAddr = sexpr_fmt_node(root, "domain/image/%s/vnclisten", hvm ? "hvm" : "linux");
|
||||||
* because it will almost certainly be wrong ! Just leave
|
const char *keymap = sexpr_fmt_node(root, "domain/image/%s/keymap", hvm ? "hvm" : "linux");
|
||||||
* it as -1 which lets caller see that the VNC server isn't
|
/* For Xen >= 3.0.3, don't generate a fixed port mapping
|
||||||
* present yet. Subsquent dumps of the XML will eventually
|
* because it will almost certainly be wrong ! Just leave
|
||||||
* find the port in XenStore once VNC server has started
|
* it as -1 which lets caller see that the VNC server isn't
|
||||||
*/
|
* present yet. Subsquent dumps of the XML will eventually
|
||||||
if (port == -1 && xendConfigVersion < 2)
|
* find the port in XenStore once VNC server has started
|
||||||
port = 5900 + domid;
|
*/
|
||||||
virBufferVSprintf(&buf, " <graphics type='vnc' port='%d'", port);
|
if (port == -1 && xendConfigVersion < 2)
|
||||||
if (listenAddr)
|
port = 5900 + domid;
|
||||||
virBufferVSprintf(&buf, " listen='%s'", listenAddr);
|
virBufferVSprintf(&buf, " <graphics type='vnc' port='%d'", port);
|
||||||
if (keymap)
|
if (listenAddr)
|
||||||
virBufferVSprintf(&buf, " keymap='%s'", keymap);
|
virBufferVSprintf(&buf, " listen='%s'", listenAddr);
|
||||||
virBufferAdd(&buf, "/>\n", 3);
|
if (keymap)
|
||||||
|
virBufferVSprintf(&buf, " keymap='%s'", keymap);
|
||||||
|
virBufferAdd(&buf, "/>\n", 3);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
/* Graphics device (HVM, or old (pre-3.0.4) style PV sdl config) */
|
/* Graphics device (HVM, or old (pre-3.0.4) style PV sdl config) */
|
||||||
tmp = sexpr_fmt_node(root, "domain/image/%s/sdl", hvm ? "hvm" : "linux");
|
tmp = sexpr_fmt_node(root, "domain/image/%s/sdl", hvm ? "hvm" : "linux");
|
||||||
if (tmp != NULL) {
|
if (tmp != NULL) {
|
||||||
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);
|
||||||
|
Loading…
Reference in New Issue
Block a user