From patchwork Thu Mar 14 14:43:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 160342 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp15595036jad; Thu, 14 Mar 2019 07:44:40 -0700 (PDT) X-Google-Smtp-Source: APXvYqyxW6DMDLpWRDGobvvtXleIskTvlcmn1ULonLiA9Q/ttMjdo1PsoNyaN4BtOjwIzC8d9MPU X-Received: by 2002:a37:790:: with SMTP id 138mr10597529qkh.271.1552574680462; Thu, 14 Mar 2019 07:44:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552574680; cv=none; d=google.com; s=arc-20160816; b=ZzVa0Yh6kUDrBeH5S5gk4PUZoiuq4KJTIWgznrRvbcAqCU7nT5yqnzayLsKtTiMAkV t4DccDC+3E0RpR7CDG+UaqPH4OFk2qtcTu4uXK/d3f5HEBAzeemwwgwrhPBXFNgXZESP FwX+2lyT8/kob1aYI+1ooCXb+hkskyjHmJnD8sCYSzvX1epkLO1RmaPfS7oz4tmcgOmN ilxgs16MvU+r0ra4gjaoI8+8Bgcb6dqezJ3AdbODrdk/P8DmjPK+rgYyHYT9h7azuRjm S5K722ljffVspxeRHWXp6UMVkjajLXcgKgYbUXyEPICnfjvoSLhsLInN6rKR0H1lVPAV v8sw== 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=dFQvZvfrQMa3esP331aCmKN5RtkVocNg3X/8929KTWU=; b=zKMADs/FKTwqVcaooAlsBaG8D2NLyCRUGGPGks1wvTQ+G6pB7DvXrsmAjSv+4iMm6y SLvc5+sIhx+O78s6i+WUpyZDM2UgqhjyIU9hkzD1gdXBqdJUMZ/u/culPfMIRBY5dVzl VMXNuvF/qiNOcxemJ2ocx3JEPhuEF3MycPSEcjyhipSb/4B3qhgWTLXIa4TdXwyPlQHO /LyP3VzlZbXMyWqeV4KJoleOOzd4OczMc/wafGsRL/DHiooAnwPwXX2kYG7YeZIy4/9G WyV1saj7Lv3RNqgxjHeUQp8AkTsGKpqpV0A1HlVxHUpdIhZ5cYYyQBSbQ4GWVYmkTx30 lVNA== 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 h202si2689291qke.116.2019.03.14.07.44.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Mar 2019 07:44:40 -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-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2482931028C5; Thu, 14 Mar 2019 14:44:39 +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 EC01317DC4; Thu, 14 Mar 2019 14:44:38 +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 A74263FAF5; Thu, 14 Mar 2019 14:44:38 +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 x2EEiPqg024513 for ; Thu, 14 Mar 2019 10:44:25 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0BBC260FDB; Thu, 14 Mar 2019 14:44:25 +0000 (UTC) Delivered-To: libvirt-list@redhat.com Received: from worklaptop.redhat.com (ovpn-124-177.rdu2.redhat.com [10.10.124.177]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9AB2D60BE6; Thu, 14 Mar 2019 14:44:24 +0000 (UTC) From: Cole Robinson To: libvirt-list@redhat.com Date: Thu, 14 Mar 2019 10:43:59 -0400 Message-Id: <68258937efce1bd675640af7088267d4131b2df7.1552574299.git.crobinso@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 06/21] tests: qemuxml2argv: handle gic with vaargs 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Thu, 14 Mar 2019 14:44:39 +0000 (UTC) This allows us to drop stub gic values from DO_TEST_FULL calls Signed-off-by: Cole Robinson --- tests/qemuxml2argvtest.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) -- 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list Reviewed-by: Andrea Bolognani diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 06a28178d0..60df2c3a00 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -607,6 +607,7 @@ testCompareXMLToArgv(const void *data) typedef enum { ARG_QEMU_CAPS = 1, + ARG_GIC, ARG_END = QEMU_CAPS_LAST, } testInfoArgNames; @@ -625,6 +626,12 @@ testInfoSetArgs(struct testInfo *info, ...) virQEMUCapsSetVList(info->qemuCaps, argptr); break; + case ARG_GIC: + if (testQemuCapsSetGIC(info->qemuCaps, + va_arg(argptr, int)) < 0) + goto cleanup; + break; + case ARG_END: default: fprintf(stderr, "Unexpected test info argument"); @@ -816,15 +823,13 @@ mymain(void) DO_TEST_CAPS_FULL(name, 0, 0, ver) # define DO_TEST_FULL(name, migrateFrom, migrateFd, flags, \ - parseFlags, gic, ...) \ + parseFlags, ...) \ do { \ static struct testInfo info = { \ name, NULL, NULL, migrateFrom, migrateFd, (flags), parseFlags, \ }; \ if (!(info.qemuCaps = virQEMUCapsNew())) \ return EXIT_FAILURE; \ - if (testQemuCapsSetGIC(info.qemuCaps, gic) < 0) \ - return EXIT_FAILURE; \ if (testInfoSetArgs(&info, __VA_ARGS__, QEMU_CAPS_LAST, ARG_END) < 0) \ return EXIT_FAILURE; \ if (virTestRun("QEMU XML-2-ARGV " name, \ @@ -834,28 +839,29 @@ mymain(void) } while (0) # define DO_TEST(name, ...) \ - DO_TEST_FULL(name, NULL, -1, 0, 0, GIC_NONE, \ + DO_TEST_FULL(name, NULL, -1, 0, 0, \ ARG_QEMU_CAPS, __VA_ARGS__) # define DO_TEST_GIC(name, gic, ...) \ - DO_TEST_FULL(name, NULL, -1, 0, 0, gic, \ + DO_TEST_FULL(name, NULL, -1, 0, 0, \ + ARG_GIC, gic, \ ARG_QEMU_CAPS, __VA_ARGS__) # define DO_TEST_FAILURE(name, ...) \ DO_TEST_FULL(name, NULL, -1, FLAG_EXPECT_FAILURE, \ - 0, GIC_NONE, \ + 0, \ ARG_QEMU_CAPS, __VA_ARGS__) # define DO_TEST_PARSE_ERROR(name, ...) \ DO_TEST_FULL(name, NULL, -1, \ FLAG_EXPECT_PARSE_ERROR | FLAG_EXPECT_FAILURE, \ - 0, GIC_NONE, \ + 0, \ ARG_QEMU_CAPS, __VA_ARGS__) # define DO_TEST_PARSE_FLAGS_ERROR(name, parseFlags, ...) \ DO_TEST_FULL(name, NULL, -1, \ FLAG_EXPECT_PARSE_ERROR | FLAG_EXPECT_FAILURE, \ - parseFlags, GIC_NONE, \ + parseFlags, \ ARG_QEMU_CAPS, __VA_ARGS__) # define NONE QEMU_CAPS_LAST @@ -1694,16 +1700,16 @@ mymain(void) QEMU_CAPS_CCW_CSSID_UNRESTRICTED, QEMU_CAPS_DEVICE_VFIO_CCW); - DO_TEST_FULL("restore-v2", "exec:cat", 7, 0, 0, GIC_NONE, + DO_TEST_FULL("restore-v2", "exec:cat", 7, 0, 0, ARG_QEMU_CAPS, NONE); - DO_TEST_FULL("restore-v2-fd", "stdio", 7, 0, 0, GIC_NONE, + DO_TEST_FULL("restore-v2-fd", "stdio", 7, 0, 0, ARG_QEMU_CAPS, NONE); - DO_TEST_FULL("restore-v2-fd", "fd:7", 7, 0, 0, GIC_NONE, + DO_TEST_FULL("restore-v2-fd", "fd:7", 7, 0, 0, ARG_QEMU_CAPS, NONE); - DO_TEST_FULL("migrate", "tcp:10.0.0.1:5000", -1, 0, 0, GIC_NONE, + DO_TEST_FULL("migrate", "tcp:10.0.0.1:5000", -1, 0, 0, ARG_QEMU_CAPS, NONE); - DO_TEST_FULL("migrate-numa-unaligned", "stdio", 7, 0, 0, GIC_NONE, + DO_TEST_FULL("migrate-numa-unaligned", "stdio", 7, 0, 0, ARG_QEMU_CAPS, QEMU_CAPS_NUMA, QEMU_CAPS_OBJECT_MEMORY_RAM); @@ -1748,11 +1754,10 @@ mymain(void) DO_TEST("cpu-host-model-vendor", NONE); DO_TEST_FULL("cpu-host-model-fallback", NULL, -1, FLAG_SKIP_LEGACY_CPUS, 0, - GIC_NONE, ARG_QEMU_CAPS, NONE); DO_TEST_FULL("cpu-host-model-nofallback", NULL, -1, FLAG_SKIP_LEGACY_CPUS | FLAG_EXPECT_FAILURE, - 0, GIC_NONE, + 0, ARG_QEMU_CAPS, NONE); DO_TEST("cpu-host-passthrough", QEMU_CAPS_KVM); DO_TEST_FAILURE("cpu-qemu-host-passthrough", QEMU_CAPS_KVM); @@ -2842,7 +2847,7 @@ mymain(void) QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_PIIX3_USB_UHCI); DO_TEST_FULL("ppc64-usb-controller-qemu-xhci", NULL, -1, 0, - VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, GIC_NONE, + VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, ARG_QEMU_CAPS, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_NEC_USB_XHCI,