From nobody Fri Dec 19 07:49:58 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 1739334639929316.9836806869158; Tue, 11 Feb 2025 20:30:39 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 5CB2014B8; Tue, 11 Feb 2025 23:30:39 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 6F7F9163F; Tue, 11 Feb 2025 23:29:23 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id CB7481301; Tue, 11 Feb 2025 23:29:17 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 5551A1301 for ; Tue, 11 Feb 2025 23:29:17 -0500 (EST) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-93-LJPnQRW_PiS_Hfcx0guttA-1; Tue, 11 Feb 2025 23:29:15 -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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0B9E81800873 for ; Wed, 12 Feb 2025 04:29:14 +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 94985180087B for ; Wed, 12 Feb 2025 04:29:13 +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_H5,RCVD_IN_MSPIKE_WL,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=1739334557; 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=QoKl1ynRR3ESy0L8o6sHd301wTbzRPaGihFEh8R6jbc=; b=d4CCUfvelaax/MExwXzeNPEJDhXantfVS6C/v3XZE/eqK0dqzLPIR7qUfAg1NJsSYca/Yg /NOIN5bC/7ZUxId/SPsphyi3LjmxTYiXRHbXooiV8I1+M7PXeet6lvhgFe3IV3D1tr9+N8 q0j+eQ0ElH44Exdxe5ZP50XMkVvVOzE= X-MC-Unique: LJPnQRW_PiS_Hfcx0guttA-1 X-Mimecast-MFC-AGG-ID: LJPnQRW_PiS_Hfcx0guttA_1739334554 From: Laine Stump To: devel@lists.libvirt.org Subject: [PATCH 03/17] conf: change virDomainFSInsert() to return void Date: Tue, 11 Feb 2025 23:28:56 -0500 Message-ID: <20250212042910.548504-4-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: P4nI0kQcQ4Yzwf_DAqDXs5B_mS9L9XCuZM_BKKA3JYs_1739334554 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: Y7PDPGJ64G3PU2JU5O252XMZ6GTZEZ7K X-Message-ID-Hash: Y7PDPGJ64G3PU2JU5O252XMZ6GTZEZ7K 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: 1739334641320019000 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 | 4 +--- src/conf/domain_conf.h | 2 +- src/qemu/qemu_driver.c | 3 +-- src/vz/vz_sdk.c | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 1882054c7b..b5b15b7768 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -29205,12 +29205,10 @@ virDiskNameToBusDeviceIndex(virDomainDiskDef *dis= k, return 0; } =20 -int +void virDomainFSInsert(virDomainDef *def, virDomainFSDef *fs) { VIR_APPEND_ELEMENT(def->fss, def->nfss, fs); - - return 0; } =20 virDomainFSDef * diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 37298ca937..cb19f0fb29 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -4123,7 +4123,7 @@ int virDiskNameToBusDeviceIndex(virDomainDiskDef *dis= k, =20 virDomainFSDef *virDomainGetFilesystemForTarget(virDomainDef *def, const char *target); -int virDomainFSInsert(virDomainDef *def, virDomainFSDef *fs); +void virDomainFSInsert(virDomainDef *def, virDomainFSDef *fs); int virDomainFSIndexByName(virDomainDef *def, const char *name); virDomainFSDef *virDomainFSRemove(virDomainDef *def, size_t i); ssize_t virDomainFSDefFind(virDomainDef *def, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 4a248cbafe..d295f24cb3 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6790,8 +6790,7 @@ qemuDomainAttachDeviceConfig(virDomainDef *vmdef, return -1; } =20 - if (virDomainFSInsert(vmdef, fs) < 0) - return -1; + virDomainFSInsert(vmdef, fs); dev->data.fs =3D NULL; break; =20 diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index b20d454fb8..688c9d1ebc 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -801,8 +801,7 @@ prlsdkAddDomainHardDisksInfo(struct _vzDriver *driver, = PRL_HANDLE sdkdom, virDom if (prlsdkGetFSInfo(hdd, fs) < 0) goto error; =20 - if (virDomainFSInsert(def, fs) < 0) - goto error; + virDomainFSInsert(def, fs); =20 fs =3D NULL; PrlHandle_Free(hdd); --=20 2.47.1