From nobody Mon Feb 9 12:25:58 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 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=1692889383; cv=none; d=zohomail.com; s=zohoarc; b=J5+siTdtCgGFzwzWTIaMpNvEnZHTpYmbu6Hy/b4s0HpBxkw5tLBbwdokYcxR48hId28QcRlAMMqzOmGwx+hiPJqvzrPioscWh0ANxBMInBVFt2lk/z6XcWuEy06dmi6TUSOUmfiC3gZuH3xttzL0xglZELizuhwEQqma2fVYTQ4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692889383; 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=GOLoJL9eqx4o0oQfqbnxSbFkKDLCq+XiEJDH2Rmux4A=; b=Xq73gCNezXwZPTdtUiANeM+V5/KXCskxidbrG1ACMhXNNzedIPrgE/iCduXI3/aUx+5mqqVtlUdTMOz4LzTzlXL2ceoovizLIgwrPOy22WlcmqREe2dcAoK5LmXJk6tnYZU769+ECjbcrMBHnbUyu92l+sp/f3ii5MBFDy9/W9Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1692889383782721.7996397573702; Thu, 24 Aug 2023 08:03:03 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-142-EtwSbmMAPZKX_osAqJevNA-1; Thu, 24 Aug 2023 11:02:57 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BE500185A792; Thu, 24 Aug 2023 15:02:52 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id AB70A6B59D; Thu, 24 Aug 2023 15:02:52 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 7FF0219465A0; Thu, 24 Aug 2023 15:02:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 108FA1946589 for ; Thu, 24 Aug 2023 15:02:51 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id CAEC82166B26; Thu, 24 Aug 2023 15:02:45 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5730A2166B2F for ; Thu, 24 Aug 2023 15:02:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692889382; 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=GOLoJL9eqx4o0oQfqbnxSbFkKDLCq+XiEJDH2Rmux4A=; b=emt580cPViJ0gkzNwr1TczIeauIYp8SEAf5SeQB85pjWqvapEnGAUS3LmWguvR1+bwNRW6 uDVr2xeL14GWu3wUVuHJLiGFPCdFgOorFlCfoL8rHuD7Jow4lQCtk+x77cMSyxKRT3pwMr emK1nVDOBH48Z3GOPXMltzWaXUue98k= X-MC-Unique: EtwSbmMAPZKX_osAqJevNA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 5/5] qemuxml2xmltest: Merge DO_TEST macro into DO_TEST_CAPS_INTERNAL Date: Thu, 24 Aug 2023 17:02:40 +0200 Message-ID: <26883f7bd526e1a298feff3be73f7f3ebc5528d7.1692889197.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1692889445722100001 Content-Type: text/plain; charset="utf-8" Now all tests invoke a real-capability version. Remove DO_TEST. Signed-off-by: Peter Krempa --- tests/qemuxml2xmltest.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index f6be677694..895e24d522 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -146,28 +146,24 @@ mymain(void) virSetConnectSecret(conn); virSetConnectStorage(conn); -#define DO_TEST_FULL(_name, suffix, ...) \ +#define DO_TEST_CAPS_INTERNAL(_name, arch, ver, ...) \ do { \ static struct testQemuInfo info =3D { \ .name =3D _name, \ }; \ - testQemuInfoSetArgs(&info, &testConf, __VA_ARGS__); \ + testQemuInfoSetArgs(&info, &testConf, \ + ARG_CAPS_ARCH, arch, \ + ARG_CAPS_VER, ver, \ + __VA_ARGS__, ARG_END); \ \ - testInfoSetPaths(&info, suffix, "inactive"); \ + testInfoSetPaths(&info, "." arch "-" ver, "inactive"); \ virTestRunLog(&ret, "QEMU XML-2-XML-inactive " _name, testXML2XMLI= nactive, &info); \ \ - testInfoSetPaths(&info, suffix, "active"); \ + testInfoSetPaths(&info, "." arch "-" ver, "active"); \ virTestRunLog(&ret, "QEMU XML-2-XML-active " _name, testXML2XMLAct= ive, &info); \ testQemuInfoClear(&info); \ } while (0) -#define DO_TEST_CAPS_INTERNAL(name, arch, ver, ...) \ - DO_TEST_FULL(name, "." arch "-" ver, \ - ARG_CAPS_ARCH, arch, \ - ARG_CAPS_VER, ver, \ - __VA_ARGS__, \ - ARG_END) - #define DO_TEST_CAPS_ARCH_LATEST_FULL(name, arch, ...) \ DO_TEST_CAPS_INTERNAL(name, arch, "latest", __VA_ARGS__) --=20 2.41.0