From 1d8d2fbcd09b26541db580f456e6a873869b0abe Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Tue, 24 Jun 2014 13:34:17 +0200
Subject: [PATCH] virtportallocator: new function "virPortAllocatorSetUsed"

virPortAllocatorSetUsed permits to set a port as already used and
prevent the port allocator to use it without any attempt to bind it.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
 src/libvirt_private.syms    |  1 +
 src/util/virportallocator.c | 43 ++++++++++++++++++++++++++++++++++++-
 src/util/virportallocator.h |  4 ++++
 3 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index fd01913072..981dc879f0 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1770,6 +1770,7 @@ virPidFileWritePath;
 virPortAllocatorAcquire;
 virPortAllocatorNew;
 virPortAllocatorRelease;
+virPortAllocatorSetUsed;
 
 
 # util/virprocess.h
diff --git a/src/util/virportallocator.c b/src/util/virportallocator.c
index b68133a1b4..ff5691a2b7 100644
--- a/src/util/virportallocator.c
+++ b/src/util/virportallocator.c
@@ -1,7 +1,7 @@
 /*
  * virportallocator.c: Allocate & track TCP port allocations
  *
- * Copyright (C) 2013 Red Hat, Inc.
+ * Copyright (C) 2013-2014 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -250,3 +250,44 @@ int virPortAllocatorRelease(virPortAllocatorPtr pa,
     virObjectUnlock(pa);
     return ret;
 }
+
+int virPortAllocatorSetUsed(virPortAllocatorPtr pa,
+                            unsigned short port,
+                            bool value)
+{
+    int ret = -1;
+
+    virObjectLock(pa);
+
+    if (port < pa->start ||
+        port > pa->end) {
+        ret = 0;
+        goto cleanup;
+    }
+
+    if (value) {
+        bool used = false;
+        if (virBitmapGetBit(pa->bitmap, port - pa->start, &used) < 0)
+            virReportError(VIR_ERR_INTERNAL_ERROR,
+                           _("Failed to query port %d"), port);
+
+        if (used || virBitmapSetBit(pa->bitmap, port - pa->start) < 0) {
+            virReportError(VIR_ERR_INTERNAL_ERROR,
+                           _("Failed to reserve port %d"), port);
+            goto cleanup;
+        }
+    } else {
+        if (virBitmapClearBit(pa->bitmap,
+                              port - pa->start) < 0) {
+            virReportError(VIR_ERR_INTERNAL_ERROR,
+                           _("Failed to release port %d"),
+                           port);
+            goto cleanup;
+        }
+    }
+
+    ret = 0;
+ cleanup:
+    virObjectUnlock(pa);
+    return ret;
+}
diff --git a/src/util/virportallocator.h b/src/util/virportallocator.h
index c8aa6deffd..e5ee56d8d9 100644
--- a/src/util/virportallocator.h
+++ b/src/util/virportallocator.h
@@ -38,4 +38,8 @@ int virPortAllocatorAcquire(virPortAllocatorPtr pa,
 int virPortAllocatorRelease(virPortAllocatorPtr pa,
                             unsigned short port);
 
+int virPortAllocatorSetUsed(virPortAllocatorPtr pa,
+                            unsigned short port,
+                            bool value);
+
 #endif /* __VIR_PORT_ALLOCATOR_H__ */
-- 
GitLab