From nobody Sun Feb 8 13:32:49 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=1629217575; cv=none; d=zohomail.com; s=zohoarc; b=mQZB239ICsU9jqaFfxcznota7hBGcsxxeomgB53wPlY9WBuFjBpF47L28nhJXQQ5zmarTYGv5fIssp4Of6eBWrx2bEf2fWle4XreYx9KeBkbRxS+oSfTcou3DSmS6YJWZ2drZxGVQo4+M6dmJjlxGIpdgFxE/Gcp/NYvBCgK4XI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629217575; 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=sdJQFYaz/0xFIeMHUzJboMzfzCrH9Q5fOsR5ZQ42oF0=; b=EyuNYuD5MNrofkpQu1U54IzxS08RpTYL7210KWPBDnCo+cMu7evOjco9HaNkWtz4b+Xbv9Enac6YsUGVYFokK8jAJgPvLOC7e6XAxKkU9jMyqLskUlv+AxyB/lblXGmp9EUKflzbtS1vccxqXCzECoMOOFh9L5lgnPCK3DGszt4= 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 1629217575503697.2311565399986; Tue, 17 Aug 2021 09:26:15 -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-536--Hcu9R9XP8S8WkezjNVsUA-1; Tue, 17 Aug 2021 12:26:12 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 90B6D94DCD; Tue, 17 Aug 2021 16:26:06 +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 6BC81131CC; Tue, 17 Aug 2021 16:26:06 +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 37FFF181A3ED; Tue, 17 Aug 2021 16:26:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17HGPjZv020326 for ; Tue, 17 Aug 2021 12:25:45 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6892F421F; Tue, 17 Aug 2021 16:25:45 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id CAEF8620DE for ; Tue, 17 Aug 2021 16:25:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629217574; 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=sdJQFYaz/0xFIeMHUzJboMzfzCrH9Q5fOsR5ZQ42oF0=; b=eCgdyfC+/SnAP3y/8wXM1la6VjjS1m112u5/tmFSje3BPiU4jivO+pRy2gFI0vZKqaW2d3 u7fxLXMyBwUDmQd0A5BOxzwLFfDqOnabAYJHZw3HE1s9Qof75KGomVxOcxSxTD+QUUZXKE XIGa+eHBbWj1UZji967l7d+SmG69pw4= X-MC-Unique: -Hcu9R9XP8S8WkezjNVsUA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 13/23] qemuxml2xmltest: Rename DO_TEST_INTERNAL to DO_TEST_FULL and fix users Date: Tue, 17 Aug 2021 18:25:14 +0200 Message-Id: <3d553270f0e465e5ec00fefff59d3c986c1e171f.1629217367.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com 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.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com 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: 1629217576419100005 Content-Type: text/plain; charset="utf-8" 'DO_TEST_FULL' isn't a useful wrapper any more. Use the better name for the main macro and replace all uses. Signed-off-by: Peter Krempa --- tests/qemuxml2xmltest.c | 132 ++++++++++++++++++++-------------------- 1 file changed, 65 insertions(+), 67 deletions(-) diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 598c5d8e70..529a4b5485 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -146,7 +146,7 @@ mymain(void) virSetConnectSecret(conn); virSetConnectStorage(conn); -#define DO_TEST_INTERNAL(_name, suffix, when, ...) \ +#define DO_TEST_FULL(_name, suffix, when, ...) \ do { \ static struct testQemuInfo info =3D { \ .name =3D _name, \ @@ -174,11 +174,11 @@ mymain(void) } while (0) #define DO_TEST_CAPS_INTERNAL(name, arch, ver, ...) \ - DO_TEST_INTERNAL(name, "." arch "-" ver, WHEN_BOTH, \ - ARG_CAPS_ARCH, arch, \ - ARG_CAPS_VER, ver, \ - __VA_ARGS__, \ - ARG_END) + DO_TEST_FULL(name, "." arch "-" ver, WHEN_BOTH, \ + 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__) @@ -198,12 +198,9 @@ mymain(void) #define DO_TEST_CAPS_VER(name, ver) \ DO_TEST_CAPS_ARCH_VER(name, "x86_64", ver) -#define DO_TEST_FULL(name, when, ...) \ - DO_TEST_INTERNAL(name, "", when, __VA_ARGS__, ARG_END) - #define DO_TEST(name, ...) \ - DO_TEST_FULL(name, WHEN_BOTH, \ - ARG_QEMU_CAPS, __VA_ARGS__, QEMU_CAPS_LAST) + DO_TEST_FULL(name, "", WHEN_BOTH, \ + ARG_QEMU_CAPS, __VA_ARGS__, QEMU_CAPS_LAST, ARG_END) #define NONE QEMU_CAPS_LAST @@ -620,24 +617,25 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("ppc64-tpmproxy-single", "ppc64"); DO_TEST_CAPS_ARCH_LATEST("ppc64-tpmproxy-with-tpm", "ppc64"); - DO_TEST_FULL("seclabel-dynamic-baselabel", WHEN_INACTIVE, - ARG_QEMU_CAPS, NONE); - DO_TEST_FULL("seclabel-dynamic-override", WHEN_INACTIVE, - ARG_QEMU_CAPS, NONE); - DO_TEST_FULL("seclabel-dynamic-labelskip", WHEN_INACTIVE, - ARG_QEMU_CAPS, NONE); - DO_TEST_FULL("seclabel-dynamic-relabel", WHEN_INACTIVE, - ARG_QEMU_CAPS, NONE); + DO_TEST_FULL("seclabel-dynamic-baselabel", "", WHEN_INACTIVE, + ARG_QEMU_CAPS, NONE, ARG_END); + DO_TEST_FULL("seclabel-dynamic-override", "", WHEN_INACTIVE, + ARG_QEMU_CAPS, NONE, ARG_END); + DO_TEST_FULL("seclabel-dynamic-labelskip", "", WHEN_INACTIVE, + ARG_QEMU_CAPS, NONE, ARG_END); + DO_TEST_FULL("seclabel-dynamic-relabel", "", WHEN_INACTIVE, + ARG_QEMU_CAPS, NONE, ARG_END); DO_TEST("seclabel-static", NONE); DO_TEST("seclabel-static-labelskip", NONE); DO_TEST("seclabel-none", NONE); DO_TEST("seclabel-dac-none", NONE); DO_TEST("seclabel-dynamic-none", NONE); DO_TEST("seclabel-device-multiple", NONE); - DO_TEST_FULL("seclabel-dynamic-none-relabel", WHEN_INACTIVE, + DO_TEST_FULL("seclabel-dynamic-none-relabel", "", WHEN_INACTIVE, ARG_QEMU_CAPS, QEMU_CAPS_DEVICE_CIRRUS_VGA, QEMU_CAPS_OBJECT_MEMORY_FILE, - QEMU_CAPS_SPICE, NONE); + QEMU_CAPS_SPICE, NONE, + ARG_END); DO_TEST("numad-static-vcpu-no-numatune", NONE); DO_TEST("disk-scsi-lun-passthrough-sgio", @@ -1163,69 +1161,69 @@ mymain(void) QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_VNC); - DO_TEST_FULL("aarch64-gic-none", WHEN_BOTH, + DO_TEST_FULL("aarch64-gic-none", "", WHEN_BOTH, ARG_GIC, GIC_NONE, - ARG_QEMU_CAPS, NONE); - DO_TEST_FULL("aarch64-gic-none-v2", WHEN_BOTH, + ARG_QEMU_CAPS, NONE, ARG_END); + DO_TEST_FULL("aarch64-gic-none-v2", "", WHEN_BOTH, ARG_GIC, GIC_V2, - ARG_QEMU_CAPS, NONE); - DO_TEST_FULL("aarch64-gic-none-v3", WHEN_BOTH, + ARG_QEMU_CAPS, NONE, ARG_END); + DO_TEST_FULL("aarch64-gic-none-v3", "", WHEN_BOTH, ARG_GIC, GIC_V3, - ARG_QEMU_CAPS, NONE); - DO_TEST_FULL("aarch64-gic-none-both", WHEN_BOTH, + ARG_QEMU_CAPS, NONE, ARG_END); + DO_TEST_FULL("aarch64-gic-none-both", "", WHEN_BOTH, ARG_GIC, GIC_BOTH, - ARG_QEMU_CAPS, NONE); - DO_TEST_FULL("aarch64-gic-none-tcg", WHEN_BOTH, + ARG_QEMU_CAPS, NONE, ARG_END); + DO_TEST_FULL("aarch64-gic-none-tcg", "", WHEN_BOTH, ARG_GIC, GIC_BOTH, - ARG_QEMU_CAPS, NONE); - DO_TEST_FULL("aarch64-gic-default", WHEN_BOTH, + ARG_QEMU_CAPS, NONE, ARG_END); + DO_TEST_FULL("aarch64-gic-default", "", WHEN_BOTH, ARG_GIC, GIC_NONE, - ARG_QEMU_CAPS, NONE); - DO_TEST_FULL("aarch64-gic-default-v2", WHEN_BOTH, + ARG_QEMU_CAPS, NONE, ARG_END); + DO_TEST_FULL("aarch64-gic-default-v2", "", WHEN_BOTH, ARG_GIC, GIC_V2, - ARG_QEMU_CAPS, NONE); - DO_TEST_FULL("aarch64-gic-default-v3", WHEN_BOTH, + ARG_QEMU_CAPS, NONE, ARG_END); + DO_TEST_FULL("aarch64-gic-default-v3", "", WHEN_BOTH, ARG_GIC, GIC_V3, - ARG_QEMU_CAPS, NONE); - DO_TEST_FULL("aarch64-gic-default-both", WHEN_BOTH, + ARG_QEMU_CAPS, NONE, ARG_END); + DO_TEST_FULL("aarch64-gic-default-both", "", WHEN_BOTH, ARG_GIC, GIC_BOTH, - ARG_QEMU_CAPS, NONE); - DO_TEST_FULL("aarch64-gic-v2", WHEN_BOTH, + ARG_QEMU_CAPS, NONE, ARG_END); + DO_TEST_FULL("aarch64-gic-v2", "", WHEN_BOTH, ARG_GIC, GIC_NONE, - ARG_QEMU_CAPS, NONE); - DO_TEST_FULL("aarch64-gic-v2", WHEN_BOTH, + ARG_QEMU_CAPS, NONE, ARG_END); + DO_TEST_FULL("aarch64-gic-v2", "", WHEN_BOTH, ARG_GIC, GIC_V2, - ARG_QEMU_CAPS, NONE); - DO_TEST_FULL("aarch64-gic-v2", WHEN_BOTH, + ARG_QEMU_CAPS, NONE, ARG_END); + DO_TEST_FULL("aarch64-gic-v2", "", WHEN_BOTH, ARG_GIC, GIC_V3, - ARG_QEMU_CAPS, NONE); - DO_TEST_FULL("aarch64-gic-v2", WHEN_BOTH, + ARG_QEMU_CAPS, NONE, ARG_END); + DO_TEST_FULL("aarch64-gic-v2", "", WHEN_BOTH, ARG_GIC, GIC_BOTH, - ARG_QEMU_CAPS, NONE); - DO_TEST_FULL("aarch64-gic-v3", WHEN_BOTH, + ARG_QEMU_CAPS, NONE, ARG_END); + DO_TEST_FULL("aarch64-gic-v3", "", WHEN_BOTH, ARG_GIC, GIC_NONE, - ARG_QEMU_CAPS, NONE); - DO_TEST_FULL("aarch64-gic-v3", WHEN_BOTH, + ARG_QEMU_CAPS, NONE, ARG_END); + DO_TEST_FULL("aarch64-gic-v3", "", WHEN_BOTH, ARG_GIC, GIC_V2, - ARG_QEMU_CAPS, NONE); - DO_TEST_FULL("aarch64-gic-v3", WHEN_BOTH, + ARG_QEMU_CAPS, NONE, ARG_END); + DO_TEST_FULL("aarch64-gic-v3", "", WHEN_BOTH, ARG_GIC, GIC_V3, - ARG_QEMU_CAPS, NONE); - DO_TEST_FULL("aarch64-gic-v3", WHEN_BOTH, + ARG_QEMU_CAPS, NONE, ARG_END); + DO_TEST_FULL("aarch64-gic-v3", "", WHEN_BOTH, ARG_GIC, GIC_BOTH, - ARG_QEMU_CAPS, NONE); - DO_TEST_FULL("aarch64-gic-host", WHEN_BOTH, + ARG_QEMU_CAPS, NONE, ARG_END); + DO_TEST_FULL("aarch64-gic-host", "", WHEN_BOTH, ARG_GIC, GIC_NONE, - ARG_QEMU_CAPS, NONE); - DO_TEST_FULL("aarch64-gic-host", WHEN_BOTH, + ARG_QEMU_CAPS, NONE, ARG_END); + DO_TEST_FULL("aarch64-gic-host", "", WHEN_BOTH, ARG_GIC, GIC_V2, - ARG_QEMU_CAPS, NONE); - DO_TEST_FULL("aarch64-gic-host", WHEN_BOTH, + ARG_QEMU_CAPS, NONE, ARG_END); + DO_TEST_FULL("aarch64-gic-host", "", WHEN_BOTH, ARG_GIC, GIC_V3, - ARG_QEMU_CAPS, NONE); - DO_TEST_FULL("aarch64-gic-host", WHEN_BOTH, + ARG_QEMU_CAPS, NONE, ARG_END); + DO_TEST_FULL("aarch64-gic-host", "", WHEN_BOTH, ARG_GIC, GIC_BOTH, - ARG_QEMU_CAPS, NONE); + ARG_QEMU_CAPS, NONE, ARG_END); /* SVE aarch64 CPU features work on modern QEMU */ DO_TEST_CAPS_ARCH_LATEST("aarch64-features-sve", "aarch64"); @@ -1233,13 +1231,13 @@ mymain(void) DO_TEST("memory-hotplug-ppc64-nonuma", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE= _PC_DIMM, QEMU_CAPS_NUMA, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_OBJECT_MEMORY_FILE); - DO_TEST_FULL("memory-hotplug-ppc64-nonuma-abi-update", WHEN_BOTH, + DO_TEST_FULL("memory-hotplug-ppc64-nonuma-abi-update", "", WHEN_BOTH, ARG_PARSEFLAGS, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, ARG_QEMU_CAPS, QEMU_CAPS_KVM, QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_NUMA, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_OBJECT_MEMORY_RAM, - QEMU_CAPS_OBJECT_MEMORY_FILE, QEMU_CAPS_LAST); + QEMU_CAPS_OBJECT_MEMORY_FILE, QEMU_CAPS_LAST, ARG_END); DO_TEST("memory-hotplug", NONE); DO_TEST("memory-hotplug-dimm", QEMU_CAPS_DEVICE_PC_DIMM); DO_TEST("memory-hotplug-nvdimm", QEMU_CAPS_DEVICE_NVDIMM); @@ -1252,13 +1250,13 @@ mymain(void) DO_TEST("memory-hotplug-nvdimm-ppc64", QEMU_CAPS_DEVICE_SPAPR_PCI_HOST= _BRIDGE, QEMU_CAPS_OBJECT_MEMORY_FILE, QEMU_CAPS_DEVICE_NVDIMM); - DO_TEST_FULL("memory-hotplug-nvdimm-ppc64-abi-update", WHEN_BOTH, + DO_TEST_FULL("memory-hotplug-nvdimm-ppc64-abi-update", "", WHEN_BOTH, ARG_PARSEFLAGS, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, ARG_QEMU_CAPS, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_OBJECT_MEMORY_FILE, QEMU_CAPS_DEVICE_NVDIMM, - QEMU_CAPS_LAST); + QEMU_CAPS_LAST, ARG_END); DO_TEST_CAPS_LATEST("memory-hotplug-virtio-pmem"); DO_TEST("net-udp", NONE); --=20 2.31.1