From: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
Date: Tue, 6 Feb 2018 09:09:11 +0000 (+0300)
Subject: port allocator: make port range constant object
X-Git-Tag: v4.1.0-rc1~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c61c2808168d848473ac92c33adc88c4ff8d33c;p=thirdparty%2Flibvirt.git

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 ee09b7ed01..0e85dffa36 100644
--- 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 ab1e48972d..e1ad5463f3 100644
--- 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 8620372676..25200fbbb2 100644
--- 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 11696b7865..de0209cdea 100644
--- 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);