From nobody Mon Feb 9 23:00:35 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 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=1571827427; cv=none; d=zoho.com; s=zohoarc; b=F+USu2sUsZ2kJ1R01fZdJQbA5fZtZPCjxSpNZSc42FGZTqQ2lz+XE27pd/KQbO8GGGe/c+8c6n7j0BPQxYLxAkRk8hjxdKpFmctVKzNy4zCZOcAOrLac6bINy9baMTZjbk7AtzyhYOjPrdKCscuDjPg5V7cJ0md//tLu6jXzIDo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571827427; 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; bh=sjefGXGNdOOoJM0X9xNIc9f5Z05H4kwY1LOe1Psdu5c=; b=ndTFpQmuo51rlVpeZ3Qqbt5PhMoXvIiB0F3S1elfBG08bksLD4OVGjoZxp4TxH9br7ia7LoeQ3qh/gZVQQ/CoJ1RcRLR44VwaqkKuI1vg/422daLcGi40EL0fgzqRqxwOYj8F/za7DBzsQcB4Iq8ncVymzkmzm9DgQqRsXZi8E4= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 157182742717115.568818054481426; Wed, 23 Oct 2019 03:43:47 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-102-Vsaqf15JMfubtchysjw5cw-1; Wed, 23 Oct 2019 06:43:44 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6814D1800E01; Wed, 23 Oct 2019 10:43:38 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C88BB60E1C; Wed, 23 Oct 2019 10:43:36 +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 69FB4180BAA2; Wed, 23 Oct 2019 10:43:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9NAhI2A020268 for ; Wed, 23 Oct 2019 06:43:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id BC956BA79; Wed, 23 Oct 2019 10:43:18 +0000 (UTC) Received: from kinshicho.redhat.com (unknown [10.40.205.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2637360E1C for ; Wed, 23 Oct 2019 10:43:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571827426; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=sjefGXGNdOOoJM0X9xNIc9f5Z05H4kwY1LOe1Psdu5c=; b=RyQK82dveoD964AwoPityf4ARKxtc3KCXjX5bZbQmhrfSR9dty2Q1q+lFwp1gvdpVVoDuC uCcElwBQp9tYKXe26y52QmWucDQIJy7oXlWvmSEvsFUF5aOpr9PjO8y+fHeT4z0z6vUqPk 1iMJNwvmUKb6lMCHA1tr/72SARWEo5I= From: Andrea Bolognani To: libvir-list@redhat.com Date: Wed, 23 Oct 2019 12:42:55 +0200 Message-Id: <20191023104302.26669-6-abologna@redhat.com> In-Reply-To: <20191023104302.26669-1-abologna@redhat.com> References: <20191023104302.26669-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 05/12] tests: testQemuCapsIterate: Pass suffix to callback 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: Vsaqf15JMfubtchysjw5cw-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Right now users need to hardcode the suffix, which is not a big deal since they're the ones who passed it to testQemuCapsIterate() in the first place; however, since we're already passing most of the information to the callback and we're going to add more later on, it makes sense to be consistent and pass the suffix too. Signed-off-by: Andrea Bolognani --- tests/qemucapabilitiestest.c | 8 ++++++-- tests/qemucaps2xmltest.c | 8 ++++++-- tests/testutilsqemu.c | 11 +++++++++-- tests/testutilsqemu.h | 1 + 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index 6b8d2676e3..cc2242df50 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -38,6 +38,7 @@ struct _testQemuData { const char *inputDir; const char *outputDir; const char *archName; + const char *suffix; const char *base; int ret; }; @@ -77,8 +78,9 @@ testQemuCaps(const void *opaque) unsigned int fakeMicrocodeVersion =3D 0; const char *p; =20 - if (virAsprintf(&repliesFile, "%s/%s.%s.replies", - data->inputDir, data->base, data->archName) < 0 || + if (virAsprintf(&repliesFile, "%s/%s.%s.%s", + data->inputDir, data->base, + data->archName, data->suffix) < 0 || virAsprintf(&capsFile, "%s/%s.%s.xml", data->outputDir, data->base, data->archName) < 0) goto cleanup; @@ -182,6 +184,7 @@ static int doCapsTest(const char *inputDir, const char *base, const char *archName, + const char *suffix, void *opaque) { testQemuDataPtr data =3D (testQemuDataPtr) opaque; @@ -196,6 +199,7 @@ doCapsTest(const char *inputDir, data->inputDir =3D inputDir; data->base =3D base; data->archName =3D archName; + data->suffix =3D suffix; =20 if (virTestRun(title, testQemuCaps, data) < 0) data->ret =3D -1; diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c index 8985b20ac6..7a41e9cdd3 100644 --- a/tests/qemucaps2xmltest.c +++ b/tests/qemucaps2xmltest.c @@ -33,6 +33,7 @@ struct _testQemuData { const char *outputDir; const char *base; const char *archName; + const char *suffix; int ret; }; =20 @@ -145,8 +146,9 @@ testQemuCapsXML(const void *opaque) data->outputDir, data->archName) < 0) goto cleanup; =20 - if (virAsprintf(&capsFile, "%s/%s.%s.xml", - data->inputDir, data->base, data->archName) < 0) + if (virAsprintf(&capsFile, "%s/%s.%s.%s", + data->inputDir, data->base, + data->archName, data->suffix) < 0) goto cleanup; =20 if (virTestLoadFile(capsFile, &capsData) < 0) @@ -176,6 +178,7 @@ static int doCapsTest(const char *inputDir, const char *base, const char *archName, + const char *suffix, void *opaque) { testQemuDataPtr data =3D (testQemuDataPtr) opaque; @@ -187,6 +190,7 @@ doCapsTest(const char *inputDir, data->inputDir =3D inputDir; data->base =3D base; data->archName =3D archName; + data->suffix =3D suffix; =20 if (virTestRun(title, testQemuCapsXML, data) < 0) data->ret =3D -1; diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 75c8180c7a..1f0270f488 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -936,9 +936,16 @@ testQemuCapsIterate(const char *suffix, archName[0] =3D '\0'; archName++; =20 - /* Run the user-provided callback */ - if (callback(TEST_QEMU_CAPS_PATH, base, archName, opaque) < 0) + /* Run the user-provided callback. + * + * We skip the dot that, as verified earlier, starts the suffix + * to make it nicer to rebuild the original file name from inside + * the callback. + */ + if (callback(TEST_QEMU_CAPS_PATH, base, + archName, suffix + 1, opaque) < 0) { goto cleanup; + } } =20 if (rc < 0) diff --git a/tests/testutilsqemu.h b/tests/testutilsqemu.h index 07373f8ce6..2c8c4960e9 100644 --- a/tests/testutilsqemu.h +++ b/tests/testutilsqemu.h @@ -99,6 +99,7 @@ virHashTablePtr testQemuGetLatestCaps(void); typedef int (*testQemuCapsIterateCallback)(const char *inputDir, const char *base, const char *archName, + const char *suffix, void *opaque); int testQemuCapsIterate(const char *suffix, testQemuCapsIterateCallback callback, --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list