From nobody Tue May 14 14:51:41 2024 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=quarantine dis=none) header.from=swemel.ru Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1704896860019161.71675107687622; Wed, 10 Jan 2024 06:27:40 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id DC6C91CAC; Wed, 10 Jan 2024 09:27:38 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 44ADA1C5F; Wed, 10 Jan 2024 09:22:45 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 08D2D1C2C; Wed, 10 Jan 2024 09:22:21 -0500 (EST) Received: from mx.swemel.ru (mx.swemel.ru [95.143.211.150]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 97EA51BEE for ; Wed, 10 Jan 2024 09:21:56 -0500 (EST) 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: Dmitry Frolov To: devel@lists.libvirt.org Subject: [PATCH v4 01/19] libxl: change type to void libxlPrepareChannel() Date: Wed, 10 Jan 2024 17:21:16 +0300 Message-Id: <20240110142134.915450-2-frolov@swemel.ru> In-Reply-To: <20240110142134.915450-1-frolov@swemel.ru> References: <47d3cbc0-003b-4829-8038-8e00bbdb5c85@redhat.com> <20240110142134.915450-1-frolov@swemel.ru> MIME-Version: 1.0 Message-ID-Hash: FFTCYEZDSVIULHOEPP2QNJETOTWCAAQP X-Message-ID-Hash: FFTCYEZDSVIULHOEPP2QNJETOTWCAAQP X-MailFrom: frolov@swemel.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: sdl.libvirt@linuxtesting.org, Dmitry Frolov 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: 1704896861136100001 libxlPrepareChannel() returns nothing except 0. Changing return type to void. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Dmitry Frolov --- src/libxl/libxl_conf.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 62e1be6672..712b1d627f 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1937,7 +1937,7 @@ libxlDriverGetDom0MaxmemConf(libxlDriverConfig *cfg, } =20 =20 -static int +static void libxlPrepareChannel(virDomainChrDef *channel, const char *channelDir, const char *domainName) @@ -1954,8 +1954,6 @@ libxlPrepareChannel(virDomainChrDef *channel, =20 channel->source->data.nix.listen =3D true; } - - return 0; } =20 static int @@ -2011,8 +2009,7 @@ libxlMakeChannelList(const char *channelDir, if (l_channels[i]->deviceType !=3D VIR_DOMAIN_CHR_DEVICE_TYPE_CHAN= NEL) continue; =20 - if (libxlPrepareChannel(l_channels[i], channelDir, def->name) < 0) - goto error; + libxlPrepareChannel(l_channels[i], channelDir, def->name); =20 if (libxlMakeChannel(l_channels[i], &x_channels[nvchannels]) < 0) goto error; --=20 2.34.1 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Tue May 14 14:51:41 2024 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=quarantine dis=none) header.from=swemel.ru Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1704897035938466.6918195328544; Wed, 10 Jan 2024 06:30:35 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id D33C91B5D; Wed, 10 Jan 2024 09:30:34 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 8EA9A1BE7; Wed, 10 Jan 2024 09:23:01 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 665B21C9D; Wed, 10 Jan 2024 09:22:27 -0500 (EST) Received: from mx.swemel.ru (mx.swemel.ru [95.143.211.150]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id EE8571BF9 for ; Wed, 10 Jan 2024 09:21:56 -0500 (EST) 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: Dmitry Frolov To: devel@lists.libvirt.org Subject: [PATCH v4 02/19] conf: change type to void virDomainDefMaybeAddInput() Date: Wed, 10 Jan 2024 17:21:17 +0300 Message-Id: <20240110142134.915450-3-frolov@swemel.ru> In-Reply-To: <20240110142134.915450-1-frolov@swemel.ru> References: <47d3cbc0-003b-4829-8038-8e00bbdb5c85@redhat.com> <20240110142134.915450-1-frolov@swemel.ru> MIME-Version: 1.0 Message-ID-Hash: GOIDRB5E34QIW53JQAZD4RBULANGT3ZS X-Message-ID-Hash: GOIDRB5E34QIW53JQAZD4RBULANGT3ZS X-MailFrom: frolov@swemel.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: sdl.libvirt@linuxtesting.org, Dmitry Frolov 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: 1704897038042100001 virDomainDefMaybeAddInput() returns nothing except 0. Changing return type to void. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Dmitry Frolov --- src/conf/domain_conf.c | 6 ++---- src/conf/domain_conf.h | 2 +- src/libxl/xen_common.c | 14 ++++++-------- src/vz/vz_driver.c | 15 ++++++--------- src/vz/vz_sdk.c | 14 ++++++-------- 5 files changed, 21 insertions(+), 30 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index be57a1981e..fc785b188b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -16227,7 +16227,7 @@ virDomainDefMaybeAddController(virDomainDef *def, } =20 =20 -int +void virDomainDefMaybeAddInput(virDomainDef *def, int type, int bus) @@ -16238,7 +16238,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); @@ -16247,8 +16247,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 d176bda5f8..6a6f88e5af 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -4275,7 +4275,7 @@ virDomainDefMaybeAddController(virDomainDef *def, virDomainControllerType type, int idx, int model); -int +void virDomainDefMaybeAddInput(virDomainDef *def, int type, int bus); diff --git a/src/libxl/xen_common.c b/src/libxl/xen_common.c index d5a0399613..edb20127ab 100644 --- a/src/libxl/xen_common.c +++ b/src/libxl/xen_common.c @@ -2393,15 +2393,13 @@ 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; + virDomainDefMaybeAddInput(def, + VIR_DOMAIN_INPUT_TYPE_KBD, + implicitInputBus); =20 return 0; } diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index c7ceec2339..56b630bac0 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -219,16 +219,13 @@ vzDomainDefAddDefaultInputDevices(virDomainDef *def) if (def->ngraphics =3D=3D 0) return 0; =20 - if (virDomainDefMaybeAddInput(def, - VIR_DOMAIN_INPUT_TYPE_MOUSE, - bus) < 0) - return -1; - - if (virDomainDefMaybeAddInput(def, - VIR_DOMAIN_INPUT_TYPE_KBD, - bus) < 0) - return -1; + virDomainDefMaybeAddInput(def, + VIR_DOMAIN_INPUT_TYPE_MOUSE, + bus); =20 + virDomainDefMaybeAddInput(def, + VIR_DOMAIN_INPUT_TYPE_KBD, + bus); return 0; } =20 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.34.1 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Tue May 14 14:51:41 2024 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=quarantine dis=quarantine) header.from=swemel.ru Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1704896782058940.3969007426781; Wed, 10 Jan 2024 06:26:22 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id E6B821CF4; Wed, 10 Jan 2024 09:26:20 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 6B5F51C56; Wed, 10 Jan 2024 09:22:31 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 7F4C11124; Wed, 10 Jan 2024 09:22:18 -0500 (EST) Received: from mx.swemel.ru (mx.swemel.ru [95.143.211.150]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 5E1711BE6 for ; Wed, 10 Jan 2024 09:21:56 -0500 (EST) 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: Dmitry Frolov To: devel@lists.libvirt.org Subject: [PATCH v4 03/19] libxl: change type to void xenDomainDefAddImplicitInputDevice() Date: Wed, 10 Jan 2024 17:21:18 +0300 Message-Id: <20240110142134.915450-4-frolov@swemel.ru> In-Reply-To: <20240110142134.915450-1-frolov@swemel.ru> References: <47d3cbc0-003b-4829-8038-8e00bbdb5c85@redhat.com> <20240110142134.915450-1-frolov@swemel.ru> MIME-Version: 1.0 Message-ID-Hash: GFYK2PI7OOO6UJX4ITSXB3NJ6H2KNOFX X-Message-ID-Hash: GFYK2PI7OOO6UJX4ITSXB3NJ6H2KNOFX X-MailFrom: frolov@swemel.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: sdl.libvirt@linuxtesting.org, Dmitry Frolov 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: 1704896782861100001 xenDomainDefAddImplicitInputDevice() returns nothing except 0. Changing ret= urn type to void. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Dmitry Frolov --- 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 670fd2881e..cd24eb58d6 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -266,8 +266,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 edb20127ab..ba2a322016 100644 --- a/src/libxl/xen_common.c +++ b/src/libxl/xen_common.c @@ -2385,7 +2385,7 @@ xenFormatConfigCommon(virConf *conf, } =20 =20 -int +void xenDomainDefAddImplicitInputDevice(virDomainDef *def) { virDomainInputBus implicitInputBus =3D VIR_DOMAIN_INPUT_BUS_XEN; @@ -2400,6 +2400,4 @@ xenDomainDefAddImplicitInputDevice(virDomainDef *def) 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 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); --=20 2.34.1 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Tue May 14 14:51:41 2024 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=quarantine dis=none) header.from=swemel.ru Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1704896941462451.2866744861975; Wed, 10 Jan 2024 06:29:01 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 668101C5F; Wed, 10 Jan 2024 09:29:00 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 680D61CC5; Wed, 10 Jan 2024 09:22:53 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 8E34017C1; Wed, 10 Jan 2024 09:22:23 -0500 (EST) Received: from mx.swemel.ru (mx.swemel.ru [95.143.211.150]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id C69661BF6 for ; Wed, 10 Jan 2024 09:21:56 -0500 (EST) 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: Dmitry Frolov To: devel@lists.libvirt.org Subject: [PATCH v4 04/19] qemu: change type to void qemuDomainDefAddImplicitInputDevice() Date: Wed, 10 Jan 2024 17:21:19 +0300 Message-Id: <20240110142134.915450-5-frolov@swemel.ru> In-Reply-To: <20240110142134.915450-1-frolov@swemel.ru> References: <47d3cbc0-003b-4829-8038-8e00bbdb5c85@redhat.com> <20240110142134.915450-1-frolov@swemel.ru> MIME-Version: 1.0 Message-ID-Hash: DNGYLCZNIAHSWRR7VI3LNRUZBEAKSG3Y X-Message-ID-Hash: DNGYLCZNIAHSWRR7VI3LNRUZBEAKSG3Y X-MailFrom: frolov@swemel.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: sdl.libvirt@linuxtesting.org, Dmitry Frolov 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: 1704896943502100001 qemuDomainDefAddImplicitInputDevice() returns nothing except 0. Changing re= turn type to void. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Dmitry Frolov --- src/qemu/qemu_domain.c | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 003fe7c71b..0a15f77517 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) { @@ -4321,18 +4316,16 @@ qemuDomainDefAddDefaultDevices(virQEMUDriver *drive= r, } =20 if (addDefaultUSBKBD && - def->ngraphics > 0 && + 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 && + 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; --=20 2.34.1 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Tue May 14 14:51:41 2024 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=quarantine dis=quarantine) header.from=swemel.ru Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 170489711363162.51382107200675; Wed, 10 Jan 2024 06:31:53 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 3E0741C99; Wed, 10 Jan 2024 09:31:52 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 935BD1B30; Wed, 10 Jan 2024 09:23:11 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id DE4D41716; Wed, 10 Jan 2024 09:22:29 -0500 (EST) Received: from mx.swemel.ru (mx.swemel.ru [95.143.211.150]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 49F6616F7 for ; Wed, 10 Jan 2024 09:21:57 -0500 (EST) 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: Dmitry Frolov To: devel@lists.libvirt.org Subject: [PATCH v4 05/19] vz: change type to void vzDomainDefAddDefaultInputDevices() Date: Wed, 10 Jan 2024 17:21:20 +0300 Message-Id: <20240110142134.915450-6-frolov@swemel.ru> In-Reply-To: <20240110142134.915450-1-frolov@swemel.ru> References: <47d3cbc0-003b-4829-8038-8e00bbdb5c85@redhat.com> <20240110142134.915450-1-frolov@swemel.ru> MIME-Version: 1.0 Message-ID-Hash: AOGYKLWKLHWGG2FKQVO4AXD6NK5GTKBG X-Message-ID-Hash: AOGYKLWKLHWGG2FKQVO4AXD6NK5GTKBG X-MailFrom: frolov@swemel.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: sdl.libvirt@linuxtesting.org, Dmitry Frolov 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: 1704897114625100001 vzDomainDefAddDefaultInputDevices() returns nothing except 0. Changing retu= rn type to void. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Dmitry Frolov --- src/vz/vz_driver.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 56b630bac0..1b31f7a7c3 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -210,14 +210,14 @@ 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; + return; =20 virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_MOUSE, @@ -226,7 +226,6 @@ vzDomainDefAddDefaultInputDevices(virDomainDef *def) virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_KBD, bus); - return 0; } =20 static int @@ -241,8 +240,7 @@ vzDomainDefPostParse(virDomainDef *def, def->virtType)) return -1; =20 - if (vzDomainDefAddDefaultInputDevices(def) < 0) - return -1; + vzDomainDefAddDefaultInputDevices(def); =20 return 0; } --=20 2.34.1 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Tue May 14 14:51:41 2024 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=quarantine dis=none) header.from=swemel.ru Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1704897680269193.2141524407873; Wed, 10 Jan 2024 06:41:20 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 3D0641D34; Wed, 10 Jan 2024 09:41:17 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 000861CE5; Wed, 10 Jan 2024 09:24:05 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id EC2AF1BB2; Wed, 10 Jan 2024 09:23:12 -0500 (EST) Received: from mx.swemel.ru (mx.swemel.ru [95.143.211.150]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 7409C1C02 for ; Wed, 10 Jan 2024 09:21:58 -0500 (EST) 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: Dmitry Frolov To: devel@lists.libvirt.org Subject: [PATCH v4 06/19] conf: change type to void virDomainHostdevInsert() Date: Wed, 10 Jan 2024 17:21:21 +0300 Message-Id: <20240110142134.915450-7-frolov@swemel.ru> In-Reply-To: <20240110142134.915450-1-frolov@swemel.ru> References: <47d3cbc0-003b-4829-8038-8e00bbdb5c85@redhat.com> <20240110142134.915450-1-frolov@swemel.ru> MIME-Version: 1.0 Message-ID-Hash: 57PWQFAV3O2EGCPPJRAGZROWTM3KBLZV X-Message-ID-Hash: 57PWQFAV3O2EGCPPJRAGZROWTM3KBLZV X-MailFrom: frolov@swemel.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: sdl.libvirt@linuxtesting.org, Dmitry Frolov 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: 1704897681534100001 virDomainHostdevInsert() returns nothing except 0. Changing return type to void. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Dmitry Frolov --- src/conf/domain_conf.c | 15 +++++---------- src/conf/domain_conf.h | 2 +- src/libxl/libxl_domain.c | 3 +-- src/libxl/libxl_driver.c | 3 +-- src/lxc/lxc_driver.c | 3 +-- src/qemu/qemu_driver.c | 3 +-- src/qemu/qemu_process.c | 3 +-- 7 files changed, 11 insertions(+), 21 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index fc785b188b..9116b28360 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14142,12 +14142,10 @@ virDomainChrTargetTypeToString(int deviceType, return type; } =20 -int +void virDomainHostdevInsert(virDomainDef *def, virDomainHostdevDef *hostdev) { VIR_APPEND_ELEMENT(def->hostdevs, def->nhostdevs, hostdev); - - return 0; } =20 virDomainHostdevDef * @@ -14563,9 +14561,8 @@ virDomainDiskRemoveByName(virDomainDef *def, const = char *name) int virDomainNetInsert(virDomainDef *def, virDomainNetDef *net) { /* hostdev net devices must also exist in the hostdevs array */ - if (net->type =3D=3D VIR_DOMAIN_NET_TYPE_HOSTDEV && - virDomainHostdevInsert(def, &net->data.hostdev.def) < 0) - return -1; + if (net->type =3D=3D VIR_DOMAIN_NET_TYPE_HOSTDEV) + virDomainHostdevInsert(def, &net->data.hostdev.def); =20 VIR_APPEND_ELEMENT(def->nets, def->nnets, net); return 0; @@ -18931,10 +18928,8 @@ virDomainDefParseXML(xmlXPathContextPtr ctxt, * where the actual network type is already known to be * hostdev) must also be in the hostdevs array. */ - if (virDomainNetGetActualType(net) =3D=3D VIR_DOMAIN_NET_TYPE_HOST= DEV && - virDomainHostdevInsert(def, virDomainNetGetActualHostdev(net))= < 0) { - return NULL; - } + if (virDomainNetGetActualType(net) =3D=3D VIR_DOMAIN_NET_TYPE_HOST= DEV) + virDomainHostdevInsert(def, virDomainNetGetActualHostdev(net)); } VIR_FREE(nodes); =20 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 6a6f88e5af..f3d32fe40c 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3902,7 +3902,7 @@ virDomainNetDef *virDomainNetRemove(virDomainDef *def= , size_t i); virDomainNetDef *virDomainNetRemoveByObj(virDomainDef *def, virDomainNetDe= f *net); void virDomainNetRemoveHostdev(virDomainDef *def, virDomainNetDef *net); =20 -int virDomainHostdevInsert(virDomainDef *def, virDomainHostdevDef *hostdev= ); +void virDomainHostdevInsert(virDomainDef *def, virDomainHostdevDef *hostde= v); virDomainHostdevDef * virDomainHostdevRemove(virDomainDef *def, size_t i); int virDomainHostdevFind(virDomainDef *def, virDomainHostdevDef *match, diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index cd24eb58d6..6a14d48d3d 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -996,8 +996,7 @@ libxlNetworkPrepareDevices(virDomainDef *def) */ virDomainHostdevDef *hostdev =3D virDomainNetGetActualHostdev(= net); =20 - if (virDomainHostdevInsert(def, hostdev) < 0) - return -1; + virDomainHostdevInsert(def, hostdev); } } =20 diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 6c843b9054..f8ef3f2688 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -3584,8 +3584,7 @@ libxlDomainAttachDeviceConfig(virDomainDef *vmdef, vi= rDomainDeviceDef *dev) return -1; } =20 - if (virDomainHostdevInsert(vmdef, hostdev) < 0) - return -1; + virDomainHostdevInsert(vmdef, hostdev); dev->data.hostdev =3D NULL; break; =20 diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index c281998652..b2e04dc532 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -3023,8 +3023,7 @@ lxcDomainAttachDeviceConfig(virDomainDef *vmdef, _("device is already in the domain configuratio= n")); return -1; } - if (virDomainHostdevInsert(vmdef, hostdev) < 0) - return -1; + virDomainHostdevInsert(vmdef, hostdev); dev->data.hostdev =3D NULL; ret =3D 0; break; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 448e6b1591..90b965b5fa 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6722,8 +6722,7 @@ qemuDomainAttachDeviceConfig(virDomainDef *vmdef, _("device is already in the domain configuratio= n")); return -1; } - if (virDomainHostdevInsert(vmdef, hostdev)) - return -1; + virDomainHostdevInsert(vmdef, hostdev); dev->data.hostdev =3D NULL; break; =20 diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 3563ad215c..5e20b4a747 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5755,8 +5755,7 @@ qemuProcessPrepareDomainNetwork(virDomainObj *vm) if (qemuDomainPrepareHostdev(hostdev, priv) < 0) return -1; =20 - if (virDomainHostdevInsert(def, hostdev) < 0) - return -1; + virDomainHostdevInsert(def, hostdev); } } return 0; --=20 2.34.1 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Tue May 14 14:51:41 2024 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=quarantine dis=none) header.from=swemel.ru Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 170489720515649.79739896714864; Wed, 10 Jan 2024 06:33:25 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 23F441CC1; Wed, 10 Jan 2024 09:33:24 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 972111C0D; Wed, 10 Jan 2024 09:23:21 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 5C6761C64; Wed, 10 Jan 2024 09:23:07 -0500 (EST) Received: from mx.swemel.ru (mx.swemel.ru [95.143.211.150]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 0DAB7191A for ; Wed, 10 Jan 2024 09:21:58 -0500 (EST) 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: Dmitry Frolov To: devel@lists.libvirt.org Subject: [PATCH v4 07/19] conf: change type to void virDomainNetInsert() Date: Wed, 10 Jan 2024 17:21:22 +0300 Message-Id: <20240110142134.915450-8-frolov@swemel.ru> In-Reply-To: <20240110142134.915450-1-frolov@swemel.ru> References: <47d3cbc0-003b-4829-8038-8e00bbdb5c85@redhat.com> <20240110142134.915450-1-frolov@swemel.ru> MIME-Version: 1.0 Message-ID-Hash: S665GGUDV6ZC6SWARG2O7HXQ7MSAGSQM X-Message-ID-Hash: S665GGUDV6ZC6SWARG2O7HXQ7MSAGSQM X-MailFrom: frolov@swemel.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: sdl.libvirt@linuxtesting.org, Dmitry Frolov 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: 1704897206903100001 virDomainNetInsert() returns nothing except 0. Changing return type to void. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Dmitry Frolov --- src/conf/domain_conf.c | 3 +-- src/conf/domain_conf.h | 2 +- src/libxl/libxl_driver.c | 3 +-- src/lxc/lxc_driver.c | 3 +-- src/qemu/qemu_driver.c | 3 +-- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9116b28360..e232d635bb 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14558,14 +14558,13 @@ virDomainDiskRemoveByName(virDomainDef *def, cons= t char *name) return virDomainDiskRemove(def, idx); } =20 -int virDomainNetInsert(virDomainDef *def, virDomainNetDef *net) +void virDomainNetInsert(virDomainDef *def, virDomainNetDef *net) { /* hostdev net devices must also exist in the hostdevs array */ if (net->type =3D=3D VIR_DOMAIN_NET_TYPE_HOSTDEV) virDomainHostdevInsert(def, &net->data.hostdev.def); =20 VIR_APPEND_ELEMENT(def->nets, def->nnets, net); - return 0; } =20 /** diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index f3d32fe40c..89257d33fc 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3892,7 +3892,7 @@ int virDomainNetFindIdx(virDomainDef *def, virDomainN= etDef *net); virDomainNetDef *virDomainNetFind(virDomainDef *def, const char *device); virDomainNetDef *virDomainNetFindByName(virDomainDef *def, const char *ifn= ame); bool virDomainHasNet(virDomainDef *def, virDomainNetDef *net); -int virDomainNetInsert(virDomainDef *def, virDomainNetDef *net); +void virDomainNetInsert(virDomainDef *def, virDomainNetDef *net); void virDomainNetUpdate(virDomainDef *def, size_t netidx, virDomainNetDef = *newnet); bool virDomainNetBackendIsEqual(virDomainNetBackend *src, virDomainNetBackend *dst); diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index f8ef3f2688..68aecaef8c 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -3559,8 +3559,7 @@ libxlDomainAttachDeviceConfig(virDomainDef *vmdef, vi= rDomainDeviceDef *dev) virMacAddrFormat(&net->mac, mac)); return -1; } - if (virDomainNetInsert(vmdef, net)) - return -1; + virDomainNetInsert(vmdef, net); dev->data.net =3D NULL; break; =20 diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index b2e04dc532..017b166341 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -3010,8 +3010,7 @@ lxcDomainAttachDeviceConfig(virDomainDef *vmdef, =20 case VIR_DOMAIN_DEVICE_NET: net =3D dev->data.net; - if (virDomainNetInsert(vmdef, net) < 0) - return -1; + virDomainNetInsert(vmdef, net); dev->data.net =3D NULL; ret =3D 0; break; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 90b965b5fa..830843e96e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6704,8 +6704,7 @@ qemuDomainAttachDeviceConfig(virDomainDef *vmdef, =20 case VIR_DOMAIN_DEVICE_NET: net =3D dev->data.net; - if (virDomainNetInsert(vmdef, net)) - return -1; + virDomainNetInsert(vmdef, net); dev->data.net =3D NULL; break; =20 --=20 2.34.1 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Tue May 14 14:51:41 2024 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=quarantine dis=none) header.from=swemel.ru Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1704897298819387.84695382166774; Wed, 10 Jan 2024 06:34:58 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 872F91D72; Wed, 10 Jan 2024 09:34:57 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id C9E141CAA; Wed, 10 Jan 2024 09:23:32 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 90FB41C13; Wed, 10 Jan 2024 09:23:07 -0500 (EST) Received: from mx.swemel.ru (mx.swemel.ru [95.143.211.150]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 37941187B for ; Wed, 10 Jan 2024 09:21:58 -0500 (EST) 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: Dmitry Frolov To: devel@lists.libvirt.org Subject: [PATCH v4 08/19] conf: change type to void virCapabilitiesAddHostFeature() Date: Wed, 10 Jan 2024 17:21:23 +0300 Message-Id: <20240110142134.915450-9-frolov@swemel.ru> In-Reply-To: <20240110142134.915450-1-frolov@swemel.ru> References: <47d3cbc0-003b-4829-8038-8e00bbdb5c85@redhat.com> <20240110142134.915450-1-frolov@swemel.ru> MIME-Version: 1.0 Message-ID-Hash: S5XLG5CUBZBZ35ORLU4UYG7RVUDVW6YC X-Message-ID-Hash: S5XLG5CUBZBZ35ORLU4UYG7RVUDVW6YC X-MailFrom: frolov@swemel.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: sdl.libvirt@linuxtesting.org, Dmitry Frolov 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: 1704897299397100001 virCapabilitiesAddHostFeature() returns nothing except 0. Changing return type to void. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Dmitry Frolov --- src/conf/capabilities.c | 4 +--- src/conf/capabilities.h | 2 +- src/libxl/libxl_capabilities.c | 5 ++--- src/test/test_driver.c | 6 ++---- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 32badee7b3..096ccc18e7 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -276,7 +276,7 @@ virCapsDispose(void *object) * * Registers a new host CPU feature, eg 'pae', or 'vmx' */ -int +void virCapabilitiesAddHostFeature(virCaps *caps, const char *name) { @@ -284,8 +284,6 @@ virCapabilitiesAddHostFeature(virCaps *caps, caps->host.nfeatures, 1); caps->host.features[caps->host.nfeatures] =3D g_strdup(name); caps->host.nfeatures++; - - return 0; } =20 /** diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h index 9eaf6e2807..085c0af868 100644 --- a/src/conf/capabilities.h +++ b/src/conf/capabilities.h @@ -236,7 +236,7 @@ virCapabilitiesHostNUMARef(virCapsHostNUMA *caps); =20 G_DEFINE_AUTOPTR_CLEANUP_FUNC(virCapsHostNUMA, virCapabilitiesHostNUMAUnre= f); =20 -int +void virCapabilitiesAddHostFeature(virCaps *caps, const char *name); =20 diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index dfb602ca2f..977418d472 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -138,9 +138,8 @@ libxlCapsInitCPU(virCaps *caps, libxl_physinfo *phy_inf= o) cpu =3D virCPUDefNew(); =20 host_pae =3D phy_info->hw_cap[0] & LIBXL_X86_FEATURE_PAE_MASK; - if (host_pae && - virCapabilitiesAddHostFeature(caps, "pae") < 0) - return -1; + if (host_pae) + virCapabilitiesAddHostFeature(caps, "pae"); =20 host_lm =3D (phy_info->hw_cap[2] & LIBXL_X86_FEATURE_LM_MASK); if (host_lm) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index ed545848af..053f1b55e1 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -299,10 +299,8 @@ testBuildCapabilities(virConnectPtr conn) if ((caps =3D virCapabilitiesNew(VIR_ARCH_I686, false, false)) =3D=3D = NULL) return NULL; =20 - if (virCapabilitiesAddHostFeature(caps, "pae") < 0) - return NULL; - if (virCapabilitiesAddHostFeature(caps, "nonpae") < 0) - return NULL; + virCapabilitiesAddHostFeature(caps, "pae"); + virCapabilitiesAddHostFeature(caps, "nonpae"); =20 virCapabilitiesHostInitIOMMU(caps); =20 --=20 2.34.1 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Tue May 14 14:51:41 2024 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=quarantine dis=quarantine) header.from=swemel.ru Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1704897378635214.6963431268731; Wed, 10 Jan 2024 06:36:18 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 81D111C70; Wed, 10 Jan 2024 09:36:17 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 0A7EF1CD1; Wed, 10 Jan 2024 09:23:41 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 84EDD187B; Wed, 10 Jan 2024 09:23:10 -0500 (EST) Received: from mx.swemel.ru (mx.swemel.ru [95.143.211.150]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 4523A1B11 for ; Wed, 10 Jan 2024 09:21:58 -0500 (EST) 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: Dmitry Frolov To: devel@lists.libvirt.org Subject: [PATCH v4 09/19] conf: change type to void virCapabilitiesSetNetPrefix() Date: Wed, 10 Jan 2024 17:21:24 +0300 Message-Id: <20240110142134.915450-10-frolov@swemel.ru> In-Reply-To: <20240110142134.915450-1-frolov@swemel.ru> References: <47d3cbc0-003b-4829-8038-8e00bbdb5c85@redhat.com> <20240110142134.915450-1-frolov@swemel.ru> MIME-Version: 1.0 Message-ID-Hash: JWSJM32V4CZH3FOQFOVKSYBNZDFWKBU4 X-Message-ID-Hash: JWSJM32V4CZH3FOQFOVKSYBNZDFWKBU4 X-MailFrom: frolov@swemel.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: sdl.libvirt@linuxtesting.org, Dmitry Frolov 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: 1704897379685100001 virCapabilitiesSetNetPrefix() returns nothing except 0. Changing return type to void. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Dmitry Frolov --- src/conf/capabilities.c | 4 +--- src/conf/capabilities.h | 2 +- src/libxl/libxl_capabilities.c | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 096ccc18e7..f7e7610ce6 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -312,13 +312,11 @@ virCapabilitiesAddHostMigrateTransport(virCaps *caps, * * Registers the prefix that is used for generated network interfaces */ -int +void virCapabilitiesSetNetPrefix(virCaps *caps, const char *prefix) { caps->host.netprefix =3D g_strdup(prefix); - - return 0; } =20 =20 diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h index 085c0af868..d770cddd6b 100644 --- a/src/conf/capabilities.h +++ b/src/conf/capabilities.h @@ -244,7 +244,7 @@ int virCapabilitiesAddHostMigrateTransport(virCaps *caps, const char *name); =20 -int +void virCapabilitiesSetNetPrefix(virCaps *caps, const char *prefix); =20 diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index 977418d472..f2ab338e74 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -180,8 +180,7 @@ libxlCapsInitHost(libxl_ctx *ctx, virCaps *caps) if (libxlCapsInitCPU(caps, &phy_info) < 0) goto cleanup; =20 - if (virCapabilitiesSetNetPrefix(caps, LIBXL_GENERATED_PREFIX_XEN) < 0) - goto cleanup; + virCapabilitiesSetNetPrefix(caps, LIBXL_GENERATED_PREFIX_XEN); =20 ret =3D 0; =20 --=20 2.34.1 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Tue May 14 14:51:41 2024 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=quarantine dis=quarantine) header.from=swemel.ru Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1704897579275102.23888146381296; Wed, 10 Jan 2024 06:39:39 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 24ED71CBC; Wed, 10 Jan 2024 09:39:38 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id CDD611CE0; Wed, 10 Jan 2024 09:23:57 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 5C98E1B11; Wed, 10 Jan 2024 09:23:11 -0500 (EST) Received: from mx.swemel.ru (mx.swemel.ru [95.143.211.150]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 9D40B1B30 for ; Wed, 10 Jan 2024 09:21:58 -0500 (EST) 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: Dmitry Frolov To: devel@lists.libvirt.org Subject: [PATCH v4 10/19] libxl: change type to void libxlMakeDomainOSCaps() Date: Wed, 10 Jan 2024 17:21:25 +0300 Message-Id: <20240110142134.915450-11-frolov@swemel.ru> In-Reply-To: <20240110142134.915450-1-frolov@swemel.ru> References: <47d3cbc0-003b-4829-8038-8e00bbdb5c85@redhat.com> <20240110142134.915450-1-frolov@swemel.ru> MIME-Version: 1.0 Message-ID-Hash: 5XYSJJ24GGOJDI5RHZQDY7TLXK7CIVGB X-Message-ID-Hash: 5XYSJJ24GGOJDI5RHZQDY7TLXK7CIVGB X-MailFrom: frolov@swemel.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: sdl.libvirt@linuxtesting.org, Dmitry Frolov 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: 1704897580909100001 libxlMakeDomainOSCaps() returns nothing except 0. Changing return type to void. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Dmitry Frolov --- src/libxl/libxl_capabilities.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index f2ab338e74..9a5ace845d 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -509,7 +509,7 @@ libxlCapsInitGuests(libxl_ctx *ctx, virCaps *caps) return 0; } =20 -static int +static void libxlMakeDomainOSCaps(const char *machine, virDomainCapsOS *os, virFirmware **firmwares, @@ -524,7 +524,7 @@ libxlMakeDomainOSCaps(const char *machine, capsLoader->readonly.report =3D true; =20 if (STREQ(machine, "xenpv") || STREQ(machine, "xenpvh")) - return 0; + return; =20 capsLoader->supported =3D VIR_TRISTATE_BOOL_YES; capsLoader->values.values =3D g_new0(char *, nfirmwares); @@ -539,8 +539,6 @@ libxlMakeDomainOSCaps(const char *machine, VIR_DOMAIN_LOADER_TYPE_PFLASH); VIR_DOMAIN_CAPS_ENUM_SET(capsLoader->readonly, VIR_TRISTATE_BOOL_YES); - - return 0; } =20 static int @@ -675,8 +673,8 @@ libxlMakeDomainCapabilities(virDomainCaps *domCaps, else domCaps->maxvcpus =3D PV_MAX_VCPUS; =20 - if (libxlMakeDomainOSCaps(domCaps->machine, os, firmwares, nfirmwares)= < 0 || - libxlMakeDomainDeviceDiskCaps(disk) < 0 || + libxlMakeDomainOSCaps(domCaps->machine, os, firmwares, nfirmwares); + if (libxlMakeDomainDeviceDiskCaps(disk) < 0 || libxlMakeDomainDeviceGraphicsCaps(graphics) < 0 || libxlMakeDomainDeviceVideoCaps(video) < 0) return -1; --=20 2.34.1 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Tue May 14 14:51:41 2024 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=quarantine dis=none) header.from=swemel.ru Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 170489745734421.75875050956654; Wed, 10 Jan 2024 06:37:37 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 485A41C9E; Wed, 10 Jan 2024 09:37:36 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 487111CBC; Wed, 10 Jan 2024 09:23:51 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id E855F187B; Wed, 10 Jan 2024 09:23:10 -0500 (EST) Received: from mx.swemel.ru (mx.swemel.ru [95.143.211.150]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 845EC1BFF for ; Wed, 10 Jan 2024 09:21:58 -0500 (EST) 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: Dmitry Frolov To: devel@lists.libvirt.org Subject: [PATCH v4 11/19] libxl: change type to void libxlMakeDomainDeviceDiskCaps() Date: Wed, 10 Jan 2024 17:21:26 +0300 Message-Id: <20240110142134.915450-12-frolov@swemel.ru> In-Reply-To: <20240110142134.915450-1-frolov@swemel.ru> References: <47d3cbc0-003b-4829-8038-8e00bbdb5c85@redhat.com> <20240110142134.915450-1-frolov@swemel.ru> MIME-Version: 1.0 Message-ID-Hash: THXOBARRNQD5SQWFTPOXFX54SYIHSZ6T X-Message-ID-Hash: THXOBARRNQD5SQWFTPOXFX54SYIHSZ6T X-MailFrom: frolov@swemel.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: sdl.libvirt@linuxtesting.org, Dmitry Frolov 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: 1704897458023100001 libxlMakeDomainDeviceDiskCaps() returns nothing except 0. Changing return type to void. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Dmitry Frolov --- src/libxl/libxl_capabilities.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index 9a5ace845d..bb37e5cae2 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -541,7 +541,7 @@ libxlMakeDomainOSCaps(const char *machine, VIR_TRISTATE_BOOL_YES); } =20 -static int +static void libxlMakeDomainDeviceDiskCaps(virDomainCapsDeviceDisk *dev) { dev->supported =3D VIR_TRISTATE_BOOL_YES; @@ -557,8 +557,6 @@ libxlMakeDomainDeviceDiskCaps(virDomainCapsDeviceDisk *= dev) VIR_DOMAIN_DISK_BUS_IDE, VIR_DOMAIN_DISK_BUS_SCSI, VIR_DOMAIN_DISK_BUS_XEN); - - return 0; } =20 static int @@ -674,8 +672,8 @@ libxlMakeDomainCapabilities(virDomainCaps *domCaps, domCaps->maxvcpus =3D PV_MAX_VCPUS; =20 libxlMakeDomainOSCaps(domCaps->machine, os, firmwares, nfirmwares); - if (libxlMakeDomainDeviceDiskCaps(disk) < 0 || - libxlMakeDomainDeviceGraphicsCaps(graphics) < 0 || + libxlMakeDomainDeviceDiskCaps(disk); + if (libxlMakeDomainDeviceGraphicsCaps(graphics) < 0 || libxlMakeDomainDeviceVideoCaps(video) < 0) return -1; if (STRNEQ(domCaps->machine, "xenpvh") && --=20 2.34.1 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Tue May 14 14:51:41 2024 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=quarantine dis=none) header.from=swemel.ru Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1704897836008442.0581929148898; Wed, 10 Jan 2024 06:43:56 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id C8A421C30; Wed, 10 Jan 2024 09:43:54 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 135891CC8; Wed, 10 Jan 2024 09:24:23 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 9E0641C0D; Wed, 10 Jan 2024 09:23:20 -0500 (EST) Received: from mx.swemel.ru (mx.swemel.ru [95.143.211.150]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 3C8EF1C25 for ; Wed, 10 Jan 2024 09:21:59 -0500 (EST) 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: Dmitry Frolov To: devel@lists.libvirt.org Subject: [PATCH v4 12/19] libxl: change type to void libxlMakeDomainDeviceGraphicsCaps() Date: Wed, 10 Jan 2024 17:21:27 +0300 Message-Id: <20240110142134.915450-13-frolov@swemel.ru> In-Reply-To: <20240110142134.915450-1-frolov@swemel.ru> References: <47d3cbc0-003b-4829-8038-8e00bbdb5c85@redhat.com> <20240110142134.915450-1-frolov@swemel.ru> MIME-Version: 1.0 Message-ID-Hash: 7NCT4T4ISSCCHHHZSEHBUYCLZAUPVUX2 X-Message-ID-Hash: 7NCT4T4ISSCCHHHZSEHBUYCLZAUPVUX2 X-MailFrom: frolov@swemel.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: sdl.libvirt@linuxtesting.org, Dmitry Frolov 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: 1704897836493100001 libxlMakeDomainDeviceGraphicsCaps() returns nothing except 0. Changing return type to void. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Dmitry Frolov --- src/libxl/libxl_capabilities.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index bb37e5cae2..bef219a62d 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -559,7 +559,7 @@ libxlMakeDomainDeviceDiskCaps(virDomainCapsDeviceDisk *= dev) VIR_DOMAIN_DISK_BUS_XEN); } =20 -static int +static void libxlMakeDomainDeviceGraphicsCaps(virDomainCapsDeviceGraphics *dev) { dev->supported =3D VIR_TRISTATE_BOOL_YES; @@ -569,8 +569,6 @@ libxlMakeDomainDeviceGraphicsCaps(virDomainCapsDeviceGr= aphics *dev) VIR_DOMAIN_GRAPHICS_TYPE_SDL, VIR_DOMAIN_GRAPHICS_TYPE_VNC, VIR_DOMAIN_GRAPHICS_TYPE_SPICE); - - return 0; } =20 static int @@ -673,8 +671,8 @@ libxlMakeDomainCapabilities(virDomainCaps *domCaps, =20 libxlMakeDomainOSCaps(domCaps->machine, os, firmwares, nfirmwares); libxlMakeDomainDeviceDiskCaps(disk); - if (libxlMakeDomainDeviceGraphicsCaps(graphics) < 0 || - libxlMakeDomainDeviceVideoCaps(video) < 0) + libxlMakeDomainDeviceGraphicsCaps(graphics); + if (libxlMakeDomainDeviceVideoCaps(video) < 0) return -1; if (STRNEQ(domCaps->machine, "xenpvh") && libxlMakeDomainDeviceHostdevCaps(hostdev) < 0) --=20 2.34.1 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Tue May 14 14:51:41 2024 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=quarantine dis=none) header.from=swemel.ru Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 17048977644381001.4817212534629; Wed, 10 Jan 2024 06:42:44 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 497E21B70; Wed, 10 Jan 2024 09:42:43 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 19F741CED; Wed, 10 Jan 2024 09:24:15 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id E16AD1B2D; Wed, 10 Jan 2024 09:23:17 -0500 (EST) Received: from mx.swemel.ru (mx.swemel.ru [95.143.211.150]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id C7D0E1C0D for ; Wed, 10 Jan 2024 09:21:58 -0500 (EST) 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: Dmitry Frolov To: devel@lists.libvirt.org Subject: [PATCH v4 13/19] libxl: change type to void libxlMakeDomainDeviceVideoCaps() Date: Wed, 10 Jan 2024 17:21:28 +0300 Message-Id: <20240110142134.915450-14-frolov@swemel.ru> In-Reply-To: <20240110142134.915450-1-frolov@swemel.ru> References: <47d3cbc0-003b-4829-8038-8e00bbdb5c85@redhat.com> <20240110142134.915450-1-frolov@swemel.ru> MIME-Version: 1.0 Message-ID-Hash: 2YPNDEDQSN3QQVA37VBSQRXLHEDMICHD X-Message-ID-Hash: 2YPNDEDQSN3QQVA37VBSQRXLHEDMICHD X-MailFrom: frolov@swemel.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: sdl.libvirt@linuxtesting.org, Dmitry Frolov 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: 1704897765979100001 libxlMakeDomainDeviceVideoCaps() returns nothing except 0. Changing return type to void. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Dmitry Frolov --- src/libxl/libxl_capabilities.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index bef219a62d..2b0652b483 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -672,8 +672,8 @@ libxlMakeDomainCapabilities(virDomainCaps *domCaps, libxlMakeDomainOSCaps(domCaps->machine, os, firmwares, nfirmwares); libxlMakeDomainDeviceDiskCaps(disk); libxlMakeDomainDeviceGraphicsCaps(graphics); - if (libxlMakeDomainDeviceVideoCaps(video) < 0) - return -1; + libxlMakeDomainDeviceVideoCaps(video); + if (STRNEQ(domCaps->machine, "xenpvh") && libxlMakeDomainDeviceHostdevCaps(hostdev) < 0) return -1; --=20 2.34.1 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Tue May 14 14:51:41 2024 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=quarantine dis=quarantine) header.from=swemel.ru Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1704898055972541.7128453779661; Wed, 10 Jan 2024 06:47:35 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id E64E81BCE; Wed, 10 Jan 2024 09:47:34 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id EC13A1CF3; Wed, 10 Jan 2024 09:24:40 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id DBF1C1C2F; Wed, 10 Jan 2024 09:23:22 -0500 (EST) Received: from mx.swemel.ru (mx.swemel.ru [95.143.211.150]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 692181C2A for ; Wed, 10 Jan 2024 09:21:59 -0500 (EST) 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: Dmitry Frolov To: devel@lists.libvirt.org Subject: [PATCH v4 14/19] libxl: change type to void virDomainGraphicsListenAppendAddress() Date: Wed, 10 Jan 2024 17:21:29 +0300 Message-Id: <20240110142134.915450-15-frolov@swemel.ru> In-Reply-To: <20240110142134.915450-1-frolov@swemel.ru> References: <47d3cbc0-003b-4829-8038-8e00bbdb5c85@redhat.com> <20240110142134.915450-1-frolov@swemel.ru> MIME-Version: 1.0 Message-ID-Hash: CFAM6MVDOKADQHGBAO2N6PEZDKO7QZS7 X-Message-ID-Hash: CFAM6MVDOKADQHGBAO2N6PEZDKO7QZS7 X-MailFrom: frolov@swemel.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: sdl.libvirt@linuxtesting.org, Dmitry Frolov 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: 1704898057546100001 virDomainGraphicsListenAppendAddress() returns nothing except 0. Changing return type to void. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Dmitry Frolov --- src/conf/domain_conf.c | 4 +--- src/conf/domain_conf.h | 2 +- src/libxl/xen_common.c | 8 +++----- src/libxl/xen_xl.c | 3 +-- src/vbox/vbox_common.c | 9 ++------- src/vmx/vmx.c | 3 +-- 6 files changed, 9 insertions(+), 20 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e232d635bb..bd8d941f34 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -29153,7 +29153,7 @@ virDomainGraphicsGetListen(virDomainGraphicsDef *de= f, size_t i) } =20 =20 -int +void virDomainGraphicsListenAppendAddress(virDomainGraphicsDef *def, const char *address) { @@ -29164,8 +29164,6 @@ virDomainGraphicsListenAppendAddress(virDomainGraph= icsDef *def, glisten.address =3D g_strdup(address); =20 VIR_APPEND_ELEMENT_COPY(def->listens, def->nListens, glisten); - - return 0; } =20 =20 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 89257d33fc..6b70a599f1 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3912,7 +3912,7 @@ int virDomainHostdevMatch(virDomainHostdevDef *a, =20 virDomainGraphicsListenDef * virDomainGraphicsGetListen(virDomainGraphicsDef *def, size_t i); -int virDomainGraphicsListenAppendAddress(virDomainGraphicsDef *def, +void virDomainGraphicsListenAppendAddress(virDomainGraphicsDef *def, const char *address) ATTRIBUTE_NONNULL(1); int virDomainGraphicsListenAppendSocket(virDomainGraphicsDef *def, diff --git a/src/libxl/xen_common.c b/src/libxl/xen_common.c index ba2a322016..8f4add7f30 100644 --- a/src/libxl/xen_common.c +++ b/src/libxl/xen_common.c @@ -673,8 +673,7 @@ xenParseVfb(virConf *conf, virDomainDef *def) =20 if (xenConfigCopyStringOpt(conf, "vnclisten", &listenAddr) < 0) goto cleanup; - if (virDomainGraphicsListenAppendAddress(graphics, listenAddr)= < 0) - goto cleanup; + virDomainGraphicsListenAppendAddress(graphics, listenAddr); VIR_FREE(listenAddr); =20 if (xenConfigCopyStringOpt(conf, "vncpasswd", &graphics->data.= vnc.auth.passwd) < 0) @@ -766,9 +765,8 @@ xenParseVfb(virConf *conf, virDomainDef *def) key =3D nextkey; } if (graphics->type =3D=3D VIR_DOMAIN_GRAPHICS_TYPE_VNC) { - if (virDomainGraphicsListenAppendAddress(graphics, - listenAddr) < 0) - goto cleanup; + virDomainGraphicsListenAppendAddress(graphics, + listenAddr); VIR_FREE(listenAddr); } def->graphics =3D g_new0(virDomainGraphicsDef *, 1); diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c index f175359307..553aa77896 100644 --- a/src/libxl/xen_xl.c +++ b/src/libxl/xen_xl.c @@ -341,8 +341,7 @@ xenParseXLSpice(virConf *conf, virDomainDef *def) graphics->type =3D VIR_DOMAIN_GRAPHICS_TYPE_SPICE; if (xenConfigCopyStringOpt(conf, "spicehost", &listenAddr) < 0) goto cleanup; - if (virDomainGraphicsListenAppendAddress(graphics, listenAddr)= < 0) - goto cleanup; + virDomainGraphicsListenAppendAddress(graphics, listenAddr); =20 if (xenConfigGetULong(conf, "spicetls_port", &port, 0) < 0) goto cleanup; diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index de3c9989a5..59e7a91081 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -3549,7 +3549,6 @@ vboxDumpDisplay(virDomainDef *def, struct _vboxDriver= *data, IMachine *machine) IVRDEServer *VRDEServer =3D NULL; PRBool VRDxEnabled =3D PR_FALSE; virDomainGraphicsDef *graphics =3D NULL; - int ret =3D -1; =20 def->ngraphics =3D 0; =20 @@ -3625,8 +3624,7 @@ vboxDumpDisplay(virDomainDef *def, struct _vboxDriver= *data, IMachine *machine) if (netAddressUtf8 && STREQ(netAddressUtf8, "")) VBOX_UTF8_FREE(netAddressUtf8); =20 - if (virDomainGraphicsListenAppendAddress(graphics, netAddressUtf8)= < 0) - goto cleanup; + virDomainGraphicsListenAppendAddress(graphics, netAddressUtf8); =20 gVBoxAPI.UIVRDEServer.GetAllowMultiConnection(VRDEServer, &allowMu= ltiConnection); if (allowMultiConnection) @@ -3639,14 +3637,11 @@ vboxDumpDisplay(virDomainDef *def, struct _vboxDriv= er *data, IMachine *machine) VIR_APPEND_ELEMENT(def->graphics, def->ngraphics, graphics); } =20 - ret =3D 0; - - cleanup: VBOX_RELEASE(VRDEServer); VBOX_UTF8_FREE(valueTypeUtf8); VBOX_UTF8_FREE(netAddressUtf8); virDomainGraphicsDefFree(graphics); - return ret; + return 0; } =20 static int diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 26b89776e1..e746ff213b 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -2017,8 +2017,7 @@ virVMXParseVNC(virConf *conf, virDomainGraphicsDef **= def) goto failure; } =20 - if (virDomainGraphicsListenAppendAddress(*def, listenAddr) < 0) - goto failure; + virDomainGraphicsListenAppendAddress(*def, listenAddr); VIR_FREE(listenAddr); =20 if (port < 0) { --=20 2.34.1 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Tue May 14 14:51:41 2024 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=quarantine dis=quarantine) header.from=swemel.ru Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1704898197059504.0349606553881; Wed, 10 Jan 2024 06:49:57 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id D62401CE6; Wed, 10 Jan 2024 09:49:55 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 140FF1C80; Wed, 10 Jan 2024 09:24:59 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 4D92B1C08; Wed, 10 Jan 2024 09:24:37 -0500 (EST) Received: from mx.swemel.ru (mx.swemel.ru [95.143.211.150]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 8C7D71C2B for ; Wed, 10 Jan 2024 09:21:59 -0500 (EST) 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: Dmitry Frolov To: devel@lists.libvirt.org Subject: [PATCH v4 15/19] libxl: change type to void xenParseXLNamespaceData() Date: Wed, 10 Jan 2024 17:21:30 +0300 Message-Id: <20240110142134.915450-16-frolov@swemel.ru> In-Reply-To: <20240110142134.915450-1-frolov@swemel.ru> References: <47d3cbc0-003b-4829-8038-8e00bbdb5c85@redhat.com> <20240110142134.915450-1-frolov@swemel.ru> MIME-Version: 1.0 Message-ID-Hash: 7LHKMS56EZLBEKADLJJ67NVC7Z363N46 X-Message-ID-Hash: 7LHKMS56EZLBEKADLJJ67NVC7Z363N46 X-MailFrom: frolov@swemel.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: sdl.libvirt@linuxtesting.org, Dmitry Frolov 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: 1704898198244100001 xenParseXLNamespaceData() returns nothing except 0. Changing return type to void. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Dmitry Frolov --- src/libxl/xen_xl.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c index 553aa77896..ea825e85bd 100644 --- a/src/libxl/xen_xl.c +++ b/src/libxl/xen_xl.c @@ -1017,7 +1017,7 @@ xenParseXLChannel(virConf *conf, virDomainDef *def) return -1; } =20 -static int +static void xenParseXLNamespaceData(virConf *conf, virDomainDef *def) { virConfValue *list =3D virConfGetValue(conf, "device_model_args"); @@ -1027,7 +1027,7 @@ xenParseXLNamespaceData(virConf *conf, virDomainDef *= def) size_t n =3D 0; =20 if (!list || list->type !=3D VIR_CONF_LIST) - return 0; + return; =20 list =3D list->list; =20 @@ -1039,7 +1039,7 @@ xenParseXLNamespaceData(virConf *conf, virDomainDef *= def) } =20 if (nargs =3D=3D 0) - return 0; + return; =20 nsdata =3D g_new0(libxlDomainXmlNsDef, 1); def->namespaceData =3D nsdata; @@ -1052,8 +1052,6 @@ xenParseXLNamespaceData(virConf *conf, virDomainDef *= def) =20 nsdata->args[n++] =3D g_strdup(next->str); } - - return 0; } =20 virDomainDef * @@ -1104,8 +1102,7 @@ xenParseXL(virConf *conf, if (xenParseXLChannel(conf, def) < 0) return NULL; =20 - if (xenParseXLNamespaceData(conf, def) < 0) - return NULL; + xenParseXLNamespaceData(conf, def); =20 if (virDomainDefPostParse(def, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, xmlopt, NULL) < 0) --=20 2.34.1 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Tue May 14 14:51:41 2024 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=quarantine dis=quarantine) header.from=swemel.ru Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1704897932732807.9460612241793; Wed, 10 Jan 2024 06:45:32 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 8EED71D6D; Wed, 10 Jan 2024 09:45:30 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 3590C1CFB; Wed, 10 Jan 2024 09:24:31 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id A37ED1C4A; Wed, 10 Jan 2024 09:23:22 -0500 (EST) Received: from mx.swemel.ru (mx.swemel.ru [95.143.211.150]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 8DBCB1C2F for ; Wed, 10 Jan 2024 09:21:59 -0500 (EST) 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: Dmitry Frolov To: devel@lists.libvirt.org Subject: [PATCH v4 16/19] rpc: change type to void virNetClientAddProgram() Date: Wed, 10 Jan 2024 17:21:31 +0300 Message-Id: <20240110142134.915450-17-frolov@swemel.ru> In-Reply-To: <20240110142134.915450-1-frolov@swemel.ru> References: <47d3cbc0-003b-4829-8038-8e00bbdb5c85@redhat.com> <20240110142134.915450-1-frolov@swemel.ru> MIME-Version: 1.0 Message-ID-Hash: F7WJCLBIO6PENZCMZTCOX5V55L64FMZL X-Message-ID-Hash: F7WJCLBIO6PENZCMZTCOX5V55L64FMZL X-MailFrom: frolov@swemel.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: sdl.libvirt@linuxtesting.org, Dmitry Frolov 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: 1704897934870100001 virNetClientAddProgram() returns nothing except 0. Changing return type to void. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Dmitry Frolov --- src/admin/admin_remote.c | 3 +-- src/locking/lock_driver_lockd.c | 3 +-- src/logging/log_manager.c | 3 +-- src/lxc/lxc_monitor.c | 5 ++--- src/remote/remote_driver.c | 7 +++---- src/rpc/virnetclient.c | 3 +-- src/rpc/virnetclient.h | 2 +- 7 files changed, 10 insertions(+), 16 deletions(-) diff --git a/src/admin/admin_remote.c b/src/admin/admin_remote.c index 3291a1e965..5c4913a76e 100644 --- a/src/admin/admin_remote.c +++ b/src/admin/admin_remote.c @@ -214,8 +214,7 @@ remoteAdminPrivNew(const char *sock_path) NULL, 0, NULL))) goto error; =20 - if (virNetClientAddProgram(priv->client, priv->program) < 0) - goto error; + virNetClientAddProgram(priv->client, priv->program); =20 return priv; error: diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lock= d.c index d75302dd0a..0b6c720477 100644 --- a/src/locking/lock_driver_lockd.c +++ b/src/locking/lock_driver_lockd.c @@ -213,8 +213,7 @@ static virNetClient *virLockManagerLockDaemonConnection= New(bool privileged, NULL))) goto error; =20 - if (virNetClientAddProgram(client, *prog) < 0) - goto error; + virNetClientAddProgram(client, *prog); =20 return client; =20 diff --git a/src/logging/log_manager.c b/src/logging/log_manager.c index d8490f4e5a..19e23d65c5 100644 --- a/src/logging/log_manager.c +++ b/src/logging/log_manager.c @@ -88,8 +88,7 @@ virLogManagerConnect(bool privileged, NULL))) goto error; =20 - if (virNetClientAddProgram(client, *prog) < 0) - goto error; + virNetClientAddProgram(client, *prog); =20 VIR_FREE(daemonPath); VIR_FREE(logdpath); diff --git a/src/lxc/lxc_monitor.c b/src/lxc/lxc_monitor.c index 811d6685e5..d27e0fab3e 100644 --- a/src/lxc/lxc_monitor.c +++ b/src/lxc/lxc_monitor.c @@ -169,9 +169,8 @@ virLXCMonitor *virLXCMonitorNew(virDomainObj *vm, mon))) goto error; =20 - if (virNetClientAddProgram(mon->client, - mon->program) < 0) - goto error; + virNetClientAddProgram(mon->client, + mon->program); =20 mon->vm =3D virObjectRef(vm); memcpy(&mon->cb, cb, sizeof(mon->cb)); diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 392377deae..1ed0e54eda 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -1160,10 +1160,9 @@ doRemoteOpen(virConnectPtr conn, conn))) goto error; =20 - if (virNetClientAddProgram(priv->client, priv->remoteProgram) < 0 || - virNetClientAddProgram(priv->client, priv->lxcProgram) < 0 || - virNetClientAddProgram(priv->client, priv->qemuProgram) < 0) - goto error; + virNetClientAddProgram(priv->client, priv->remoteProgram); + virNetClientAddProgram(priv->client, priv->lxcProgram); + virNetClientAddProgram(priv->client, priv->qemuProgram); =20 /* Try and authenticate with server */ VIR_DEBUG("Trying authentication"); diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 68098b1c8d..caa4960a0b 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -1053,7 +1053,7 @@ bool virNetClientIsOpen(virNetClient *client) } =20 =20 -int virNetClientAddProgram(virNetClient *client, +void virNetClientAddProgram(virNetClient *client, virNetClientProgram *prog) { virObjectLock(client); @@ -1062,7 +1062,6 @@ int virNetClientAddProgram(virNetClient *client, client->programs[client->nprograms-1] =3D virObjectRef(prog); =20 virObjectUnlock(client); - return 0; } =20 =20 diff --git a/src/rpc/virnetclient.h b/src/rpc/virnetclient.h index 1647a6cc71..7726b57ef4 100644 --- a/src/rpc/virnetclient.h +++ b/src/rpc/virnetclient.h @@ -117,7 +117,7 @@ int virNetClientDupFD(virNetClient *client, bool cloexe= c); =20 bool virNetClientHasPassFD(virNetClient *client); =20 -int virNetClientAddProgram(virNetClient *client, +void virNetClientAddProgram(virNetClient *client, virNetClientProgram *prog); =20 int virNetClientAddStream(virNetClient *client, --=20 2.34.1 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Tue May 14 14:51:41 2024 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=quarantine dis=none) header.from=swemel.ru Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1704898132959711.6389154566336; Wed, 10 Jan 2024 06:48:52 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id CA74D1C1F; Wed, 10 Jan 2024 09:48:51 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id DC0B21C3B; Wed, 10 Jan 2024 09:24:50 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id F41F61CC9; Wed, 10 Jan 2024 09:24:33 -0500 (EST) Received: from mx.swemel.ru (mx.swemel.ru [95.143.211.150]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 8D8B11C2E for ; Wed, 10 Jan 2024 09:21:59 -0500 (EST) 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: Dmitry Frolov To: devel@lists.libvirt.org Subject: [PATCH v4 17/19] vbox: change type to void vboxDumpDisplay() Date: Wed, 10 Jan 2024 17:21:32 +0300 Message-Id: <20240110142134.915450-18-frolov@swemel.ru> In-Reply-To: <20240110142134.915450-1-frolov@swemel.ru> References: <47d3cbc0-003b-4829-8038-8e00bbdb5c85@redhat.com> <20240110142134.915450-1-frolov@swemel.ru> MIME-Version: 1.0 Message-ID-Hash: YYHNK6V3WC7K62AWKA4OYQYGPRKCRC5S X-Message-ID-Hash: YYHNK6V3WC7K62AWKA4OYQYGPRKCRC5S X-MailFrom: frolov@swemel.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: sdl.libvirt@linuxtesting.org, Dmitry Frolov 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: 1704898133913100001 vboxDumpDisplay() returns nothing except 0. Changing return type to void. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Dmitry Frolov --- src/vbox/vbox_common.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 59e7a91081..305c85f4ec 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -3538,7 +3538,7 @@ vboxDumpVideo(virDomainDef *def, struct _vboxDriver *= data G_GNUC_UNUSED, return 0; } =20 -static int +static void vboxDumpDisplay(virDomainDef *def, struct _vboxDriver *data, IMachine *mac= hine) { /* dump display options vrdp/gui/sdl */ @@ -3641,7 +3641,6 @@ vboxDumpDisplay(virDomainDef *def, struct _vboxDriver= *data, IMachine *machine) VBOX_UTF8_FREE(valueTypeUtf8); VBOX_UTF8_FREE(netAddressUtf8); virDomainGraphicsDefFree(graphics); - return 0; } =20 static int @@ -4157,8 +4156,7 @@ static char *vboxDomainGetXMLDesc(virDomainPtr dom, u= nsigned int flags) =20 if (vboxDumpVideo(def, data, machine) < 0) goto cleanup; - if (vboxDumpDisplay(def, data, machine) < 0) - goto cleanup; + vboxDumpDisplay(def, data, machine); if (vboxDumpStorageControllers(def, machine) < 0) goto cleanup; if (vboxDumpDisks(def, data, machine) < 0) --=20 2.34.1 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Tue May 14 14:51:41 2024 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=quarantine dis=quarantine) header.from=swemel.ru Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1704898263574478.0992331148517; Wed, 10 Jan 2024 06:51:03 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 8006E18A9; Wed, 10 Jan 2024 09:51:02 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id A48C21B38; Wed, 10 Jan 2024 09:25:09 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 567951C13; Wed, 10 Jan 2024 09:24:37 -0500 (EST) Received: from mx.swemel.ru (mx.swemel.ru [95.143.211.150]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id B94531C3A for ; Wed, 10 Jan 2024 09:21:59 -0500 (EST) 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: Dmitry Frolov To: devel@lists.libvirt.org Subject: [PATCH v4 18/19] libxl: change type to void libxlMakeDomainDeviceHostdevCaps() Date: Wed, 10 Jan 2024 17:21:33 +0300 Message-Id: <20240110142134.915450-19-frolov@swemel.ru> In-Reply-To: <20240110142134.915450-1-frolov@swemel.ru> References: <47d3cbc0-003b-4829-8038-8e00bbdb5c85@redhat.com> <20240110142134.915450-1-frolov@swemel.ru> MIME-Version: 1.0 Message-ID-Hash: LZKHBIL47W63BPZC7H4K2LINLWLWI5FP X-Message-ID-Hash: LZKHBIL47W63BPZC7H4K2LINLWLWI5FP X-MailFrom: frolov@swemel.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: sdl.libvirt@linuxtesting.org, Dmitry Frolov 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: 1704898264658100001 libxlMakeDomainDeviceHostdevCaps() returns nothing except 0. Changing return type to void. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Dmitry Frolov --- src/libxl/libxl_capabilities.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index 2b0652b483..159d923fc3 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -585,7 +585,7 @@ libxlMakeDomainDeviceVideoCaps(virDomainCapsDeviceVideo= *dev) return 0; } =20 -static int +static void libxlMakeDomainDeviceHostdevCaps(virDomainCapsDeviceHostdev *dev) { dev->supported =3D VIR_TRISTATE_BOOL_YES; @@ -616,7 +616,6 @@ libxlMakeDomainDeviceHostdevCaps(virDomainCapsDeviceHos= tdev *dev) =20 virDomainCapsEnumClear(&dev->pciBackend); VIR_DOMAIN_CAPS_ENUM_SET(dev->pciBackend, VIR_DEVICE_HOSTDEV_PCI_DRIVE= R_NAME_XEN); - return 0; } =20 virCaps * @@ -674,9 +673,8 @@ libxlMakeDomainCapabilities(virDomainCaps *domCaps, libxlMakeDomainDeviceGraphicsCaps(graphics); libxlMakeDomainDeviceVideoCaps(video); =20 - if (STRNEQ(domCaps->machine, "xenpvh") && - libxlMakeDomainDeviceHostdevCaps(hostdev) < 0) - return -1; + if (STRNEQ(domCaps->machine, "xenpvh")) + libxlMakeDomainDeviceHostdevCaps(hostdev); =20 domCaps->features[VIR_DOMAIN_CAPS_FEATURE_IOTHREADS] =3D VIR_TRISTATE_= BOOL_NO; domCaps->features[VIR_DOMAIN_CAPS_FEATURE_VMCOREINFO] =3D VIR_TRISTATE= _BOOL_NO; --=20 2.34.1 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Tue May 14 14:51:41 2024 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=quarantine dis=quarantine) header.from=swemel.ru Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1704898335417790.9621703735811; Wed, 10 Jan 2024 06:52:15 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 5C0121C60; Wed, 10 Jan 2024 09:52:14 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id A9BAB1CD4; Wed, 10 Jan 2024 09:25:18 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 5ACCC1C96; Wed, 10 Jan 2024 09:24:41 -0500 (EST) Received: from mx.swemel.ru (mx.swemel.ru [95.143.211.150]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id E19701C44 for ; Wed, 10 Jan 2024 09:21:59 -0500 (EST) 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: Dmitry Frolov To: devel@lists.libvirt.org Subject: [PATCH v4 19/19] libxl: change type to void libxlMakeDomainCapabilities() Date: Wed, 10 Jan 2024 17:21:34 +0300 Message-Id: <20240110142134.915450-20-frolov@swemel.ru> In-Reply-To: <20240110142134.915450-1-frolov@swemel.ru> References: <47d3cbc0-003b-4829-8038-8e00bbdb5c85@redhat.com> <20240110142134.915450-1-frolov@swemel.ru> MIME-Version: 1.0 Message-ID-Hash: ATN26RKZM4S32XRUK22PPOPCKAU3DPFT X-Message-ID-Hash: ATN26RKZM4S32XRUK22PPOPCKAU3DPFT X-MailFrom: frolov@swemel.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: sdl.libvirt@linuxtesting.org, Dmitry Frolov 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: 1704898336945100001 libxlMakeDomainCapabilities() returns nothing except 0. Changing return type to void. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Dmitry Frolov --- src/libxl/libxl_capabilities.c | 4 +--- src/libxl/libxl_capabilities.h | 2 +- src/libxl/libxl_driver.c | 5 ++--- tests/domaincapstest.c | 3 +-- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index 159d923fc3..e6ed9ef29f 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -652,7 +652,7 @@ libxlMakeCapabilities(libxl_ctx *ctx) #define HVM_MAX_VCPUS 128 #define PV_MAX_VCPUS 512 =20 -int +void libxlMakeDomainCapabilities(virDomainCaps *domCaps, virFirmware **firmwares, size_t nfirmwares) @@ -680,8 +680,6 @@ libxlMakeDomainCapabilities(virDomainCaps *domCaps, domCaps->features[VIR_DOMAIN_CAPS_FEATURE_VMCOREINFO] =3D VIR_TRISTATE= _BOOL_NO; domCaps->features[VIR_DOMAIN_CAPS_FEATURE_GENID] =3D VIR_TRISTATE_BOOL= _NO; domCaps->gic.supported =3D VIR_TRISTATE_BOOL_NO; - - return 0; } =20 #define LIBXL_QEMU_DM_STR "Options specific to the Xen version:" diff --git a/src/libxl/libxl_capabilities.h b/src/libxl/libxl_capabilities.h index fd6332b63e..16ac3ed034 100644 --- a/src/libxl/libxl_capabilities.h +++ b/src/libxl/libxl_capabilities.h @@ -40,7 +40,7 @@ virCaps * libxlMakeCapabilities(libxl_ctx *ctx); =20 -int +void libxlMakeDomainCapabilities(virDomainCaps *domCaps, virFirmware **firmwares, size_t nfirmwares); diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 68aecaef8c..658d7d4005 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -6416,9 +6416,8 @@ libxlConnectGetDomainCapabilities(virConnectPtr conn, if (!(domCaps =3D virDomainCapsNew(emulatorbin, machine, arch, virttyp= e))) goto cleanup; =20 - if (libxlMakeDomainCapabilities(domCaps, cfg->firmwares, - cfg->nfirmwares) < 0) - goto cleanup; + libxlMakeDomainCapabilities(domCaps, cfg->firmwares, + cfg->nfirmwares); =20 ret =3D virDomainCapsFormat(domCaps); =20 diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index 97b306f652..ceeaf08b9f 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -143,8 +143,7 @@ fillXenCaps(virDomainCaps *domCaps) firmwares[0]->name =3D g_strdup("/usr/lib/xen/boot/hvmloader"); firmwares[1]->name =3D g_strdup("/usr/lib/xen/boot/ovmf.bin"); =20 - if (libxlMakeDomainCapabilities(domCaps, firmwares, 2) < 0) - return -1; + libxlMakeDomainCapabilities(domCaps, firmwares, 2); =20 return 0; } --=20 2.34.1 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org