From b7da649e6ea796c2b8c29c1809532047530dee20 Mon Sep 17 00:00:00 2001 From: Laine Stump Date: Tue, 11 Feb 2025 20:44:51 -0500 Subject: [PATCH] libxl: change xenDomainDefAddImplicitInputDevice() to return void It can't fail. Signed-off-by: Laine Stump Reviewed-by: Martin Kletzander --- src/libxl/libxl_domain.c | 3 +-- src/libxl/xen_common.c | 4 +--- src/libxl/xen_common.h | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 6805160923..c7ba5636c4 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -266,8 +266,7 @@ libxlDomainDefPostParse(virDomainDef *def, } /* add implicit input devices */ - if (xenDomainDefAddImplicitInputDevice(def) < 0) - return -1; + xenDomainDefAddImplicitInputDevice(def); /* For x86_64 HVM */ if (def->os.type == VIR_DOMAIN_OSTYPE_HVM && diff --git a/src/libxl/xen_common.c b/src/libxl/xen_common.c index 2e02c2f790..a050f0ab6e 100644 --- a/src/libxl/xen_common.c +++ b/src/libxl/xen_common.c @@ -2388,7 +2388,7 @@ xenFormatConfigCommon(virConf *conf, } -int +void xenDomainDefAddImplicitInputDevice(virDomainDef *def) { virDomainInputBus implicitInputBus = VIR_DOMAIN_INPUT_BUS_XEN; @@ -2398,6 +2398,4 @@ xenDomainDefAddImplicitInputDevice(virDomainDef *def) virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_MOUSE, implicitInputBus); virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_KBD, implicitInputBus); - - return 0; } diff --git a/src/libxl/xen_common.h b/src/libxl/xen_common.h index 95408fa896..c52a4f1232 100644 --- a/src/libxl/xen_common.h +++ b/src/libxl/xen_common.h @@ -65,4 +65,4 @@ int xenFormatConfigCommon(virConf *conf, char *xenMakeIPList(virNetDevIPInfo *guestIP); -int xenDomainDefAddImplicitInputDevice(virDomainDef *def); +void xenDomainDefAddImplicitInputDevice(virDomainDef *def); -- 2.47.3