From nobody Tue Dec 16 11:45:34 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 1740042155368162.0083346778415; Thu, 20 Feb 2025 01:02:35 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 62C7F1CF7; Thu, 20 Feb 2025 04:02:34 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 7BAAD1D57; Thu, 20 Feb 2025 04:01:47 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id E42301CF7; Thu, 20 Feb 2025 04:01:42 -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 6BAD01CF6 for ; Thu, 20 Feb 2025 04:01:42 -0500 (EST) Received: from mx-prod-mc-06.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-132-sMpR_jNEOSeOtX9gV3MHSA-1; Thu, 20 Feb 2025 04:01:40 -0500 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3DDCF1800360 for ; Thu, 20 Feb 2025 09:01:39 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.26]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 422E319412A3 for ; Thu, 20 Feb 2025 09:01:37 +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=1740042102; 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=ft4bkvD4EvCaifcESo4Kw0eEoHQ1U9QazNCoa8TvaG8=; b=hWb3SPbfRYqVjI6GKlvNe9nnfIiJ1K/JNjRT+ItPKb9kPZ68/rgaZ5se6aqQIvSzxksH0L EjW0N70L3k75gYtPNvJwa4IqL5Jwz8hgYoPdiKbG/r06c4Ocl6ZvJTU1wl2IT9wmmbEpSt GgrGA8Xr0Y2WE760fkycRZBoXIWsi0I= X-MC-Unique: sMpR_jNEOSeOtX9gV3MHSA-1 X-Mimecast-MFC-AGG-ID: sMpR_jNEOSeOtX9gV3MHSA_1740042099 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 01/21] qemuDomainGetStatsBlockExportHeader: Remove return value Date: Thu, 20 Feb 2025 10:01:14 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: KND99pNMq3Ya7Z50deO2uNcDCYh3wQBD3BsDW8plEkc_1740042099 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: W3UVSAASISHFNCSZU4DNRZ5ON3JOXRFZ X-Message-ID-Hash: W3UVSAASISHFNCSZU4DNRZ5ON3JOXRFZ X-MailFrom: pkrempa@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: 1740042158320019100 Content-Type: text/plain; charset="utf-8" The function always returns 0. Remove return value and fix callers. Signed-off-by: Peter Krempa --- src/qemu/qemu_driver.c | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1d0da1028f..7a39e83d39 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17359,7 +17359,7 @@ qemuDomainGetStatsBlockExportFrontend(const char *f= rontendname, } -static int +static void qemuDomainGetStatsBlockExportHeader(virDomainDiskDef *disk, virStorageSource *src, size_t recordnr, @@ -17372,8 +17372,6 @@ qemuDomainGetStatsBlockExportHeader(virDomainDiskDe= f *disk, if (src->id) virTypedParamListAddUInt(params, src->id, "block.%zu.backingIndex"= , recordnr); - - return 0; } @@ -17399,10 +17397,7 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDef= *disk, VIR_INFO("optional disk '%s' source file is missing, " "skip getting stats", disk->dst); - if (qemuDomainGetStatsBlockExportHeader(disk, disk->src, *recordnr, - params) < 0) { - return -1; - } + qemuDomainGetStatsBlockExportHeader(disk, disk->src, *recordnr, pa= rams); (*recordnr)++; @@ -17411,10 +17406,7 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDef= *disk, /* vhost-user disk doesn't support getting block stats */ if (virStorageSourceGetActualType(disk->src) =3D=3D VIR_STORAGE_TYPE_V= HOST_USER) { - if (qemuDomainGetStatsBlockExportHeader(disk, disk->src, *recordnr, - params) < 0) { - return -1; - } + qemuDomainGetStatsBlockExportHeader(disk, disk->src, *recordnr, pa= rams); (*recordnr)++; @@ -17445,8 +17437,7 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDef = *disk, backendstoragealias =3D alias; } - if (qemuDomainGetStatsBlockExportHeader(disk, n, *recordnr, params= ) < 0) - return -1; + qemuDomainGetStatsBlockExportHeader(disk, n, *recordnr, params); /* The following stats make sense only for the frontend device */ if (n =3D=3D disk->src) { @@ -17479,8 +17470,7 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDef = *disk, if (disk->mirror && disk->mirrorJob =3D=3D VIR_DOMAIN_BLOCK_JOB_TYPE_COPY) { - if (qemuDomainGetStatsBlockExportHeader(disk, disk->mirror, *r= ecordnr, params) < 0) - return -1; + qemuDomainGetStatsBlockExportHeader(disk, disk->mirror, *recor= dnr, params); if (qemuDomainGetStatsOneBlock(cfg, dom, params, qemuBlockStorageSourceGetEffect= iveNodename(disk->mirror), @@ -17507,9 +17497,8 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDef = *disk, continue; if (backupdisk->store) { - if (qemuDomainGetStatsBlockExportHeader(disk, backupdi= sk->store, - *recordnr, par= ams) < 0) - return -1; + qemuDomainGetStatsBlockExportHeader(disk, backupdisk->= store, + *recordnr, params); if (qemuDomainGetStatsOneBlock(cfg, dom, params, qemuBlockStorageSourceG= etEffectiveNodename(backupdisk->store), --=20 2.48.1