External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

Support automatic port number allocation for SPICE

Browse Source 
* src/qemu/qemu_driver.c: Allocate the TCP ports for SPICE
  before starting guest
This commit is contained in:
Daniel P. Berrange 2010-03-05 20:22:45 +00:00
parent 9b57fa65bd
commit ed0d9f6c0c
1 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/qemu/qemu_driver.c
View File

@ -2956,10 +2956,12 @@ qemuInitPCIAddresses(struct qemud_driver *driver,
return ret; return ret;
} }
static int qemudNextFreeVNCPort(struct qemud_driver *driver) {
static int qemudNextFreePort(struct qemud_driver *driver,
int startPort) {
int i; int i;
for (i = QEMU_VNC_PORT_MIN; i < QEMU_VNC_PORT_MAX; i++) { for (i = startPort ; i < 65535 ; i++) {
int fd; int fd;
int reuse = 1; int reuse = 1;
struct sockaddr_in addr; struct sockaddr_in addr;
@ -3927,17 +3929,29 @@ static int qemudStartVMDaemon(virConnectPtr conn,
DEBUG0("Ensuring no historical cgroup is lying around"); DEBUG0("Ensuring no historical cgroup is lying around");
qemuRemoveCgroup(driver, vm, 1); qemuRemoveCgroup(driver, vm, 1);
if ((vm->def->ngraphics == 1) && if (vm->def->ngraphics == 1) {
vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC && if (vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC &&
vm->def->graphics[0]->data.vnc.autoport) { vm->def->graphics[0]->data.vnc.autoport) {
DEBUG0("Determining VNC port"); int port = qemudNextFreePort(driver, 5900);
int port = qemudNextFreeVNCPort(driver);
if (port < 0) { if (port < 0) {
qemuReportError(VIR_ERR_INTERNAL_ERROR, qemuReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("Unable to find an unused VNC port")); "%s", _("Unable to find an unused VNC port"));
goto cleanup; goto cleanup;
} }
vm->def->graphics[0]->data.vnc.port = port; vm->def->graphics[0]->data.vnc.port = port;
} else if (vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE &&
vm->def->graphics[0]->data.spice.autoport) {
int port = qemudNextFreePort(driver, 5900);
int tlsPort = port == -1 ? -1 : qemudNextFreePort(driver, port + 1);
if (port < 0 || tlsPort < 0) {
qemuReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("Unable to find unused SPICE ports"));
goto cleanup;
}
vm->def->graphics[0]->data.spice.port = port;
vm->def->graphics[0]->data.spice.tlsPort = tlsPort;
}
} }
if (virFileMakePath(driver->logDir) != 0) { if (virFileMakePath(driver->logDir) != 0) {