From e207c9c17ef285a22ce6d62115d7fdf2581bf294 Mon Sep 17 00:00:00 2001 From: Laine Stump Date: Tue, 11 Feb 2025 21:36:26 -0500 Subject: [PATCH] conf: change virDomainDefAddUSBController() to return void It can't fail. Signed-off-by: Laine Stump Reviewed-by: Martin Kletzander --- src/conf/domain_conf.c | 8 ++------ src/conf/domain_conf.h | 2 +- src/qemu/qemu_postparse.c | 6 ++---- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0721a4712a..f0681c0eb1 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -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; } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 2e28b0474a..e0647c6c5f 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -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, diff --git a/src/qemu/qemu_postparse.c b/src/qemu/qemu_postparse.c index 2999aa01c8..a08c240832 100644 --- a/src/qemu/qemu_postparse.c +++ b/src/qemu/qemu_postparse.c @@ -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( -- 2.47.3