From be9a0f47646d1ebb9651c1a58ffb30352596ecef Mon Sep 17 00:00:00 2001 From: Laine Stump Date: Tue, 11 Feb 2025 22:53:30 -0500 Subject: [PATCH] conf: change virDomainDefMaybeAddVirtioSerialController() to return void It can't fail. Signed-off-by: Laine Stump Reviewed-by: Martin Kletzander --- src/conf/domain_conf.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ec72bb5117..64ec520589 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -22275,7 +22275,7 @@ virDomainDefAddDiskControllersForType(virDomainDef *def, } -static int +static void virDomainDefMaybeAddVirtioSerialController(virDomainDef *def) { /* Look for any virtio serial or virtio console devs */ @@ -22304,8 +22304,6 @@ virDomainDefMaybeAddVirtioSerialController(virDomainDef *def) virDomainDefMaybeAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL, idx, -1); } } - - return 0; } @@ -22362,8 +22360,7 @@ virDomainDefAddImplicitControllers(virDomainDef *def) virDomainDefAddDiskControllersForType(def, VIR_DOMAIN_CONTROLLER_TYPE_SATA, VIR_DOMAIN_DISK_BUS_SATA); - if (virDomainDefMaybeAddVirtioSerialController(def) < 0) - return -1; + virDomainDefMaybeAddVirtioSerialController(def); if (virDomainDefMaybeAddSmartcardController(def) < 0) return -1; -- 2.47.3