12:35 a.m.
Let's use virPortAllocatorRelease instead of virPortAllocatorSetUsed(false).
---
src/bhyve/bhyve_command.c | 2 +-
src/bhyve/bhyve_process.c | 2 +-
src/qemu/qemu_process.c | 16 ++++++++--------
src/util/virportallocator.c | 22 ++++++----------------
src/util/virportallocator.h | 2 +-
5 files changed, 17 insertions(+), 27 deletions(-)
diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c
index 9d21788..d723cc2 100644
--- a/src/bhyve/bhyve_command.c
+++ b/src/bhyve/bhyve_command.c
@@ -411,7 +411,7 @@ bhyveBuildGraphicsArgStr(const virDomainDef *def,
return -1;
graphics->data.vnc.port = port;
} else {
- if (virPortAllocatorSetUsed(graphics->data.vnc.port, true) < 0)
+ if (virPortAllocatorSetUsed(graphics->data.vnc.port) < 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 5e682fa..4ff6257 100644
--- a/src/bhyve/bhyve_process.c
+++ b/src/bhyve/bhyve_process.c
@@ -424,7 +424,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(vnc_port, true) < 0) {
+ if (virPortAllocatorSetUsed(vnc_port) < 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 0777922..6f4ccd9 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -4171,12 +4171,12 @@ qemuProcessGraphicsReservePorts(virDomainGraphicsDefPtr graphics,
case VIR_DOMAIN_GRAPHICS_TYPE_VNC:
if (!graphics->data.vnc.autoport ||
reconnect) {
- if (virPortAllocatorSetUsed(graphics->data.vnc.port, true) < 0)
+ if (virPortAllocatorSetUsed(graphics->data.vnc.port) < 0)
return -1;
graphics->data.vnc.portReserved = true;
}
if (graphics->data.vnc.websocket > 0 &&
- virPortAllocatorSetUsed(graphics->data.vnc.websocket, true) < 0)
+ virPortAllocatorSetUsed(graphics->data.vnc.websocket) < 0)
return -1;
break;
@@ -4185,13 +4185,13 @@ qemuProcessGraphicsReservePorts(virDomainGraphicsDefPtr graphics,
return 0;
if (graphics->data.spice.port > 0) {
- if (virPortAllocatorSetUsed(graphics->data.spice.port, true) < 0)
+ if (virPortAllocatorSetUsed(graphics->data.spice.port) < 0)
return -1;
graphics->data.spice.portReserved = true;
}
if (graphics->data.spice.tlsPort > 0) {
- if (virPortAllocatorSetUsed(graphics->data.spice.tlsPort, true) < 0)
+ if (virPortAllocatorSetUsed(graphics->data.spice.tlsPort) < 0)
return -1;
graphics->data.spice.tlsPortReserved = true;
}
@@ -6541,7 +6541,7 @@ void qemuProcessStop(virQEMUDriverPtr driver,
if (graphics->data.vnc.autoport) {
virPortAllocatorRelease(graphics->data.vnc.port);
} else if (graphics->data.vnc.portReserved) {
- virPortAllocatorSetUsed(graphics->data.spice.port, false);
+ virPortAllocatorRelease(graphics->data.spice.port);
graphics->data.vnc.portReserved = false;
}
if (graphics->data.vnc.websocketGenerated) {
@@ -6549,7 +6549,7 @@ void qemuProcessStop(virQEMUDriverPtr driver,
graphics->data.vnc.websocketGenerated = false;
graphics->data.vnc.websocket = -1;
} else if (graphics->data.vnc.websocket) {
- virPortAllocatorSetUsed(graphics->data.vnc.websocket, false);
+ virPortAllocatorRelease(graphics->data.vnc.websocket);
}
}
if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE) {
@@ -6558,12 +6558,12 @@ void qemuProcessStop(virQEMUDriverPtr driver,
virPortAllocatorRelease(graphics->data.spice.tlsPort);
} else {
if (graphics->data.spice.portReserved) {
- virPortAllocatorSetUsed(graphics->data.spice.port, false);
+ virPortAllocatorRelease(graphics->data.spice.port);
graphics->data.spice.portReserved = false;
}
if (graphics->data.spice.tlsPortReserved) {
- virPortAllocatorSetUsed(graphics->data.spice.tlsPort, false);
+ virPortAllocatorRelease(graphics->data.spice.tlsPort);
graphics->data.spice.tlsPortReserved = false;
}
}
diff --git a/src/util/virportallocator.c b/src/util/virportallocator.c
index 76fac49..565715c 100644
--- a/src/util/virportallocator.c
+++ b/src/util/virportallocator.c
@@ -279,8 +279,7 @@ int virPortAllocatorRelease(unsigned short port)
return ret;
}
-int virPortAllocatorSetUsed(unsigned short port,
- bool value)
+int virPortAllocatorSetUsed(unsigned short port)
{
int ret = -1;
virPortAllocatorPtr pa = virPortAllocatorGet();
@@ -290,20 +289,11 @@ int virPortAllocatorSetUsed(unsigned short port,
virObjectLock(pa);
- if (value) {
- if (virBitmapIsBitSet(pa->bitmap, port) ||
- virBitmapSetBit(pa->bitmap, port) < 0) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- _("Failed to reserve port %d"), port);
- goto cleanup;
- }
- } else {
- if (virBitmapClearBit(pa->bitmap, port) < 0) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- _("Failed to release port %d"),
- port);
- goto cleanup;
- }
+ if (virBitmapIsBitSet(pa->bitmap, port) ||
+ virBitmapSetBit(pa->bitmap, port) < 0) {
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ _("Failed to reserve port %d"), port);
+ goto cleanup;
}
ret = 0;
diff --git a/src/util/virportallocator.h b/src/util/virportallocator.h
index bddeadd..3bc3ef2 100644
--- a/src/util/virportallocator.h
+++ b/src/util/virportallocator.h
@@ -39,6 +39,6 @@ int virPortAllocatorAcquire(virPortRangePtr range,
int virPortAllocatorRelease(unsigned short port);
-int virPortAllocatorSetUsed(unsigned short port, bool value);
+int virPortAllocatorSetUsed(unsigned short port);
#endif /* __VIR_PORT_ALLOCATOR_H__ */
--
1.8.3.1