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 virDomainDefAddUSBController() to return void

Browse Source 
It can't fail.

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 21:36:26 -05:00
parent b0ef70aca9
commit e207c9c17e
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/conf/domain_conf.c
View File

@ -16495,10 +16495,8 @@ virDomainDefAddController(virDomainDef *def,
* current machinetype if model == -1). If model is ich9-usb-ehci,
* also add companion uhci1, uhci2, and uhci3 controllers at the same
* index.
*
* Returns 0 on success, -1 on failure.
*/
int
void
virDomainDefAddUSBController(virDomainDef *def, int idx, int model)
{
virDomainControllerDef *cont; /* this is a *copy* of the virDomainControllerDef */
@ -16506,7 +16504,7 @@ virDomainDefAddUSBController(virDomainDef *def, int idx, int model)
cont = virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_USB, idx, model);
if (model != VIR_DOMAIN_CONTROLLER_MODEL_USB_ICH9_EHCI1)
return 0;
return;
/* When the initial controller is ich9-usb-ehci, also add the
* companion controllers
@ -16528,8 +16526,6 @@ virDomainDefAddUSBController(virDomainDef *def, int idx, int model)
idx, VIR_DOMAIN_CONTROLLER_MODEL_USB_ICH9_UHCI3);
cont->info.mastertype = VIR_DOMAIN_CONTROLLER_MASTER_USB;
cont->info.master.usb.startport = 4;
return 0;
}

2
src/conf/domain_conf.h
View File

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

6
src/qemu/qemu_postparse.c
View File

@ -1332,10 +1332,8 @@ qemuDomainDefAddDefaultDevices(virQEMUDriver *driver,
break;
}
if (addDefaultUSB &&
virDomainControllerFind(def, VIR_DOMAIN_CONTROLLER_TYPE_USB, 0) < 0 &&
virDomainDefAddUSBController(def, 0, usbModel) < 0)
return -1;
if (addDefaultUSB && virDomainControllerFind(def, VIR_DOMAIN_CONTROLLER_TYPE_USB, 0) < 0)
virDomainDefAddUSBController(def, 0, usbModel);
if (addImplicitSATA &&
virDomainDefMaybeAddController(