From 853e1542ac213f329204a00b6aa5b97f96e3db92 Mon Sep 17 00:00:00 2001 From: Nikolay Shirokovskiy Date: Feb 22 2018 12:52:45 +0000 Subject: port allocator: remove range on manual port reserving Range check in virPortAllocatorSetUsed is not useful anymore when we manage ports for entire unsigned short range values. Signed-off-by: Nikolay Shirokovskiy --- diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index 5e309c3..3442fe7 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -409,9 +409,7 @@ bhyveBuildGraphicsArgStr(const virDomainDef *def, return -1; graphics->data.vnc.port = port; } else { - if (virPortAllocatorSetUsed(driver->remotePorts, - graphics->data.vnc.port, - true) < 0) + if (virPortAllocatorSetUsed(graphics->data.vnc.port, true) < 0) VIR_WARN("Failed to mark VNC port '%d' as used by '%s'", graphics->data.vnc.port, def->name); } diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c index 5076246..e215f6a 100644 --- a/src/bhyve/bhyve_process.c +++ b/src/bhyve/bhyve_process.c @@ -425,9 +425,7 @@ virBhyveProcessReconnect(virDomainObjPtr vm, if (vm->def->ngraphics == 1 && vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) { int vnc_port = vm->def->graphics[0]->data.vnc.port; - if (virPortAllocatorSetUsed(data->driver->remotePorts, - vnc_port, - true) < 0) { + if (virPortAllocatorSetUsed(vnc_port, true) < 0) { VIR_WARN("Failed to mark VNC port '%d' as used by '%s'", vnc_port, vm->def->name); } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index dc33eb7..1326066 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4226,8 +4226,7 @@ qemuProcessStartHook(virQEMUDriverPtr driver, static int -qemuProcessGraphicsReservePorts(virQEMUDriverPtr driver, - virDomainGraphicsDefPtr graphics, +qemuProcessGraphicsReservePorts(virDomainGraphicsDefPtr graphics, bool reconnect) { virDomainGraphicsListenDefPtr glisten; @@ -4245,16 +4244,12 @@ qemuProcessGraphicsReservePorts(virQEMUDriverPtr driver, case VIR_DOMAIN_GRAPHICS_TYPE_VNC: if (!graphics->data.vnc.autoport || reconnect) { - if (virPortAllocatorSetUsed(driver->remotePorts, - graphics->data.vnc.port, - true) < 0) + if (virPortAllocatorSetUsed(graphics->data.vnc.port, true) < 0) return -1; graphics->data.vnc.portReserved = true; } if (graphics->data.vnc.websocket > 0 && - virPortAllocatorSetUsed(driver->remotePorts, - graphics->data.vnc.websocket, - true) < 0) + virPortAllocatorSetUsed(graphics->data.vnc.websocket, true) < 0) return -1; break; @@ -4263,17 +4258,13 @@ qemuProcessGraphicsReservePorts(virQEMUDriverPtr driver, return 0; if (graphics->data.spice.port > 0) { - if (virPortAllocatorSetUsed(driver->remotePorts, - graphics->data.spice.port, - true) < 0) + if (virPortAllocatorSetUsed(graphics->data.spice.port, true) < 0) return -1; graphics->data.spice.portReserved = true; } if (graphics->data.spice.tlsPort > 0) { - if (virPortAllocatorSetUsed(driver->remotePorts, - graphics->data.spice.tlsPort, - true) < 0) + if (virPortAllocatorSetUsed(graphics->data.spice.tlsPort, true) < 0) return -1; graphics->data.spice.tlsPortReserved = true; } @@ -4553,7 +4544,7 @@ qemuProcessSetupGraphics(virQEMUDriverPtr driver, for (i = 0; i < vm->def->ngraphics; i++) { graphics = vm->def->graphics[i]; - if (qemuProcessGraphicsReservePorts(driver, graphics, false) < 0) + if (qemuProcessGraphicsReservePorts(graphics, false) < 0) goto cleanup; } } @@ -6741,9 +6732,7 @@ void qemuProcessStop(virQEMUDriverPtr driver, virPortAllocatorRelease(driver->remotePorts, graphics->data.vnc.port); } else if (graphics->data.vnc.portReserved) { - virPortAllocatorSetUsed(driver->remotePorts, - graphics->data.spice.port, - false); + virPortAllocatorSetUsed(graphics->data.spice.port, false); graphics->data.vnc.portReserved = false; } if (graphics->data.vnc.websocketGenerated) { @@ -6752,9 +6741,7 @@ void qemuProcessStop(virQEMUDriverPtr driver, graphics->data.vnc.websocketGenerated = false; graphics->data.vnc.websocket = -1; } else if (graphics->data.vnc.websocket) { - virPortAllocatorSetUsed(driver->remotePorts, - graphics->data.vnc.websocket, - false); + virPortAllocatorSetUsed(graphics->data.vnc.websocket, false); } } if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE) { @@ -6765,16 +6752,12 @@ void qemuProcessStop(virQEMUDriverPtr driver, graphics->data.spice.tlsPort); } else { if (graphics->data.spice.portReserved) { - virPortAllocatorSetUsed(driver->remotePorts, - graphics->data.spice.port, - false); + virPortAllocatorSetUsed(graphics->data.spice.port, false); graphics->data.spice.portReserved = false; } if (graphics->data.spice.tlsPortReserved) { - virPortAllocatorSetUsed(driver->remotePorts, - graphics->data.spice.tlsPort, - false); + virPortAllocatorSetUsed(graphics->data.spice.tlsPort, false); graphics->data.spice.tlsPortReserved = false; } } @@ -7365,9 +7348,7 @@ qemuProcessReconnect(void *opaque) } for (i = 0; i < obj->def->ngraphics; i++) { - if (qemuProcessGraphicsReservePorts(driver, - obj->def->graphics[i], - true) < 0) + if (qemuProcessGraphicsReservePorts(obj->def->graphics[i], true) < 0) goto error; } diff --git a/src/util/virportallocator.c b/src/util/virportallocator.c index be29e97..23c7af1 100644 --- a/src/util/virportallocator.c +++ b/src/util/virportallocator.c @@ -301,8 +301,7 @@ virPortAllocatorRelease(virPortAllocatorRangePtr range, } int -virPortAllocatorSetUsed(virPortAllocatorRangePtr range, - unsigned short port, +virPortAllocatorSetUsed(unsigned short port, bool value) { int ret = -1; @@ -313,12 +312,6 @@ virPortAllocatorSetUsed(virPortAllocatorRangePtr range, virObjectLock(pa); - if (port < range->start || - port > range->end) { - ret = 0; - goto cleanup; - } - if (value) { if (virBitmapIsBitSet(pa->bitmap, port) || virBitmapSetBit(pa->bitmap, port) < 0) { diff --git a/src/util/virportallocator.h b/src/util/virportallocator.h index fb38c33..ea816bc 100644 --- a/src/util/virportallocator.h +++ b/src/util/virportallocator.h @@ -46,8 +46,6 @@ int virPortAllocatorAcquire(virPortAllocatorRangePtr range, int virPortAllocatorRelease(virPortAllocatorRangePtr range, unsigned short port); -int virPortAllocatorSetUsed(virPortAllocatorRangePtr range, - unsigned short port, - bool value); +int virPortAllocatorSetUsed(unsigned short port, bool value); #endif /* __VIR_PORT_ALLOCATOR_H__ */ diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index 47ea85b..e8089b8 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -97,7 +97,7 @@ static int testCompareXMLToArgvFiles(const char *xml, if (vmdef->graphics[0]->data.vnc.autoport) virPortAllocatorRelease(gports, vmdef->graphics[0]->data.vnc.port); else - virPortAllocatorSetUsed(gports, vmdef->graphics[0]->data.vnc.port, false); + virPortAllocatorSetUsed(vmdef->graphics[0]->data.vnc.port, false); } VIR_FREE(actualargv); diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c index 465edf0..bfe742b 100644 --- a/tests/libxlxml2domconfigtest.c +++ b/tests/libxlxml2domconfigtest.c @@ -118,7 +118,7 @@ testCompareXMLToDomConfig(const char *xmlfile, if (vmdef->graphics[0]->data.vnc.autoport) virPortAllocatorRelease(gports, vmdef->graphics[0]->data.vnc.port); else - virPortAllocatorSetUsed(gports, vmdef->graphics[0]->data.vnc.port, false); + virPortAllocatorSetUsed(vmdef->graphics[0]->data.vnc.port, false); } VIR_FREE(expectjson);