1:50 p.m.
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(a)linux.ibm.com>
---
src/conf/domain_addr.c | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c
index 5448d3d078..1bf0530688 100644
--- a/src/conf/domain_addr.c
+++ b/src/conf/domain_addr.c
@@ -1638,14 +1638,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) {
@@ -1693,13 +1693,13 @@ virDomainVirtioSerialAddrNext(virDomainDef *def,
static int
virDomainVirtioSerialAddrNextFromController(virDomainVirtioSerialAddrSet *addrs,
virDomainDeviceVirtioSerialAddress *addr,
- bool allowZero)
+ bool allowPortZero)
{
ssize_t port, startPort = 0;
ssize_t i;
virBitmap *map;
- if (allowZero)
+ if (allowPortZero)
startPort = -1;
i = virDomainVirtioSerialAddrFindController(addrs, addr->controller);
@@ -1724,7 +1724,7 @@
virDomainVirtioSerialAddrNextFromController(virDomainVirtioSerialAddrSet *addrs,
addr->port);
/* if this is the first virtconsole, reserve port 0 */
- if (allowZero && port == 0) {
+ if (allowPortZero && port == 0) {
ignore_value(virBitmapSetBit(map, 0));
VIR_DEBUG(
"Port 0 reserved for the first virtconsole on vioserial controller
%1$u",
@@ -1738,11 +1738,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;
ptr->type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_SERIAL;
ptr->addr.vioserial.controller = info->addr.vioserial.controller;
@@ -1750,7 +1750,7 @@ virDomainVirtioSerialAddrAssign(virDomainDef *def,
if (portOnly) {
if (virDomainVirtioSerialAddrNextFromController(addrs,
&ptr->addr.vioserial,
- allowZero) < 0)
+ allowPortZero) < 0)
return -1;
if (ptr == &nfo) {
@@ -1761,7 +1761,7 @@ virDomainVirtioSerialAddrAssign(virDomainDef *def,
} else {
if (virDomainVirtioSerialAddrNext(def, addrs, &ptr->addr.vioserial,
- allowZero) < 0)
+ allowPortZero) < 0)
return -1;
}
@@ -1780,20 +1780,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;
@@ -1801,7 +1801,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;
--
2.39.5 (Apple Git-154)