This function can't fail, but it has always returned 1 if a controller
is added and 0 if not, and there is one place that checks for a 1
return, so we remove the -1 return and change it to return true/false
instead of 1/0.
Signed-off-by: Laine Stump <laine@xxxxxxxxxx>
---
src/bhyve/bhyve_domain.c | 13 ++++++-------
src/conf/domain_addr.c | 6 +-----
src/conf/domain_conf.c | 34 ++++++++++------------------------
src/conf/domain_conf.h | 2 +-
src/qemu/qemu_domain_address.c | 8 +-------
src/qemu/qemu_postparse.c | 6 ++----
6 files changed, 21 insertions(+), 48 deletions(-)
diff --git a/src/bhyve/bhyve_domain.c b/src/bhyve/bhyve_domain.c
index 684d870749..7d1ea7f1b1 100644
--- a/src/bhyve/bhyve_domain.c
+++ b/src/bhyve/bhyve_domain.c
@@ -94,14 +94,13 @@ bhyveDomainDefPostParse(virDomainDef *def,
return -1;
/* Add an implicit PCI root controller */
- if (virDomainDefMaybeAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_PCI, 0,
- VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT) < 0)
- return -1;
+ virDomainDefMaybeAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_PCI, 0,
+ VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT);
- if (bhyveDomainDefNeedsISAController(def))
- if (virDomainDefMaybeAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_ISA, 0,
- VIR_DOMAIN_CONTROLLER_MODEL_ISA_DEFAULT) < 0)
- return -1;
+ if (bhyveDomainDefNeedsISAController(def)) {
+ virDomainDefMaybeAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_ISA, 0,
+ VIR_DOMAIN_CONTROLLER_MODEL_ISA_DEFAULT);
+ }
return 0;
}
diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c
index a53ff6df6c..8dfa8feca0 100644
--- a/src/conf/domain_addr.c
+++ b/src/conf/domain_addr.c
@@ -1625,11 +1625,7 @@ virDomainVirtioSerialAddrSetAutoaddController(virDomainDef *def,
{
int contidx;
- if (virDomainDefMaybeAddController(def,
- VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL,
- idx, -1) < 0)
- return -1;
-
+ virDomainDefMaybeAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL, idx, -1);
contidx = virDomainControllerFind(def, VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL, idx);
if (virDomainVirtioSerialAddrSetAddController(addrs, def->controllers[contidx]) < 0)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 5d887054af..611b6a44c8 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -16518,7 +16518,7 @@ virDomainDefAddUSBController(virDomainDef *def, int idx, int model)
}
-int
+bool
virDomainDefMaybeAddController(virDomainDef *def,
virDomainControllerType type,
int idx,
@@ -16528,10 +16528,10 @@ virDomainDefMaybeAddController(virDomainDef *def,
* in use for that type of controller
*/
if (idx >= 0 && virDomainControllerFind(def, type, idx) >= 0)
- return 0;
+ return false;
virDomainDefAddController(def, type, idx, model);
- return 1;
+ return true;
}
@@ -17229,11 +17229,8 @@ virDomainDefMaybeAddHostdevSCSIcontroller(virDomainDef *def)
if (maxController == -1)
return 0;
- for (i = 0; i <= maxController; i++) {
- if (virDomainDefMaybeAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_SCSI,
- i, newModel) < 0)
- return -1;
- }
+ for (i = 0; i <= maxController; i++)
+ virDomainDefMaybeAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_SCSI, i, newModel);
return 0;
}
@@ -22271,10 +22268,8 @@ virDomainDefAddDiskControllersForType(virDomainDef *def,
if (maxController == -1)
return 0;
- for (i = 0; i <= maxController; i++) {
- if (virDomainDefMaybeAddController(def, controllerType, i, -1) < 0)
- return -1;
- }
+ for (i = 0; i <= maxController; i++)
+ virDomainDefMaybeAddController(def, controllerType, i, -1);
return 0;
}
@@ -22294,10 +22289,7 @@ virDomainDefMaybeAddVirtioSerialController(virDomainDef *def)
if (channel->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_SERIAL)
idx = channel->info.addr.vioserial.controller;
- if (virDomainDefMaybeAddController(def,
- VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL,
- idx, -1) < 0)
- return -1;
+ virDomainDefMaybeAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL, idx, -1);
}
}
@@ -22309,10 +22301,7 @@ virDomainDefMaybeAddVirtioSerialController(virDomainDef *def)
if (console->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_SERIAL)
idx = console->info.addr.vioserial.controller;
- if (virDomainDefMaybeAddController(def,
- VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL,
- idx, -1) < 0)
- return -1;
+ virDomainDefMaybeAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL, idx, -1);
}
}
@@ -22349,10 +22338,7 @@ virDomainDefMaybeAddSmartcardController(virDomainDef *def)
smartcard->info.addr.ccid.slot = max + 1;
}
- if (virDomainDefMaybeAddController(def,
- VIR_DOMAIN_CONTROLLER_TYPE_CCID,
- idx, -1) < 0)
- return -1;
+ virDomainDefMaybeAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_CCID, idx, -1);
}
return 0;
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 87774b7dbc..78a9ae5749 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -4365,7 +4365,7 @@ virDomainDefAddController(virDomainDef *def,
int model);
void
virDomainDefAddUSBController(virDomainDef *def, int idx, int model);
-int
+bool
virDomainDefMaybeAddController(virDomainDef *def,
virDomainControllerType type,
int idx,
diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
index 970ae3949d..d38983bf63 100644
--- a/src/qemu/qemu_domain_address.c
+++ b/src/qemu/qemu_domain_address.c
@@ -2620,7 +2620,6 @@ qemuDomainAssignPCIAddresses(virDomainDef *def,
int max_idx = -1;
int nbuses = 0;
size_t i;
- int rv;
for (i = 0; i < def->ncontrollers; i++) {
virDomainControllerDef *cont = def->controllers[i];
@@ -2737,12 +2736,7 @@ qemuDomainAssignPCIAddresses(virDomainDef *def,
int contIndex;
virDomainPCIAddressBus *bus = &addrs->buses[i];
- if ((rv = virDomainDefMaybeAddController(
- def, VIR_DOMAIN_CONTROLLER_TYPE_PCI,
- i, bus->model)) < 0)
- goto cleanup;
-
- if (rv == 0)
+ if (!virDomainDefMaybeAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_PCI, i, bus->model))
continue; /* no new controller added */
/* We did add a new controller, so we will need one more
diff --git a/src/qemu/qemu_postparse.c b/src/qemu/qemu_postparse.c
index 0eb6a81f94..fc7918d9c4 100644
--- a/src/qemu/qemu_postparse.c
+++ b/src/qemu/qemu_postparse.c
@@ -1334,10 +1334,8 @@ qemuDomainDefAddDefaultDevices(virQEMUDriver *driver,
if (addDefaultUSB && virDomainControllerFind(def, VIR_DOMAIN_CONTROLLER_TYPE_USB, 0) < 0)
virDomainDefAddUSBController(def, 0, usbModel);
- if (addImplicitSATA &&
- virDomainDefMaybeAddController(
- def, VIR_DOMAIN_CONTROLLER_TYPE_SATA, 0, -1) < 0)
- return -1;
+ if (addImplicitSATA)
+ virDomainDefMaybeAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_SATA, 0, -1);
pciRoot = virDomainControllerFind(def, VIR_DOMAIN_CONTROLLER_TYPE_PCI, 0);
--
2.47.1
