From nobody Sun Feb 8 15:46:31 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=1629217574; cv=none; d=zohomail.com; s=zohoarc; b=PDiJobpsaBDC0zqoJ98eYg83/PDH2v6Fh+VPCZ83c1FeaVM1bbzk9yItehdrR8z2eWfW54XXhIyLms3IrFjqR3lWZhLIEBw9Ir9TvLfBAYcE/iyDtKBI6EecguSLiWj14wnQt1beWTCic0afh8rK4SykwHhbN/D6fGH+hJK3IZY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629217574; 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=v/K25mHuWusquqBOAS4SP9uRagcogiCD9PT64n5lzY8=; b=grVfZaJ/W6cKeDE387b7YAtUQYkuruqpq3gs9Va81O6403nB58PxW1FPcOy5GZKE+tfUmzhmWx2tXQaFVkCTK8xZ+QLBL/+DExIbpun2w1pOdvocsd1b2GCe6FFsNaojDgdmVRpOaWDJELrYvgeekqXd65dIzX9EUb5o8QnpwjQ= 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 1629217574501888.6053289926629; Tue, 17 Aug 2021 09:26:14 -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-528-rWbFSX-QOuC4GCVBQOnuVA-1; Tue, 17 Aug 2021 12:26:11 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DD4051008069; Tue, 17 Aug 2021 16:26:00 +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 C06E16E6E7; Tue, 17 Aug 2021 16:26:00 +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 89C6B181A2AD; Tue, 17 Aug 2021 16:26:00 +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 17HGPdBc020256 for ; Tue, 17 Aug 2021 12:25:39 -0400 Received: by smtp.corp.redhat.com (Postfix) id AA166421F; Tue, 17 Aug 2021 16:25:39 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0DD60620DE for ; Tue, 17 Aug 2021 16:25:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629217573; 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=v/K25mHuWusquqBOAS4SP9uRagcogiCD9PT64n5lzY8=; b=BBl4FBDm23BL4b8vVnvbNyi8kl1Xiu9RpIoWwk07CrCUiSn1Tv9WukqlhO+zPb1To4rrgz zW2I4FcoIy/uM6fGgSPPD4Xgk64JOWnQYYjLNMMLwDHby9z48wOAZzvM4d51s/KAatKEx+ QXuXtnhyU34zfPdA2fGIEkCoATTieqA= X-MC-Unique: rWbFSX-QOuC4GCVBQOnuVA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 08/23] qemuxml2argvtest: Rename DO_TEST_INTERNAL to DO_TEST_FULL and fix users Date: Tue, 17 Aug 2021 18:25:09 +0200 Message-Id: <4d32d44cd3dcb294e2138f70123bbf658f7d1a7c.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.79 on 10.5.11.11 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: 1629217576145100003 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/qemuxml2argvtest.c | 83 +++++++++++++++++++++------------------- 1 file changed, 43 insertions(+), 40 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 6162ebf3bb..6869eb6d86 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -936,7 +936,7 @@ mymain(void) * the test cases should be forked using DO_TEST_CAPS_VER with the appropr= iate * version. */ -# define DO_TEST_INTERNAL(_name, _suffix, ...) \ +# define DO_TEST_FULL(_name, _suffix, ...) \ do { \ static struct testQemuInfo info =3D { \ .name =3D _name, \ @@ -953,11 +953,11 @@ mymain(void) } while (0) # define DO_TEST_CAPS_INTERNAL(name, arch, ver, ...) \ - DO_TEST_INTERNAL(name, "." arch "-" ver, \ - ARG_CAPS_ARCH, arch, \ - ARG_CAPS_VER, ver, \ - __VA_ARGS__, \ - ARG_END) + 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__) @@ -1008,31 +1008,26 @@ mymain(void) # define DO_TEST_CAPS_VER_PARSE_ERROR(name, ver) \ DO_TEST_CAPS_ARCH_VER_PARSE_ERROR(name, "x86_64", ver) -# define DO_TEST_FULL(name, ...) \ - DO_TEST_INTERNAL(name, "", \ - __VA_ARGS__, ARG_END) - /* All the following macros require an explicit QEMU_CAPS_* list * at the end of the argument list, or the NONE placeholder. * */ # define DO_TEST(name, ...) \ - DO_TEST_FULL(name, \ - ARG_QEMU_CAPS, __VA_ARGS__, QEMU_CAPS_LAST) + DO_TEST_FULL(name, "", ARG_QEMU_CAPS, __VA_ARGS__, QEMU_CAPS_LAST, ARG= _END) # define DO_TEST_GIC(name, gic, ...) \ - DO_TEST_FULL(name, \ + DO_TEST_FULL(name, "", \ ARG_GIC, gic, \ - ARG_QEMU_CAPS, __VA_ARGS__, QEMU_CAPS_LAST) + ARG_QEMU_CAPS, __VA_ARGS__, QEMU_CAPS_LAST, ARG_END) # define DO_TEST_FAILURE(name, ...) \ - DO_TEST_FULL(name, \ + DO_TEST_FULL(name, "", \ ARG_FLAGS, FLAG_EXPECT_FAILURE, \ - ARG_QEMU_CAPS, __VA_ARGS__, QEMU_CAPS_LAST) + ARG_QEMU_CAPS, __VA_ARGS__, QEMU_CAPS_LAST, ARG_END) # define DO_TEST_PARSE_ERROR(name, ...) \ - DO_TEST_FULL(name, \ + DO_TEST_FULL(name, "", \ ARG_FLAGS, FLAG_EXPECT_PARSE_ERROR | FLAG_EXPECT_FAILURE,= \ - ARG_QEMU_CAPS, __VA_ARGS__, QEMU_CAPS_LAST) + ARG_QEMU_CAPS, __VA_ARGS__, QEMU_CAPS_LAST, ARG_END) # define NONE QEMU_CAPS_LAST @@ -2014,25 +2009,28 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("hostdev-subsys-mdev-vfio-ap-boot= -fail", "s390x"); - DO_TEST_FULL("restore-v2", + DO_TEST_FULL("restore-v2", "", ARG_MIGRATE_FROM, "exec:cat", - ARG_MIGRATE_FD, 7); - DO_TEST_FULL("restore-v2-fd", + ARG_MIGRATE_FD, 7, + ARG_END); + DO_TEST_FULL("restore-v2-fd", "", ARG_MIGRATE_FROM, "stdio", - ARG_MIGRATE_FD, 7); - DO_TEST_FULL("restore-v2-fd", + ARG_MIGRATE_FD, 7, + ARG_END); + DO_TEST_FULL("restore-v2-fd", "", ARG_MIGRATE_FROM, "fd:7", - ARG_MIGRATE_FD, 7); - DO_TEST_FULL("migrate", - ARG_MIGRATE_FROM, "tcp:10.0.0.1:5000"); + ARG_MIGRATE_FD, 7, ARG_END); + DO_TEST_FULL("migrate", "", + ARG_MIGRATE_FROM, "tcp:10.0.0.1:5000", ARG_END); - DO_TEST_FULL("migrate-numa-unaligned", + DO_TEST_FULL("migrate-numa-unaligned", "", ARG_MIGRATE_FROM, "stdio", ARG_MIGRATE_FD, 7, ARG_QEMU_CAPS, QEMU_CAPS_NUMA, QEMU_CAPS_OBJECT_MEMORY_RAM, - QEMU_CAPS_LAST); + QEMU_CAPS_LAST, + ARG_END); DO_TEST_CAPS_VER("qemu-ns", "4.0.0"); DO_TEST_CAPS_LATEST("qemu-ns"); @@ -2076,10 +2074,11 @@ mymain(void) DO_TEST("cpu-numa-memshared", QEMU_CAPS_OBJECT_MEMORY_FILE); DO_TEST("cpu-host-model", NONE); DO_TEST("cpu-host-model-vendor", NONE); - DO_TEST_FULL("cpu-host-model-fallback", - ARG_FLAGS, FLAG_SKIP_LEGACY_CPUS); - DO_TEST_FULL("cpu-host-model-nofallback", - ARG_FLAGS, FLAG_SKIP_LEGACY_CPUS | FLAG_EXPECT_FAILURE); + DO_TEST_FULL("cpu-host-model-fallback", "", + ARG_FLAGS, FLAG_SKIP_LEGACY_CPUS, ARG_END); + DO_TEST_FULL("cpu-host-model-nofallback", "", + ARG_FLAGS, FLAG_SKIP_LEGACY_CPUS | FLAG_EXPECT_FAILURE, + ARG_END); DO_TEST("cpu-host-passthrough", QEMU_CAPS_KVM); DO_TEST_FAILURE("cpu-qemu-host-passthrough", QEMU_CAPS_KVM); @@ -3100,14 +3099,15 @@ 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", + DO_TEST_FULL("memory-hotplug-ppc64-nonuma-abi-update", "", 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_LAST, + ARG_END); DO_TEST_CAPS_LATEST("memory-hotplug-nvdimm"); DO_TEST_CAPS_LATEST("memory-hotplug-nvdimm-access"); DO_TEST_CAPS_VER("memory-hotplug-nvdimm-label", "5.2.0"); @@ -3121,13 +3121,14 @@ 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", + DO_TEST_FULL("memory-hotplug-nvdimm-ppc64-abi-update", "", 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_VER("memory-hotplug-virtio-pmem", "5.2.0"); DO_TEST_CAPS_LATEST("memory-hotplug-virtio-pmem"); @@ -3239,13 +3240,14 @@ mymain(void) DO_TEST("ppc64-usb-controller-legacy", QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_PIIX3_USB_UHCI); - DO_TEST_FULL("ppc64-usb-controller-qemu-xhci", + DO_TEST_FULL("ppc64-usb-controller-qemu-xhci", "", ARG_PARSEFLAGS, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, ARG_QEMU_CAPS, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_NEC_USB_XHCI, QEMU_CAPS_DEVICE_QEMU_XHCI, - QEMU_CAPS_LAST); + QEMU_CAPS_LAST, + ARG_END); DO_TEST_PARSE_ERROR("ppc64-tpmproxy-double", QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, @@ -3280,9 +3282,10 @@ mymain(void) * the wrong binary for the arch. We expect to get a failure about * bad arch later when creating the pretend command. */ - DO_TEST_FULL("missing-machine", + DO_TEST_FULL("missing-machine", "", ARG_FLAGS, FLAG_EXPECT_FAILURE, - ARG_PARSEFLAGS, VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE); + ARG_PARSEFLAGS, VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE, + ARG_END); DO_TEST("name-escape", QEMU_CAPS_NAME_DEBUG_THREADS, --=20 2.31.1