[libvirt] [PATCH 6/6] port allocator: make port range constant object

Nikolay Shirokovskiy nshirokovskiy at virtuozzo.com
Wed Dec 20 06:35:38 UTC 2017


---
 src/libxl/libxl_conf.h      | 4 ++--
 src/qemu/qemu_conf.h        | 6 +++---
 src/util/virportallocator.c | 2 +-
 src/util/virportallocator.h | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h
index 3ba8710..457dabd 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 */
     virPortRangePtr reservedGraphicsPorts;
 
-    /* Immutable pointer, self-locking APIs */
+    /* Immutable pointer, immutable object */
     virPortRangePtr migrationPorts;
 
     /* Immutable pointer, lockless APIs*/
diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index e8c8bd6..b0854ce 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 */
     virPortRangePtr remotePorts;
 
-    /* Immutable pointer, self-locking APIs */
+    /* Immutable pointer, immutable object */
     virPortRangePtr webSocketPorts;
 
-    /* Immutable pointer, self-locking APIs */
+    /* Immutable pointer, immutable object */
     virPortRangePtr migrationPorts;
 
     /* Immutable pointer, lockless APIs*/
diff --git a/src/util/virportallocator.c b/src/util/virportallocator.c
index 565715c..3ca3f44 100644
--- a/src/util/virportallocator.c
+++ b/src/util/virportallocator.c
@@ -207,7 +207,7 @@ static virPortAllocatorPtr virPortAllocatorGet(void)
     return virPortAllocatorInstance;
 }
 
-int virPortAllocatorAcquire(virPortRangePtr range,
+int virPortAllocatorAcquire(const virPortRange *range,
                             unsigned short *port)
 {
     int ret = -1;
diff --git a/src/util/virportallocator.h b/src/util/virportallocator.h
index 3bc3ef2..71a924a 100644
--- a/src/util/virportallocator.h
+++ b/src/util/virportallocator.h
@@ -34,7 +34,7 @@ virPortRangePtr virPortRangeNew(const char *name,
 
 void virPortRangeFree(virPortRangePtr range);
 
-int virPortAllocatorAcquire(virPortRangePtr range,
+int virPortAllocatorAcquire(const virPortRange *range,
                             unsigned short *port);
 
 int virPortAllocatorRelease(unsigned short port);
-- 
1.8.3.1




More information about the libvir-list mailing list