From nobody Sun Feb 8 16:06:04 2026 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) 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 1701964029348807.0090210277621; Thu, 7 Dec 2023 07:47:09 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 37E321922; Thu, 7 Dec 2023 10:47:08 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 0411517E1; Thu, 7 Dec 2023 10:39:16 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id CC2991811; Thu, 7 Dec 2023 10:38:35 -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 AA1AC17E1 for ; Thu, 7 Dec 2023 10:38:33 -0500 (EST) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-464-agJIa2w0Ob2nxeVQR5REvw-1; Thu, 07 Dec 2023 10:38:32 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id C3E531C0BB5A for ; Thu, 7 Dec 2023 15:38:31 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4C6323C2E for ; Thu, 7 Dec 2023 15:38:31 +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=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: agJIa2w0Ob2nxeVQR5REvw-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 5/8] qemuDomainStorageOpenStat: Remove unused 'driver' argument and untangle callers Date: Thu, 7 Dec 2023 16:38:23 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: 37KQ5VNHYMDKXFJLRIJEMIKQYGUB5QH2 X-Message-ID-Hash: 37KQ5VNHYMDKXFJLRIJEMIKQYGUB5QH2 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: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1701964030278100001 Signed-off-by: Peter Krempa --- src/qemu/qemu_driver.c | 41 ++++++++++++++++------------------------- 1 file changed, 16 insertions(+), 25 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 64afae6450..f4c2fbfb45 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10217,7 +10217,6 @@ qemuDomainMemoryPeek(virDomainPtr dom, /** - * @driver: qemu driver data * @cfg: driver configuration data * @vm: domain object * @src: storage source data @@ -10236,8 +10235,7 @@ qemuDomainMemoryPeek(virDomainPtr dom, * reported) or -1 otherwise (errors are reported). */ static int -qemuDomainStorageOpenStat(virQEMUDriver *driver G_GNUC_UNUSED, - virQEMUDriverConfig *cfg, +qemuDomainStorageOpenStat(virQEMUDriverConfig *cfg, virDomainObj *vm, virStorageSource *src, int *ret_fd, @@ -10296,7 +10294,6 @@ qemuDomainStorageCloseStat(virStorageSource *src, /** * qemuDomainStorageUpdatePhysical: - * @driver: qemu driver * @cfg: qemu driver configuration object * @vm: domain object * @src: storage source to update @@ -10308,8 +10305,7 @@ qemuDomainStorageCloseStat(virStorageSource *src, * reported but are reset (thus only logged)). */ static int -qemuDomainStorageUpdatePhysical(virQEMUDriver *driver, - virQEMUDriverConfig *cfg, +qemuDomainStorageUpdatePhysical(virQEMUDriverConfig *cfg, virDomainObj *vm, virStorageSource *src) { @@ -10320,7 +10316,7 @@ qemuDomainStorageUpdatePhysical(virQEMUDriver *driv= er, if (virStorageSourceIsEmpty(src)) return 0; - if ((ret =3D qemuDomainStorageOpenStat(driver, cfg, vm, src, &fd, &sb,= true)) <=3D 0) { + if ((ret =3D qemuDomainStorageOpenStat(cfg, vm, src, &fd, &sb, true)) = <=3D 0) { if (ret < 0) virResetLastError(); return -1; @@ -10335,7 +10331,6 @@ qemuDomainStorageUpdatePhysical(virQEMUDriver *driv= er, /** - * @driver: qemu driver data * @cfg: driver configuration data * @vm: domain object * @src: storage source data @@ -10366,8 +10361,7 @@ qemuDomainStorageUpdatePhysical(virQEMUDriver *driv= er, * are reported). */ static int -qemuStorageLimitsRefresh(virQEMUDriver *driver, - virQEMUDriverConfig *cfg, +qemuStorageLimitsRefresh(virQEMUDriverConfig *cfg, virDomainObj *vm, virStorageSource *src, bool skipInaccessible) @@ -10379,7 +10373,7 @@ qemuStorageLimitsRefresh(virQEMUDriver *driver, g_autofree char *buf =3D NULL; ssize_t len; - if ((rc =3D qemuDomainStorageOpenStat(driver, cfg, vm, src, &fd, &sb, + if ((rc =3D qemuDomainStorageOpenStat(cfg, vm, src, &fd, &sb, skipInaccessible)) <=3D 0) return rc; @@ -10470,7 +10464,7 @@ qemuDomainGetBlockInfo(virDomainPtr dom, /* for inactive domains we have to peek into the files */ if (!virDomainObjIsActive(vm)) { - if ((qemuStorageLimitsRefresh(driver, cfg, vm, disk->src, false)) = < 0) + if ((qemuStorageLimitsRefresh(cfg, vm, disk->src, false)) < 0) goto endjob; info->capacity =3D disk->src->capacity; @@ -10510,7 +10504,7 @@ qemuDomainGetBlockInfo(virDomainPtr dom, if (info->allocation =3D=3D 0) info->allocation =3D entry->physical; - if (qemuDomainStorageUpdatePhysical(driver, cfg, vm, disk->src) = =3D=3D 0) { + if (qemuDomainStorageUpdatePhysical(cfg, vm, disk->src) =3D=3D 0) { info->physical =3D disk->src->physical; } else { info->physical =3D entry->physical; @@ -17220,8 +17214,7 @@ qemuDomainGetStatsInterface(virQEMUDriver *driver G= _GNUC_UNUSED, /* refresh information by opening images on the disk */ static int -qemuDomainGetStatsOneBlockFallback(virQEMUDriver *driver, - virQEMUDriverConfig *cfg, +qemuDomainGetStatsOneBlockFallback(virQEMUDriverConfig *cfg, virDomainObj *dom, virTypedParamList *params, virStorageSource *src, @@ -17233,7 +17226,7 @@ qemuDomainGetStatsOneBlockFallback(virQEMUDriver *d= river, if (virStorageSourceIsFD(src)) return 0; - if (qemuStorageLimitsRefresh(driver, cfg, dom, src, true) <=3D 0) { + if (qemuStorageLimitsRefresh(cfg, dom, src, true) <=3D 0) { virResetLastError(); return 0; } @@ -17252,8 +17245,7 @@ qemuDomainGetStatsOneBlockFallback(virQEMUDriver *d= river, static int -qemuDomainGetStatsOneBlock(virQEMUDriver *driver, - virQEMUDriverConfig *cfg, +qemuDomainGetStatsOneBlock(virQEMUDriverConfig *cfg, virDomainObj *dom, virTypedParamList *params, const char *entryname, @@ -17266,7 +17258,7 @@ qemuDomainGetStatsOneBlock(virQEMUDriver *driver, /* the VM is offline so we have to go and load the stast from the disk= by * ourselves */ if (!virDomainObjIsActive(dom)) { - return qemuDomainGetStatsOneBlockFallback(driver, cfg, dom, params, + return qemuDomainGetStatsOneBlockFallback(cfg, dom, params, src, block_idx); } @@ -17284,7 +17276,7 @@ qemuDomainGetStatsOneBlock(virQEMUDriver *driver, if (entry->physical) { virTypedParamListAddULLong(params, entry->physical, "block.%zu.phy= sical", block_idx); } else { - if (qemuDomainStorageUpdatePhysical(driver, cfg, dom, src) =3D=3D = 0) { + if (qemuDomainStorageUpdatePhysical(cfg, dom, src) =3D=3D 0) { virTypedParamListAddULLong(params, src->physical, "block.%zu.p= hysical", block_idx); } } @@ -17362,7 +17354,6 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDef = *disk, virTypedParamList *params, size_t *recordnr, bool visitBacking, - virQEMUDriver *driver, virQEMUDriverConfig *cfg, virDomainObj *dom) @@ -17435,7 +17426,7 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDef = *disk, return -1; } - if (qemuDomainGetStatsOneBlock(driver, cfg, dom, params, + if (qemuDomainGetStatsOneBlock(cfg, dom, params, backendalias, n, *recordnr, stats) < 0) return -1; @@ -17462,7 +17453,7 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDef = *disk, if (qemuDomainGetStatsBlockExportHeader(disk, disk->mirror, *r= ecordnr, params) < 0) return -1; - if (qemuDomainGetStatsOneBlock(driver, cfg, dom, params, + if (qemuDomainGetStatsOneBlock(cfg, dom, params, qemuBlockStorageSourceGetEffect= iveNodename(disk->mirror), disk->mirror, *recordnr, @@ -17491,7 +17482,7 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDef = *disk, *recordnr, par= ams) < 0) return -1; - if (qemuDomainGetStatsOneBlock(driver, cfg, dom, param= s, + if (qemuDomainGetStatsOneBlock(cfg, dom, params, qemuBlockStorageSourceG= etEffectiveNodename(backupdisk->store), backupdisk->store, *recordnr, @@ -17548,7 +17539,7 @@ qemuDomainGetStatsBlock(virQEMUDriver *driver, for (i =3D 0; i < dom->def->ndisks; i++) { if (qemuDomainGetStatsBlockExportDisk(dom->def->disks[i], stats, blockparams, &visited, - visitBacking, driver, cfg, d= om) < 0) + visitBacking, cfg, dom) < 0) return -1; } --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org