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

libxl: add default listen address for VNC and spice

Browse Source 
If a VNC listen address is not specified in domXML, libxl
will default to 127.0.0.1, but this is never reflected in the domXML.
In the case of spice, a missing listen address resulted in listening
on all interfaces, i.e. '0.0.0.0'. If not specified, set the listen
address in virDomainGraphicsDef struct to the libxl default when
creating the frame buffer device. Additionally, set default spice
listen address to 127.0.0.1.
This commit is contained in:
Jim Fehlig 2017-05-19 15:52:04 -06:00
parent 975ea20f85
commit dbb85e0c15
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/libxl/libxl_conf.c
View File

@ -1227,13 +1227,18 @@ libxlMakeVfb(virPortAllocatorPtr graphicsports,
}
x_vfb->vnc.display = l_vfb->data.vnc.port - LIBXL_VNC_PORT_MIN;
if ((glisten = virDomainGraphicsGetListen(l_vfb, 0)) &&
glisten->address) {
/* libxl_device_vfb_init() does VIR_STRDUP("127.0.0.1") */
VIR_FREE(x_vfb->vnc.listen);
if (VIR_STRDUP(x_vfb->vnc.listen, glisten->address) < 0)
return -1;
if ((glisten = virDomainGraphicsGetListen(l_vfb, 0))) {
if (glisten->address) {
/* libxl_device_vfb_init() does VIR_STRDUP("127.0.0.1") */
VIR_FREE(x_vfb->vnc.listen);
if (VIR_STRDUP(x_vfb->vnc.listen, glisten->address) < 0)
return -1;
} else {
if (VIR_STRDUP(glisten->address, VIR_LOOPBACK_IPV4_ADDR) < 0)
return -1;
}
}
if (VIR_STRDUP(x_vfb->vnc.passwd, l_vfb->data.vnc.auth.passwd) < 0)
return -1;
if (VIR_STRDUP(x_vfb->keymap, l_vfb->data.vnc.keymap) < 0)
@ -1335,10 +1340,16 @@ libxlMakeBuildInfoVfb(virPortAllocatorPtr graphicsports,
}
b_info->u.hvm.spice.port = l_vfb->data.spice.port;
if ((glisten = virDomainGraphicsGetListen(l_vfb, 0)) &&
glisten->address &&
VIR_STRDUP(b_info->u.hvm.spice.host, glisten->address) < 0)
return -1;
if ((glisten = virDomainGraphicsGetListen(l_vfb, 0))) {
if (glisten->address) {
if (VIR_STRDUP(b_info->u.hvm.spice.host, glisten->address) < 0)
return -1;
} else {
if (VIR_STRDUP(b_info->u.hvm.spice.host, VIR_LOOPBACK_IPV4_ADDR) < 0 ||
VIR_STRDUP(glisten->address, VIR_LOOPBACK_IPV4_ADDR) < 0)
return -1;
}
}
if (VIR_STRDUP(b_info->u.hvm.keymap, l_vfb->data.spice.keymap) < 0)
return -1;