External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-25 15:15:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Split out SPICE port allocation into a separate function

Browse Source 
Later on this function will be used to do more sophisticated checks and
determination if port allocation is needed.
This commit is contained in:
Peter Krempa 2013-04-22 16:26:57 +02:00
parent bd15ee89a7
commit 23090823f1
1 changed files with 49 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
src/qemu/qemu_process.c
View File

@ -3269,6 +3269,53 @@ qemuSetUnprivSGIO(virDomainDiskDefPtr disk)
return ret; return ret;
} }
static int
qemuProcessSPICEAllocatePorts(virQEMUDriverPtr driver,
virQEMUDriverConfigPtr cfg,
virDomainGraphicsDefPtr graphics)
{
int ret = -1;
unsigned short port = 0;
unsigned short tlsPort;
if (graphics->data.spice.autoport ||
graphics->data.spice.port == -1) {
if (virPortAllocatorAcquire(driver->remotePorts, &port) < 0)
goto cleanup;
if (port == 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Unable to find an unused port for SPICE"));
goto cleanup;
}
graphics->data.spice.port = port;
}
if (cfg->spiceTLS &&
(graphics->data.spice.autoport ||
graphics->data.spice.tlsPort == -1)) {
if (virPortAllocatorAcquire(driver->remotePorts, &tlsPort) < 0)
goto cleanup;
if (tlsPort == 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("Unable to find an unused port for SPICE TLS"));
virPortAllocatorRelease(driver->remotePorts, port);
goto cleanup;
}
graphics->data.spice.tlsPort = tlsPort;
}
ret = 0;
cleanup:
return ret;
}
int qemuProcessStart(virConnectPtr conn, int qemuProcessStart(virConnectPtr conn,
virQEMUDriverPtr driver, virQEMUDriverPtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
@ -3403,36 +3450,8 @@ int qemuProcessStart(virConnectPtr conn,
goto cleanup; goto cleanup;
graphics->data.vnc.port = port; graphics->data.vnc.port = port;
} else if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE) { } else if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE) {
unsigned short port = 0; if (qemuProcessSPICEAllocatePorts(driver, cfg, graphics) < 0)
if (graphics->data.spice.autoport || goto cleanup;
graphics->data.spice.port == -1) {
if (virPortAllocatorAcquire(driver->remotePorts, &port) < 0)
goto cleanup;
if (port == 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("Unable to find an unused port for SPICE"));
goto cleanup;
}
graphics->data.spice.port = port;
}
if (cfg->spiceTLS &&
(graphics->data.spice.autoport ||
graphics->data.spice.tlsPort == -1)) {
unsigned short tlsPort;
if (virPortAllocatorAcquire(driver->remotePorts, &tlsPort) < 0)
goto cleanup;
if (tlsPort == 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("Unable to find an unused port for SPICE TLS"));
virPortAllocatorRelease(driver->remotePorts, port);
goto cleanup;
}
graphics->data.spice.tlsPort = tlsPort;
}
} }
if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC || if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC ||