External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-04-26 07:04:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu_process: graphics: extract for loop out of qemuProcessGraphicsReservePorts

Browse Source 
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Pavel Hrdina 2016-08-13 21:01:38 +02:00
parent 675f9bde2b
commit f6a8df41db
1 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/qemu/qemu_process.c
View File

@ -4009,37 +4009,32 @@ qemuProcessStartHook(virQEMUDriverPtr driver,
static int static int
qemuProcessGraphicsReservePorts(virQEMUDriverPtr driver, qemuProcessGraphicsReservePorts(virQEMUDriverPtr driver,
virDomainObjPtr vm) virDomainGraphicsDefPtr graphics)
{ {
size_t i; if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC &&
!graphics->data.vnc.autoport) {
if (virPortAllocatorSetUsed(driver->remotePorts,
graphics->data.vnc.port,
true) < 0)
return -1;
graphics->data.vnc.portReserved = true;
for (i = 0; i < vm->def->ngraphics; ++i) { } else if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE &&
virDomainGraphicsDefPtr graphics = vm->def->graphics[i]; !graphics->data.spice.autoport) {
if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC && if (graphics->data.spice.port > 0) {
!graphics->data.vnc.autoport) {
if (virPortAllocatorSetUsed(driver->remotePorts, if (virPortAllocatorSetUsed(driver->remotePorts,
graphics->data.vnc.port, graphics->data.spice.port,
true) < 0) true) < 0)
return -1; return -1;
graphics->data.vnc.portReserved = true; graphics->data.spice.portReserved = true;
}
} else if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE && if (graphics->data.spice.tlsPort > 0) {
!graphics->data.spice.autoport) { if (virPortAllocatorSetUsed(driver->remotePorts,
if (graphics->data.spice.port > 0) { graphics->data.spice.tlsPort,
if (virPortAllocatorSetUsed(driver->remotePorts, true) < 0)
graphics->data.spice.port, return -1;
true) < 0) graphics->data.spice.tlsPortReserved = true;
return -1;
graphics->data.spice.portReserved = true;
}
if (graphics->data.spice.tlsPort > 0) {
if (virPortAllocatorSetUsed(driver->remotePorts,
graphics->data.spice.tlsPort,
true) < 0)
return -1;
graphics->data.spice.tlsPortReserved = true;
}
} }
} }
@ -4204,15 +4199,22 @@ qemuProcessSetupGraphics(virQEMUDriverPtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
unsigned int flags) unsigned int flags)
{ {
virDomainGraphicsDefPtr graphics;
bool allocate = !(flags & VIR_QEMU_PROCESS_START_PRETEND); bool allocate = !(flags & VIR_QEMU_PROCESS_START_PRETEND);
size_t i; size_t i;
int ret = -1; int ret = -1;
if (allocate && qemuProcessGraphicsReservePorts(driver, vm) < 0) if (allocate) {
goto cleanup; for (i = 0; i < vm->def->ngraphics; i++) {
graphics = vm->def->graphics[i];
if (qemuProcessGraphicsReservePorts(driver, graphics) < 0)
goto cleanup;
}
}
for (i = 0; i < vm->def->ngraphics; ++i) { for (i = 0; i < vm->def->ngraphics; ++i) {
virDomainGraphicsDefPtr graphics = vm->def->graphics[i]; graphics = vm->def->graphics[i];
if (qemuProcessGraphicsAllocatePorts(driver, graphics, allocate) < 0) if (qemuProcessGraphicsAllocatePorts(driver, graphics, allocate) < 0)
goto cleanup; goto cleanup;