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

--- 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 ee09b7e..0e85dff 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 1640fa9..ff9f65e 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -266,13 +266,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 8620372..25200fb 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 11696b7..de0209c 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); -- 1.8.3.1