domain_addr.c: update virtconsole port reservation comment and allowZero var

Rename variable "allowZero" to "allowPortZero" for clarity and update the virtconsole port reservation comment,
as port 0 is reserved for the first virtconsole unless specified.

Signed-off-by: Aaron M. Brown <aaronmbr@linux.ibm.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>

diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c
index 87c5973fabe5da96358e982a062218af1f41b972..d8d482958f33f0354b41e9a80c3af892ad9a9190 100644 (file)
--- a/src/conf/domain_addr.c
+++ b/src/conf/domain_addr.c
@@ -1663,14 +1663,14 @@ static int
 virDomainVirtioSerialAddrNext(virDomainDef *def,
                               virDomainVirtioSerialAddrSet *addrs,
                               virDomainDeviceVirtioSerialAddress *addr,
-                              bool allowZero)
+                              bool allowPortZero)
 {
     ssize_t port, startPort = 0;
     ssize_t i;
     unsigned int controller;
 
-    /* port number 0 is reserved for virtconsoles */
-    if (allowZero)
+    /* port number 0 is reserved for the first virtconsole */
+    if (allowPortZero)
         startPort = -1;
 
     if (addrs->ncontrollers == 0) {
@@ -1718,14 +1718,14 @@ virDomainVirtioSerialAddrNext(virDomainDef *def,
 static int
 virDomainVirtioSerialAddrNextFromController(virDomainVirtioSerialAddrSet *addrs,
                                             virDomainDeviceVirtioSerialAddress *addr,
-                                            bool allowZero)
+                                            bool allowPortZero)
 {
     ssize_t startPort = 0;
     ssize_t port;
     ssize_t i;
     virBitmap *map;
 
-    if (allowZero)
+    if (allowPortZero)
         startPort = -1;
 
     i = virDomainVirtioSerialAddrFindController(addrs, addr->controller);
@@ -1755,11 +1755,11 @@ static int ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3)
 virDomainVirtioSerialAddrAssign(virDomainDef *def,
                                 virDomainVirtioSerialAddrSet *addrs,
                                 virDomainDeviceInfo *info,
-                                bool allowZero,
+                                bool allowPortZero,
                                 bool portOnly)
 {
     virDomainDeviceInfo nfo = { 0 };
-    virDomainDeviceInfo *ptr = allowZero ? &nfo : info;
+    virDomainDeviceInfo *ptr = allowPortZero ? &nfo : info;
     virBitmap *map;
     ssize_t i;
 
@@ -1769,7 +1769,7 @@ virDomainVirtioSerialAddrAssign(virDomainDef *def,
     if (portOnly) {
         if (virDomainVirtioSerialAddrNextFromController(addrs,
                                                         &ptr->addr.vioserial,
-                                                        allowZero) < 0)
+                                                        allowPortZero) < 0)
             return -1;
 
         if (ptr == &nfo) {
@@ -1789,7 +1789,7 @@ virDomainVirtioSerialAddrAssign(virDomainDef *def,
 
     } else {
         if (virDomainVirtioSerialAddrNext(def, addrs, &ptr->addr.vioserial,
-                                          allowZero) < 0)
+                                          allowPortZero) < 0)
             return -1;
     }
 
@@ -1808,20 +1808,20 @@ int
 virDomainVirtioSerialAddrAutoAssignFromCache(virDomainDef *def,
                                              virDomainVirtioSerialAddrSet *addrs,
                                              virDomainDeviceInfo *info,
-                                             bool allowZero)
+                                             bool allowPortZero)
 {
     bool portOnly = info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_SERIAL;
     if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_SERIAL &&
         info->addr.vioserial.port)
         return virDomainVirtioSerialAddrReserve(NULL, NULL, info, addrs);
     else
-        return virDomainVirtioSerialAddrAssign(def, addrs, info, allowZero, portOnly);
+        return virDomainVirtioSerialAddrAssign(def, addrs, info, allowPortZero, portOnly);
 }
 
 int
 virDomainVirtioSerialAddrAutoAssign(virDomainDef *def,
                                     virDomainDeviceInfo *info,
-                                    bool allowZero)
+                                    bool allowPortZero)
 {
     virDomainVirtioSerialAddrSet *addrs = NULL;
     int ret = -1;
@@ -1829,7 +1829,7 @@ virDomainVirtioSerialAddrAutoAssign(virDomainDef *def,
     if (!(addrs = virDomainVirtioSerialAddrSetCreateFromDomain(def)))
         goto cleanup;
 
-    if (virDomainVirtioSerialAddrAutoAssignFromCache(def, addrs, info, allowZero) < 0)
+    if (virDomainVirtioSerialAddrAutoAssignFromCache(def, addrs, info, allowPortZero) < 0)
         goto cleanup;
 
     ret = 0;