port allocator: make port range constant object

Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>

diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h
index ee09b7ed01fab6ed8889335d08d35ccd53aaafe0..0e85dffa3690e1eed7542904cecb5ec5d1599879 100644 (file)
--- a/src/libxl/libxl_conf.h
+++ b/src/libxl/libxl_conf.h
@@ -130,10 +130,10 @@ struct _libxlDriverPrivate {
     /* Immutable pointer, self-locking APIs */
     virObjectEventStatePtr domainEventState;
 
-    /* Immutable pointer, self-locking APIs */
+    /* Immutable pointer, immutable object */
     virPortAllocatorRangePtr reservedGraphicsPorts;
 
-    /* Immutable pointer, self-locking APIs */
+    /* Immutable pointer, immutable object */
     virPortAllocatorRangePtr migrationPorts;
 
     /* Immutable pointer, lockless APIs*/

diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index ab1e48972dc52f776c8bd8256fce757fa9cccbab..e1ad5463f3e0579276ddddad9dd4c2c1c1de068d 100644 (file)
--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
@@ -263,13 +263,13 @@ struct _virQEMUDriver {
     /* Immutable pointer. Unsafe APIs. XXX */
     virHashTablePtr sharedDevices;
 
-    /* Immutable pointer, self-locking APIs */
+    /* Immutable pointer, immutable object */
     virPortAllocatorRangePtr remotePorts;
 
-    /* Immutable pointer, self-locking APIs */
+    /* Immutable pointer, immutable object */
     virPortAllocatorRangePtr webSocketPorts;
 
-    /* Immutable pointer, self-locking APIs */
+    /* Immutable pointer, immutable object */
     virPortAllocatorRangePtr migrationPorts;
 
     /* Immutable pointer, lockless APIs*/

diff --git a/src/util/virportallocator.c b/src/util/virportallocator.c
index 8620372676895f770bffe701776abe678d6cc491..25200fbbb2b227cb4c8724ca8998ecbe48dbf71f 100644 (file)
--- a/src/util/virportallocator.c
+++ b/src/util/virportallocator.c
@@ -213,7 +213,7 @@ virPortAllocatorGet(void)
 }
 
 int
-virPortAllocatorAcquire(virPortAllocatorRangePtr range,
+virPortAllocatorAcquire(const virPortAllocatorRange *range,
                         unsigned short *port)
 {
     int ret = -1;

diff --git a/src/util/virportallocator.h b/src/util/virportallocator.h
index 11696b786571a270013f86d768e6dbf7781a9945..de0209cdea1bdf38ee676b00e8f6d9ee20abc28a 100644 (file)
--- a/src/util/virportallocator.h
+++ b/src/util/virportallocator.h
@@ -35,7 +35,7 @@ virPortAllocatorRangeNew(const char *name,
 
 void virPortAllocatorRangeFree(virPortAllocatorRangePtr range);
 
-int virPortAllocatorAcquire(virPortAllocatorRangePtr range,
+int virPortAllocatorAcquire(const virPortAllocatorRange *range,
                             unsigned short *port);
 
 int virPortAllocatorRelease(unsigned short port);