shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 06:50:22 +03:00
Code Releases Activity

conf: change virDomainDefMaybeAddController() to return true/false

Browse Source 
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@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Laine Stump 2025-02-11 22:43:22 -05:00
parent cc82b06036
commit 250d6ac2a0
6 changed files with 21 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/bhyve/bhyve_domain.c
View File

@ -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;
}

6
src/conf/domain_addr.c
View File

@ -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)

34
src/conf/domain_conf.c
View File

@ -16529,7 +16529,7 @@ virDomainDefAddUSBController(virDomainDef *def, int idx, int model)
}
int
bool
virDomainDefMaybeAddController(virDomainDef *def,
virDomainControllerType type,
int idx,
@ -16539,10 +16539,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;
}
@ -17240,11 +17240,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;
}
@ -22276,10 +22273,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;
}
@ -22299,10 +22294,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);
}
}
@ -22314,10 +22306,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);
}
}
@ -22354,10 +22343,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;

2
src/conf/domain_conf.h
View File

@ -4372,7 +4372,7 @@ virDomainDefAddController(virDomainDef *def,
int model);
void
virDomainDefAddUSBController(virDomainDef *def, int idx, int model);
int
bool
virDomainDefMaybeAddController(virDomainDef *def,
virDomainControllerType type,
int idx,

8
src/qemu/qemu_domain_address.c
View File

@ -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

6
src/qemu/qemu_postparse.c
View File

@ -1335,10 +1335,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);