From nobody Tue Feb 10 00:58:29 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1555412174; cv=none; d=zoho.com; s=zohoarc; b=I7csqivc/zDQHRoC21cretil8NrPZbZPTSFWgebAvImqw2gur5+QPxRgkQ36ecF/j6giGW5MZ8JE8FB6qmOlScviGckt/4f9MYGchexxEfWJUFjw6UCvBeTlOq2viiwyKI+MrCqeQtfAjplqM7MZHq5YjO0JYpoF1R8ur71a7ow= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555412174; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=Ad+EnH7mRIKCuXwPvzVms0iZzV/FqSjerFdK4pnBo9I=; b=NtP2tnVMzHBBaU78+/DUN1rgPCJD+0IA0UTiGbxqvjv5ivwUrH5T8jK9y1CM8KuRdOwGGnmdzQbiukH8Ao3OMl9/XfDrVj0d67Nn9ecOS+ExryTUipHlKZfXMUv2jkVBVGA4WL6pMNtqMwHGEHTEY0rSYAtIhpAn2Etv/idyreQ= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 155541217462743.79177662191876; Tue, 16 Apr 2019 03:56:14 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E387280462; Tue, 16 Apr 2019 10:56:12 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B786F19C6A; Tue, 16 Apr 2019 10:56:12 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 7972D3FB15; Tue, 16 Apr 2019 10:56:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x3GAuB6X016094 for ; Tue, 16 Apr 2019 06:56:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2886C608A4; Tue, 16 Apr 2019 10:56:11 +0000 (UTC) Received: from kinshicho.redhat.com (ovpn-204-253.brq.redhat.com [10.40.204.253]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 736B0608F2 for ; Tue, 16 Apr 2019 10:56:10 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Tue, 16 Apr 2019 12:55:59 +0200 Message-Id: <20190416105600.1534-4-abologna@redhat.com> In-Reply-To: <20190416105600.1534-1-abologna@redhat.com> References: <20190416105600.1534-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 3/4] tests: Drop dirname argument from testQemuCapsIterate() X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Tue, 16 Apr 2019 10:56:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" As evidenced by all existing callers, the only directory it makes sense to use is TEST_QEMU_CAPS_PATH, so let's just bake that into the function. Signed-off-by: Andrea Bolognani --- tests/qemucapabilitiestest.c | 2 +- tests/qemucaps2xmltest.c | 2 +- tests/testutilsqemu.c | 7 +++---- tests/testutilsqemu.h | 3 +-- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index 4c9b7c5322..5477740339 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -221,7 +221,7 @@ mymain(void) if (testQemuDataInit(&data) < 0) return EXIT_FAILURE; =20 - if (testQemuCapsIterate(data.dataDir, ".replies", doCapsTest, &data) <= 0) + if (testQemuCapsIterate(".replies", doCapsTest, &data) < 0) return EXIT_FAILURE; =20 /* diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c index 7d3c768bfd..59f676ede1 100644 --- a/tests/qemucaps2xmltest.c +++ b/tests/qemucaps2xmltest.c @@ -212,7 +212,7 @@ mymain(void) if (testQemuDataInit(&data) < 0) return EXIT_FAILURE; =20 - if (testQemuCapsIterate(data.inputDir, ".xml", doCapsTest, &data) < 0) + if (testQemuCapsIterate(".xml", doCapsTest, &data) < 0) return EXIT_FAILURE; =20 return (data.ret =3D=3D 0) ? EXIT_SUCCESS : EXIT_FAILURE; diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index ccc05233db..bce847ce5e 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -903,8 +903,7 @@ testQemuGetLatestCaps(void) =20 =20 int -testQemuCapsIterate(const char *dirname, - const char *suffix, +testQemuCapsIterate(const char *suffix, testQemuCapsIterateCallback callback, void *opaque) { @@ -916,10 +915,10 @@ testQemuCapsIterate(const char *dirname, if (!callback) return 0; =20 - if (virDirOpen(&dir, dirname) < 0) + if (virDirOpen(&dir, TEST_QEMU_CAPS_PATH) < 0) goto cleanup; =20 - while ((rc =3D virDirRead(dir, &ent, dirname) > 0)) { + while ((rc =3D virDirRead(dir, &ent, TEST_QEMU_CAPS_PATH) > 0)) { char *tmp =3D ent->d_name; char *base =3D NULL; char *archName =3D NULL; diff --git a/tests/testutilsqemu.h b/tests/testutilsqemu.h index 949e98f591..25dedb5edd 100644 --- a/tests/testutilsqemu.h +++ b/tests/testutilsqemu.h @@ -99,8 +99,7 @@ virHashTablePtr testQemuGetLatestCaps(void); typedef int (*testQemuCapsIterateCallback)(const char *base, const char *archName, void *opaque); -int testQemuCapsIterate(const char *dirname, - const char *suffix, +int testQemuCapsIterate(const char *suffix, testQemuCapsIterateCallback callback, void *opaque); =20 --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list