From nobody Tue Feb 10 23:54:35 2026 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=red-soft.ru Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1703454491906490.93353254722774; Sun, 24 Dec 2023 13:48:11 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id A29651BAC; Sun, 24 Dec 2023 16:48:10 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 7CD641A7E; Sun, 24 Dec 2023 16:35:59 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 2A02F1A14; Sun, 24 Dec 2023 16:35:11 -0500 (EST) Received: from gw.red-soft.ru (red-soft.ru [188.246.186.2]) by lists.libvirt.org (Postfix) with ESMTP id B0DB51A02 for ; Sun, 24 Dec 2023 16:35:03 -0500 (EST) Received: from gentoo.darknet (unknown [10.81.10.243]) by gw.red-soft.ru (Postfix) with ESMTPA id 2510A3E1BC9; Mon, 25 Dec 2023 00:26:09 +0300 (MSK) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 From: Artem Chernyshev To: devel@lists.libvirt.org Subject: [PATCH 05/10] conf: virDomainDefMaybeAddInput() to void Date: Mon, 25 Dec 2023 00:25:58 +0300 Message-ID: <20231224212603.29506-6-artem.chernyshev@red-soft.ru> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231224212603.29506-1-artem.chernyshev@red-soft.ru> References: <20231224212603.29506-1-artem.chernyshev@red-soft.ru> MIME-Version: 1.0 X-KLMS-Rule-ID: 1 X-KLMS-Message-Action: clean X-KLMS-AntiSpam-Lua-Profiles: 182326 [Dec 24 2023] X-KLMS-AntiSpam-Version: 6.1.0.3 X-KLMS-AntiSpam-Envelope-From: artem.chernyshev@red-soft.ru X-KLMS-AntiSpam-Rate: 0 X-KLMS-AntiSpam-Status: not_detected X-KLMS-AntiSpam-Method: none X-KLMS-AntiSpam-Auth: dkim=none X-KLMS-AntiSpam-Info: LuaCore: 7 0.3.7 6d6bf5bd8eea7373134f756a2fd73e9456bb7d1a, {Tracking_from_domain_doesnt_match_to}, d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;127.0.0.199:7.1.2;red-soft.ru:7.1.1, FromAlignment: s X-MS-Exchange-Organization-SCL: -1 X-KLMS-AntiSpam-Interceptor-Info: scan successful X-KLMS-AntiPhishing: Clean, bases: 2023/12/24 20:51:00 X-KLMS-AntiVirus: Kaspersky Security for Linux Mail Server, version 8.0.3.30, bases: 2023/12/24 19:18:00 #22792569 X-KLMS-AntiVirus-Status: Clean, skipped Message-ID-Hash: GJ3I336VIU3PMV3JZG3ESYD7DXL73ZK6 X-Message-ID-Hash: GJ3I336VIU3PMV3JZG3ESYD7DXL73ZK6 X-MailFrom: artem.chernyshev@red-soft.ru X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: Artem Chernyshev X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1703454492808100001 virDomainDefMaybeAddInput() function returns an invariant result, so turn it to void. Remove all redundant check which depends on it returning value. Fixes: 98f6f2081d ("util: alloc: Reimplement VIR_APPEND_ELEMENT using virAp= pendElement") Signed-off-by: Artem Chernyshev --- src/conf/domain_conf.c | 6 ++---- src/conf/domain_conf.h | 2 +- src/libxl/libxl_domain.c | 3 +-- src/libxl/xen_common.c | 18 +++++++----------- src/libxl/xen_common.h | 2 +- src/qemu/qemu_domain.c | 33 ++++++++++++--------------------- src/vz/vz_driver.c | 23 +++++++++-------------- src/vz/vz_sdk.c | 14 ++++++-------- 8 files changed, 39 insertions(+), 62 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 1ab1caba58..3a73a3ae83 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -16179,7 +16179,7 @@ virDomainDefMaybeAddController(virDomainDef *def, } =20 =20 -int +void virDomainDefMaybeAddInput(virDomainDef *def, int type, int bus) @@ -16190,7 +16190,7 @@ virDomainDefMaybeAddInput(virDomainDef *def, for (i =3D 0; i < def->ninputs; i++) { if (def->inputs[i]->type =3D=3D type && def->inputs[i]->bus =3D=3D bus) - return 0; + return; } =20 input =3D g_new0(virDomainInputDef, 1); @@ -16199,8 +16199,6 @@ virDomainDefMaybeAddInput(virDomainDef *def, input->bus =3D bus; =20 VIR_APPEND_ELEMENT(def->inputs, def->ninputs, input); - - return 0; } =20 =20 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index ffa9f74a72..cd582c19b1 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -4273,7 +4273,7 @@ virDomainDefMaybeAddController(virDomainDef *def, virDomainControllerType type, int idx, int model); -int +void virDomainDefMaybeAddInput(virDomainDef *def, int type, int bus); diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 69bac7d0ae..f8f474ebdb 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -257,8 +257,7 @@ libxlDomainDefPostParse(virDomainDef *def, } =20 /* add implicit input devices */ - if (xenDomainDefAddImplicitInputDevice(def) < 0) - return -1; + xenDomainDefAddImplicitInputDevice(def); =20 /* For x86_64 HVM */ if (def->os.type =3D=3D VIR_DOMAIN_OSTYPE_HVM && diff --git a/src/libxl/xen_common.c b/src/libxl/xen_common.c index c7bc51b926..d67a14b7df 100644 --- a/src/libxl/xen_common.c +++ b/src/libxl/xen_common.c @@ -2382,7 +2382,7 @@ xenFormatConfigCommon(virConf *conf, } =20 =20 -int +void xenDomainDefAddImplicitInputDevice(virDomainDef *def) { virDomainInputBus implicitInputBus =3D VIR_DOMAIN_INPUT_BUS_XEN; @@ -2390,15 +2390,11 @@ xenDomainDefAddImplicitInputDevice(virDomainDef *de= f) if (def->os.type =3D=3D VIR_DOMAIN_OSTYPE_HVM) implicitInputBus =3D VIR_DOMAIN_INPUT_BUS_PS2; =20 - if (virDomainDefMaybeAddInput(def, - VIR_DOMAIN_INPUT_TYPE_MOUSE, - implicitInputBus) < 0) - return -1; + virDomainDefMaybeAddInput(def, + VIR_DOMAIN_INPUT_TYPE_MOUSE, + implicitInputBus); =20 - if (virDomainDefMaybeAddInput(def, - VIR_DOMAIN_INPUT_TYPE_KBD, - implicitInputBus) < 0) - return -1; - - return 0; + virDomainDefMaybeAddInput(def, + VIR_DOMAIN_INPUT_TYPE_KBD, + implicitInputBus); } diff --git a/src/libxl/xen_common.h b/src/libxl/xen_common.h index b21046e959..86c2c337c1 100644 --- a/src/libxl/xen_common.h +++ b/src/libxl/xen_common.h @@ -66,4 +66,4 @@ int xenFormatConfigCommon(virConf *conf, =20 char *xenMakeIPList(virNetDevIPInfo *guestIP); =20 -int xenDomainDefAddImplicitInputDevice(virDomainDef *def); +void xenDomainDefAddImplicitInputDevice(virDomainDef *def); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index ac5aefeb43..31b10afaed 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3917,22 +3917,18 @@ virXMLNamespace virQEMUDriverDomainXMLNamespace =3D= { }; =20 =20 -static int +static void qemuDomainDefAddImplicitInputDevice(virDomainDef *def) { if (ARCH_IS_X86(def->os.arch)) { - if (virDomainDefMaybeAddInput(def, - VIR_DOMAIN_INPUT_TYPE_MOUSE, - VIR_DOMAIN_INPUT_BUS_PS2) < 0) - return -1; + virDomainDefMaybeAddInput(def, + VIR_DOMAIN_INPUT_TYPE_MOUSE, + VIR_DOMAIN_INPUT_BUS_PS2); =20 - if (virDomainDefMaybeAddInput(def, - VIR_DOMAIN_INPUT_TYPE_KBD, - VIR_DOMAIN_INPUT_BUS_PS2) < 0) - return -1; + virDomainDefMaybeAddInput(def, + VIR_DOMAIN_INPUT_TYPE_KBD, + VIR_DOMAIN_INPUT_BUS_PS2); } - - return 0; } =20 static int @@ -4122,8 +4118,7 @@ qemuDomainDefAddDefaultDevices(virQEMUDriver *driver, bool addITCOWatchdog =3D false; =20 /* add implicit input devices */ - if (qemuDomainDefAddImplicitInputDevice(def) < 0) - return -1; + qemuDomainDefAddImplicitInputDevice(def); =20 /* Add implicit PCI root controller if the machine has one */ switch (def->os.arch) { @@ -4320,19 +4315,15 @@ qemuDomainDefAddDefaultDevices(virQEMUDriver *drive= r, addDefaultUSBMouse =3D false; } =20 - if (addDefaultUSBKBD && - def->ngraphics > 0 && + if (addDefaultUSBKBD && def->ngraphics > 0) virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_KBD, - VIR_DOMAIN_INPUT_BUS_USB) < 0) - return -1; + VIR_DOMAIN_INPUT_BUS_USB); =20 - if (addDefaultUSBMouse && - def->ngraphics > 0 && + if (addDefaultUSBMouse && def->ngraphics > 0) virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_MOUSE, - VIR_DOMAIN_INPUT_BUS_USB) < 0) - return -1; + VIR_DOMAIN_INPUT_BUS_USB); =20 if (addPanicDevice) { size_t j; diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 93f0e1bbb4..55b39d2200 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -210,26 +210,22 @@ vzConnectGetCapabilities(virConnectPtr conn) return virCapabilitiesFormatXML(privconn->driver->caps); } =20 -static int +static void vzDomainDefAddDefaultInputDevices(virDomainDef *def) { int bus =3D IS_CT(def) ? VIR_DOMAIN_INPUT_BUS_PARALLELS : VIR_DOMAIN_INPUT_BUS_PS2; =20 if (def->ngraphics =3D=3D 0) - return 0; - - if (virDomainDefMaybeAddInput(def, - VIR_DOMAIN_INPUT_TYPE_MOUSE, - bus) < 0) - return -1; + return; =20 - if (virDomainDefMaybeAddInput(def, - VIR_DOMAIN_INPUT_TYPE_KBD, - bus) < 0) - return -1; + virDomainDefMaybeAddInput(def, + VIR_DOMAIN_INPUT_TYPE_MOUSE, + bus); =20 - return 0; + virDomainDefMaybeAddInput(def, + VIR_DOMAIN_INPUT_TYPE_KBD, + bus); } =20 static int @@ -244,8 +240,7 @@ vzDomainDefPostParse(virDomainDef *def, def->virtType)) return -1; =20 - if (vzDomainDefAddDefaultInputDevices(def) < 0) - return -1; + vzDomainDefAddDefaultInputDevices(def); =20 return 0; } diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 6a15d60577..080beac351 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -1849,15 +1849,13 @@ prlsdkLoadDomain(struct _vzDriver *driver, int bus =3D IS_CT(def) ? VIR_DOMAIN_INPUT_BUS_PARALLELS : VIR_DOMAIN_INPUT_BUS_PS2; =20 - if (virDomainDefMaybeAddInput(def, - VIR_DOMAIN_INPUT_TYPE_MOUSE, - bus) < 0) - return NULL; + virDomainDefMaybeAddInput(def, + VIR_DOMAIN_INPUT_TYPE_MOUSE, + bus); =20 - if (virDomainDefMaybeAddInput(def, - VIR_DOMAIN_INPUT_TYPE_KBD, - bus) < 0) - return NULL; + virDomainDefMaybeAddInput(def, + VIR_DOMAIN_INPUT_TYPE_KBD, + bus); } =20 if (!dom) { --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org