From nobody Tue Dec 16 16:25:07 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 1740042201049256.18439162426375; Thu, 20 Feb 2025 01:03:21 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 0B1EA1D82; Thu, 20 Feb 2025 04:03:19 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id D956B1E22; Thu, 20 Feb 2025 04:01:57 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 9F6281DAE; Thu, 20 Feb 2025 04:01:50 -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 039AC1D77 for ; Thu, 20 Feb 2025 04:01:44 -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-287-Ph2OfHrROuCejlTe7Stacg-1; Thu, 20 Feb 2025 04:01:42 -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 2ECDB180034E for ; Thu, 20 Feb 2025 09:01:42 +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 583BD19412A3 for ; Thu, 20 Feb 2025 09:01:41 +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=1740042104; 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=c8Pwaeh024dEuOE4qQlbjfBqNVjnWHbjgPRf5lDCP8c=; b=DteSM8UrPP0BQ1ZrHdlEu4jtKnkYWbguth6YF90eBVr+KSFKx+X39sfVklD2/RFtxzoE+n jtnxT6OVWihC2uOhG8juspQScKyqpT8Im8WNiZfvGaYuWFN4wEQ+9CBhSUoCym4jKlS6Iz nEAvxGZsqJK0coqvFL1XRSK4A/GfL+g= X-MC-Unique: Ph2OfHrROuCejlTe7Stacg-1 X-Mimecast-MFC-AGG-ID: Ph2OfHrROuCejlTe7Stacg_1740042102 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 03/21] qemuDomainGetStatsBlockExportBackendStorage: Remove return value Date: Thu, 20 Feb 2025 10:01:16 +0100 Message-ID: <635e150b1b9632b3415ae41c4145d8fed93e1578.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: hE8giYC7qJBZ3mrJhdY6uLmbsVTfYdoC0VLstlcU-8o_1740042102 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: UGV4IWASP3UEP3YPN77GNY7GRYV5ZXIR X-Message-ID-Hash: UGV4IWASP3UEP3YPN77GNY7GRYV5ZXIR 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: 1740042202566019100 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, 9 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 3dee0a4a91..327edfe506 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17314,7 +17314,7 @@ qemuDomainGetStatsOneBlock(virQEMUDriverConfig *cfg, } -static int +static void qemuDomainGetStatsBlockExportBackendStorage(const char *entryname, GHashTable *stats, size_t recordnr, @@ -17323,12 +17323,10 @@ qemuDomainGetStatsBlockExportBackendStorage(const= char *entryname, qemuBlockStats *entry; if (!stats || !entryname || !(entry =3D virHashLookup(stats, entryname= ))) - return 0; + return; if (entry->write_threshold) virTypedParamListAddULLong(params, entry->write_threshold, "block.= %zu.threshold", recordnr); - - return 0; } @@ -17448,10 +17446,8 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDef= *disk, stats) < 0) return -1; - if (qemuDomainGetStatsBlockExportBackendStorage(backendstoragealia= s, - stats, *recordnr, - params) < 0) - return -1; + qemuDomainGetStatsBlockExportBackendStorage(backendstoragealias, + stats, *recordnr, para= ms); (*recordnr)++; @@ -17476,10 +17472,8 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDef= *disk, stats) < 0) return -1; - if (qemuDomainGetStatsBlockExportBackendStorage(qemuBlockStora= geSourceGetStorageNodename(disk->mirror), - stats, *record= nr, - params) < 0) - return -1; + qemuDomainGetStatsBlockExportBackendStorage(qemuBlockStorageSo= urceGetStorageNodename(disk->mirror), + stats, *recordnr, = params); (*recordnr)++; } @@ -17504,10 +17498,9 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDef= *disk, stats) < 0) return -1; - if (qemuDomainGetStatsBlockExportBackendStorage(qemuBl= ockStorageSourceGetStorageNodename(backupdisk->store), - stats,= *recordnr, - params= ) < 0) - return -1; + qemuDomainGetStatsBlockExportBackendStorage(qemuBlockS= torageSourceGetStorageNodename(backupdisk->store), + stats, *re= cordnr, + params); (*recordnr)++; } --=20 2.48.1