From patchwork Mon Apr 1 16:47:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 161553 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp687926jan; Mon, 1 Apr 2019 09:48:01 -0700 (PDT) X-Google-Smtp-Source: APXvYqyW3YOQpKl8+d8Rs58LjSW4YhSqcNQGH0YKhaDl3dckNXsHNdUEoPp8aQ4/s9qG8Vn4U/iH X-Received: by 2002:ac8:3554:: with SMTP id z20mr53870138qtb.150.1554137281290; Mon, 01 Apr 2019 09:48:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554137281; cv=none; d=google.com; s=arc-20160816; b=C64EExRIPc3pUEQvLANu+X8EMc+4d7GEDfRgZJAHjOVHQjmE2XqUbs9U9350gkHj64 7wvz7nx8Adpjvxn6IivFbgeKonX7DieWpd1rEtbzNdekspJ/hAPbMYFXVX0WyVt9+Wkh VgxBK+PG5PtJO0EuDRp98uUz4tpSDIbhasWcy3YI7pa4Q4cOdB2gRqoSM3uXEv2y0OJv DRBT5QSmHE4ZQBFEC19whBdXKsvZOMNWNU5QWZv3lmqFjSRIoInX5lwBauU1UQAcvu2p nGj/kLCu6JzSfU85OLRRcYGjpnPXgHB64MJWipln/8JXHMjzbkJaKo/FYD05Uy3XjOcm 67fA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :delivered-to; bh=/EGCw53saGFhmG/d1hQ5qvQBsCud7dflzS4KlAvq+R0=; b=kbkUUHTq081pamVxXJ0vI+cCNL4upGTI6AFJW8cBv5AHKh3ENGe59FLE8BuFNOgb7B r0DgyOG/wuC0cFip6lD7skz0kHJb2eh91sFeVH9tH/6u3BXJy98hnWP/MhwpZ/b2mCX7 44bcHgkMnqrZ8x0fL0WU7BamSAmMoNARwqM3i+meQCNZc81xSo8+qnrB+sIYT/8eXAAY ikd3M1ifXkD2iMW1YjWLVn2MfDXUbgO1VjVmVVqJbdJyOG4Ldq8fwKyGSJ5cMD1RP8lv FuqlvnQMVxpe/H5V9H+O4xEhn3psM2WJPxObmJUTwPyorakWGKoTf5CDhylZyExM76JL cLOw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id 94si4140724qtc.15.2019.04.01.09.48.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Apr 2019 09:48:01 -0700 (PDT) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Authentication-Results: mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BE05B3086223; Mon, 1 Apr 2019 16:47:59 +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 95F885D71D; Mon, 1 Apr 2019 16:47:59 +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 58CEC3FA4C; Mon, 1 Apr 2019 16:47:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x31GleDu026762 for ; Mon, 1 Apr 2019 12:47:40 -0400 Received: by smtp.corp.redhat.com (Postfix) id E2F8A5C25A; Mon, 1 Apr 2019 16:47:40 +0000 (UTC) Delivered-To: libvirt-list@redhat.com Received: from worklaptop.redhat.com (ovpn-124-128.rdu2.redhat.com [10.10.124.128]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7C80B5C28C; Mon, 1 Apr 2019 16:47:40 +0000 (UTC) From: Cole Robinson To: libvirt-list@redhat.com Date: Mon, 1 Apr 2019 12:47:27 -0400 Message-Id: <77c18aaabd25aa26c4aa2c41cca0d7ee71f562b8.1554137098.git.crobinso@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 11/12] tests: qemuxml2xml: make GIC handling optional 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Mon, 01 Apr 2019 16:48:00 +0000 (UTC) Make all users of GIC_X use ARG_GIC explicitly, and drop the required gic parameter from DO_TEST_FULL Signed-off-by: Cole Robinson --- tests/qemuxml2xmltest.c | 85 ++++++++++++++++++++++++++--------------- 1 file changed, 55 insertions(+), 30 deletions(-) -- 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index e60c69872a..3b5314df78 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -175,11 +175,10 @@ mymain(void) cfg = virQEMUDriverGetConfig(&driver); -# define DO_TEST_FULL(name, when, gic, ...) \ +# define DO_TEST_FULL(name, when, ...) \ do { \ if (testQemuInfoSetArgs(&info, capslatest, \ - ARG_GIC, gic, \ - ARG_QEMU_CAPS, __VA_ARGS__, QEMU_CAPS_LAST, \ + __VA_ARGS__, \ ARG_END) < 0 || \ qemuTestCapsCacheInsert(driver.qemuCapsCache, info.qemuCaps) < 0) { \ VIR_TEST_DEBUG("Failed to generate test data for '%s'", name); \ @@ -211,7 +210,7 @@ mymain(void) # define NONE QEMU_CAPS_LAST # define DO_TEST(name, ...) \ - DO_TEST_FULL(name, WHEN_BOTH, GIC_NONE, __VA_ARGS__) + DO_TEST_FULL(name, WHEN_BOTH, ARG_QEMU_CAPS, __VA_ARGS__, QEMU_CAPS_LAST) @@ -490,17 +489,22 @@ mymain(void) DO_TEST("blkdeviotune-max-length", NONE); DO_TEST("controller-usb-order", NONE); - DO_TEST_FULL("seclabel-dynamic-baselabel", WHEN_INACTIVE, GIC_NONE, NONE); - DO_TEST_FULL("seclabel-dynamic-override", WHEN_INACTIVE, GIC_NONE, NONE); - DO_TEST_FULL("seclabel-dynamic-labelskip", WHEN_INACTIVE, GIC_NONE, NONE); - DO_TEST_FULL("seclabel-dynamic-relabel", WHEN_INACTIVE, GIC_NONE, NONE); + DO_TEST_FULL("seclabel-dynamic-baselabel", WHEN_INACTIVE, + ARG_QEMU_CAPS, QEMU_CAPS_LAST); + DO_TEST_FULL("seclabel-dynamic-override", WHEN_INACTIVE, + ARG_QEMU_CAPS, QEMU_CAPS_LAST, 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("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, GIC_NONE, NONE); + DO_TEST_FULL("seclabel-dynamic-none-relabel", WHEN_INACTIVE, + ARG_QEMU_CAPS, NONE); DO_TEST("numad-static-vcpu-no-numatune", NONE); DO_TEST("disk-scsi-lun-passthrough-sgio", @@ -1048,27 +1052,48 @@ mymain(void) QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_VNC); - DO_TEST_FULL("aarch64-gic-none", WHEN_BOTH, GIC_NONE, NONE); - DO_TEST_FULL("aarch64-gic-none-v2", WHEN_BOTH, GIC_V2, NONE); - DO_TEST_FULL("aarch64-gic-none-v3", WHEN_BOTH, GIC_V3, NONE); - DO_TEST_FULL("aarch64-gic-none-both", WHEN_BOTH, GIC_BOTH, NONE); - DO_TEST_FULL("aarch64-gic-none-tcg", WHEN_BOTH, GIC_BOTH, NONE); - DO_TEST_FULL("aarch64-gic-default", WHEN_BOTH, GIC_NONE, NONE); - DO_TEST_FULL("aarch64-gic-default-v2", WHEN_BOTH, GIC_V2, NONE); - DO_TEST_FULL("aarch64-gic-default-v3", WHEN_BOTH, GIC_V3, NONE); - DO_TEST_FULL("aarch64-gic-default-both", WHEN_BOTH, GIC_BOTH, NONE); - DO_TEST_FULL("aarch64-gic-v2", WHEN_BOTH, GIC_NONE, NONE); - DO_TEST_FULL("aarch64-gic-v2", WHEN_BOTH, GIC_V2, NONE); - DO_TEST_FULL("aarch64-gic-v2", WHEN_BOTH, GIC_V3, NONE); - DO_TEST_FULL("aarch64-gic-v2", WHEN_BOTH, GIC_BOTH, NONE); - DO_TEST_FULL("aarch64-gic-v3", WHEN_BOTH, GIC_NONE, NONE); - DO_TEST_FULL("aarch64-gic-v3", WHEN_BOTH, GIC_V2, NONE); - DO_TEST_FULL("aarch64-gic-v3", WHEN_BOTH, GIC_V3, NONE); - DO_TEST_FULL("aarch64-gic-v3", WHEN_BOTH, GIC_BOTH, NONE); - DO_TEST_FULL("aarch64-gic-host", WHEN_BOTH, GIC_NONE, NONE); - DO_TEST_FULL("aarch64-gic-host", WHEN_BOTH, GIC_V2, NONE); - DO_TEST_FULL("aarch64-gic-host", WHEN_BOTH, GIC_V3, NONE); - DO_TEST_FULL("aarch64-gic-host", WHEN_BOTH, GIC_BOTH, NONE); + 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_GIC, GIC_V2, ARG_QEMU_CAPS, NONE); + 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_GIC, GIC_BOTH, ARG_QEMU_CAPS, NONE); + 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_GIC, GIC_NONE, ARG_QEMU_CAPS, NONE); + 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_GIC, GIC_V3, ARG_QEMU_CAPS, NONE); + 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_GIC, GIC_NONE, ARG_QEMU_CAPS, NONE); + 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_GIC, GIC_V3, ARG_QEMU_CAPS, NONE); + 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_GIC, GIC_NONE, ARG_QEMU_CAPS, NONE); + 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_GIC, GIC_V3, ARG_QEMU_CAPS, NONE); + 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_GIC, GIC_NONE, ARG_QEMU_CAPS, NONE); + 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_GIC, GIC_V3, ARG_QEMU_CAPS, NONE); + DO_TEST_FULL("aarch64-gic-host", WHEN_BOTH, + ARG_GIC, GIC_BOTH, ARG_QEMU_CAPS, NONE); DO_TEST("memory-hotplug", NONE); DO_TEST("memory-hotplug-nonuma", NONE);