From nobody Tue Dec 16 13:49:45 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 1740042247586845.8769913089182; Thu, 20 Feb 2025 01:04:07 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 059541E4E; Thu, 20 Feb 2025 04:04:07 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 79A631DA6; Thu, 20 Feb 2025 04:02:02 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id A703C1E35; Thu, 20 Feb 2025 04:01:57 -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 5B50E1E40 for ; Thu, 20 Feb 2025 04:01:47 -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-473-yZ7myy3JNX-UzBKie1DVfw-1; Thu, 20 Feb 2025 04:01:45 -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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id F1157180056F for ; Thu, 20 Feb 2025 09:01:44 +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 2002619412A3 for ; Thu, 20 Feb 2025 09:01:43 +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=1740042107; 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=kCM6CsW69bA9XDFbNKcCuqsZseweVQzqpYiG8+e+aNo=; b=AsuzkxGZZyi5G63zbLUzOEUKsGNNa+8nvixMxEGjvFG/lqOaiw9UMhZi/dsXeXvSRGPpke 8/DloM345aJazTUCN6fKiwWtlx8GqDCwnopmfhbPJWAuMP3sSPcWqExtwqgMGXltsg2uw3 uz2O36MmdZmLnnTebZfAXgrzjp2rLfE= X-MC-Unique: yZ7myy3JNX-UzBKie1DVfw-1 X-Mimecast-MFC-AGG-ID: yZ7myy3JNX-UzBKie1DVfw_1740042105 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 05/21] qemuDomainGetStatsOneBlock: Remove return value Date: Thu, 20 Feb 2025 10:01:18 +0100 Message-ID: <6e13bd74439bbacd8e46017db297a48a7bf9f83c.1740041997.git.pkrempa@redhat.com> 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: ni85sXMFOMyPVttuoMcdL2dTFXFmqlbuSEo9Igays7I_1740042105 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: XUESGJBFUAOO6UFKEFIBAWN5R2GUEPUG X-Message-ID-Hash: XUESGJBFUAOO6UFKEFIBAWN5R2GUEPUG 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: 1740042248566019000 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 | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 7318c145d0..aee66b2bc7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17269,7 +17269,7 @@ qemuDomainGetStatsOneBlockFallback(virQEMUDriverCon= fig *cfg, } -static int +static void qemuDomainGetStatsOneBlock(virQEMUDriverConfig *cfg, virDomainObj *dom, virTypedParamList *params, @@ -17284,14 +17284,14 @@ qemuDomainGetStatsOneBlock(virQEMUDriverConfig *c= fg, * ourselves */ if (!virDomainObjIsActive(dom)) { qemuDomainGetStatsOneBlockFallback(cfg, dom, params, src, block_id= x); - return 0; + return; } /* In case where qemu didn't provide the stats we stop here rather than * trying to refresh the stats from the disk. Inability to provide sta= ts is * usually caused by blocked storage so this would make libvirtd hang = */ if (!stats || !entryname || !(entry =3D virHashLookup(stats, entryname= ))) - return 0; + return; virTypedParamListAddULLong(params, entry->wr_highest_offset, "block.%z= u.allocation", block_idx); @@ -17305,8 +17305,6 @@ qemuDomainGetStatsOneBlock(virQEMUDriverConfig *cfg, virTypedParamListAddULLong(params, src->physical, "block.%zu.p= hysical", block_idx); } } - - return 0; } @@ -17437,10 +17435,8 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDef= *disk, params); } - if (qemuDomainGetStatsOneBlock(cfg, dom, params, - backendalias, n, *recordnr, - stats) < 0) - return -1; + qemuDomainGetStatsOneBlock(cfg, dom, params, + backendalias, n, *recordnr, stats); qemuDomainGetStatsBlockExportBackendStorage(backendstoragealias, stats, *recordnr, para= ms); @@ -17461,12 +17457,9 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDef= *disk, disk->mirrorJob =3D=3D VIR_DOMAIN_BLOCK_JOB_TYPE_COPY) { qemuDomainGetStatsBlockExportHeader(disk, disk->mirror, *recor= dnr, params); - if (qemuDomainGetStatsOneBlock(cfg, dom, params, - qemuBlockStorageSourceGetEffect= iveNodename(disk->mirror), - disk->mirror, - *recordnr, - stats) < 0) - return -1; + qemuDomainGetStatsOneBlock(cfg, dom, params, + qemuBlockStorageSourceGetEffectiveN= odename(disk->mirror), + disk->mirror, *recordnr, stats); qemuDomainGetStatsBlockExportBackendStorage(qemuBlockStorageSo= urceGetStorageNodename(disk->mirror), stats, *recordnr, = params); @@ -17487,12 +17480,9 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDef= *disk, qemuDomainGetStatsBlockExportHeader(disk, backupdisk->= store, *recordnr, params); - if (qemuDomainGetStatsOneBlock(cfg, dom, params, - qemuBlockStorageSourceG= etEffectiveNodename(backupdisk->store), - backupdisk->store, - *recordnr, - stats) < 0) - return -1; + qemuDomainGetStatsOneBlock(cfg, dom, params, + qemuBlockStorageSourceGetEf= fectiveNodename(backupdisk->store), + backupdisk->store, *recordn= r, stats); qemuDomainGetStatsBlockExportBackendStorage(qemuBlockS= torageSourceGetStorageNodename(backupdisk->store), stats, *re= cordnr, --=20 2.48.1