[PATCH 10/17] conf: change virDomainDefAddUSBController() to return void
It can't fail.
Signed-off-by: Laine Stump <laine(a)redhat.com>
---
src/conf/domain_conf.c | 8 +++-----
src/conf/domain_conf.h | 2 +-
src/qemu/qemu_postparse.c | 6 ++----
3 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 837b306919..5d887054af 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -16483,9 +16483,9 @@ virDomainDefAddController(virDomainDef *def,
* also add companion uhci1, uhci2, and uhci3 controllers at the same
* index.
*
- * Returns 0 on success, -1 on failure.
+ * Always succeeds.
*/
-int
+void
virDomainDefAddUSBController(virDomainDef *def, int idx, int model)
{
virDomainControllerDef *cont; /* this is a *copy* of the virDomainControllerDef */
@@ -16493,7 +16493,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
@@ -16515,8 +16515,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 1edc3679cd..87774b7dbc 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -4363,7 +4363,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 71d772bfa0..0eb6a81f94 100644
--- a/src/qemu/qemu_postparse.c
+++ b/src/qemu/qemu_postparse.c
@@ -1331,10 +1331,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.1