From nobody Fri Dec 19 07:50:32 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 173933471902631.989818245411243; Tue, 11 Feb 2025 20:31:59 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 14CACD61; Tue, 11 Feb 2025 23:31:58 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id B9216155E; Tue, 11 Feb 2025 23:29:29 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id F1F551466; Tue, 11 Feb 2025 23:29:18 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 7435B145E for ; Tue, 11 Feb 2025 23:29:18 -0500 (EST) Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-594-pRPUJAmrOkScSNzUNcenMQ-1; Tue, 11 Feb 2025 23:29:16 -0500 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A6CB81955DB8 for ; Wed, 12 Feb 2025 04:29:15 +0000 (UTC) Received: from vhost3.router.laine.org (unknown [10.22.64.63]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1C779180087B for ; Wed, 12 Feb 2025 04:29:14 +0000 (UTC) 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=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739334558; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vFL2+V7QuUIjTstOVvHGDy3N1PoGJrekoQQyTgfSfDc=; b=SzKV8PJRpygzD4dr4qzRGVHtDIRCXVHD3ILr8IRtLm/gNfzD+9aE9o6hcw+rQmci3ks+eE sY0ItqMJQ+brXOjBkl9WR81k75eD9WaXUDCCY0NDXyEv8q0NnL8uli9+lxaak7DOmmWcLb SpmZlxbYMnUrKRZTViV/sNVeqzSfNlc= X-MC-Unique: pRPUJAmrOkScSNzUNcenMQ-1 X-Mimecast-MFC-AGG-ID: pRPUJAmrOkScSNzUNcenMQ From: Laine Stump To: devel@lists.libvirt.org Subject: [PATCH 05/17] conf: change virDomainDefMaybeAddInput() to return void Date: Tue, 11 Feb 2025 23:28:58 -0500 Message-ID: <20250212042910.548504-6-laine@redhat.com> In-Reply-To: <20250212042910.548504-1-laine@redhat.com> References: <20250212042910.548504-1-laine@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: EDKkFxq1l7h4wgRP60zoiEgZsqlXTbUuGMb-1fqRJ1E_1739334555 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: TUCMOPFJCFKUEECRTC33VMFLINLSUNWP X-Message-ID-Hash: TUCMOPFJCFKUEECRTC33VMFLINLSUNWP X-MailFrom: laine@redhat.com 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 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: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1739334721274019100 Content-Type: text/plain; charset="utf-8"; x-default="true" It can't fail. Signed-off-by: Laine Stump Reviewed-by: Martin Kletzander --- src/conf/domain_conf.c | 6 ++---- src/conf/domain_conf.h | 2 +- src/libxl/xen_common.c | 11 ++--------- src/qemu/qemu_postparse.c | 27 ++++++--------------------- src/vz/vz_driver.c | 11 ++--------- src/vz/vz_sdk.c | 11 ++--------- 6 files changed, 15 insertions(+), 53 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 2e74f75a13..b14712997b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -16548,7 +16548,7 @@ virDomainDefMaybeAddController(virDomainDef *def, } =20 =20 -int +void virDomainDefMaybeAddInput(virDomainDef *def, int type, int bus) @@ -16559,7 +16559,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); @@ -16568,8 +16568,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 0dd2d6f1d2..1edc3679cd 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -4370,7 +4370,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 3a64f565f7..c9c8ed2fde 100644 --- a/src/libxl/xen_common.c +++ b/src/libxl/xen_common.c @@ -2400,15 +2400,8 @@ xenDomainDefAddImplicitInputDevice(virDomainDef *def) 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; - - if (virDomainDefMaybeAddInput(def, - VIR_DOMAIN_INPUT_TYPE_KBD, - implicitInputBus) < 0) - return -1; + virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_MOUSE, implicitIn= putBus); + virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_KBD, implicitInpu= tBus); =20 return 0; } diff --git a/src/qemu/qemu_postparse.c b/src/qemu/qemu_postparse.c index 1f9077982a..53151eef75 100644 --- a/src/qemu/qemu_postparse.c +++ b/src/qemu/qemu_postparse.c @@ -1095,15 +1095,8 @@ qemuDomainDefAddImplicitInputDevice(virDomainDef *de= f, { if (virQEMUCapsSupportsI8042(qemuCaps, def) && def->features[VIR_DOMAIN_FEATURE_PS2] !=3D VIR_TRISTATE_SWITCH_OFF= ) { - if (virDomainDefMaybeAddInput(def, - VIR_DOMAIN_INPUT_TYPE_MOUSE, - VIR_DOMAIN_INPUT_BUS_PS2) < 0) - return -1; - - if (virDomainDefMaybeAddInput(def, - VIR_DOMAIN_INPUT_TYPE_KBD, - VIR_DOMAIN_INPUT_BUS_PS2) < 0) - return -1; + virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_MOUSE, VIR_DO= MAIN_INPUT_BUS_PS2); + virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_KBD, VIR_DOMA= IN_INPUT_BUS_PS2); } =20 return 0; @@ -1419,19 +1412,11 @@ qemuDomainDefAddDefaultDevices(virQEMUDriver *drive= r, addDefaultUSBMouse =3D false; } =20 - if (addDefaultUSBKBD && - def->ngraphics > 0 && - virDomainDefMaybeAddInput(def, - VIR_DOMAIN_INPUT_TYPE_KBD, - VIR_DOMAIN_INPUT_BUS_USB) < 0) - return -1; + if (addDefaultUSBKBD && def->ngraphics > 0) + virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_KBD, VIR_DOMA= IN_INPUT_BUS_USB); =20 - if (addDefaultUSBMouse && - def->ngraphics > 0 && - virDomainDefMaybeAddInput(def, - VIR_DOMAIN_INPUT_TYPE_MOUSE, - VIR_DOMAIN_INPUT_BUS_USB) < 0) - return -1; + if (addDefaultUSBMouse && def->ngraphics > 0) + virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_MOUSE, VIR_DO= MAIN_INPUT_BUS_USB); =20 if (addPanicDevice) { virDomainPanicModel defaultModel =3D qemuDomainDefaultPanicModel(d= ef); diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 4edea4bf18..571735f940 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -219,15 +219,8 @@ 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); + virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_KBD, bus); =20 return 0; } diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 688c9d1ebc..c64d0b73e5 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -1848,15 +1848,8 @@ 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; - - if (virDomainDefMaybeAddInput(def, - VIR_DOMAIN_INPUT_TYPE_KBD, - bus) < 0) - return NULL; + virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_MOUSE, bus); + virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_KBD, bus); } =20 if (!dom) { --=20 2.47.1