From patchwork Thu Mar 14 14:44:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 160340 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp15594958jad; Thu, 14 Mar 2019 07:44:36 -0700 (PDT) X-Google-Smtp-Source: APXvYqylFW3BMDo/K8TOA4QsDZewXPOt4Qpxl9O+bO2dA4cKs0fgb+tEHoYXD6soPOZBRLVumrN2 X-Received: by 2002:a0c:afc8:: with SMTP id t8mr4943137qvc.123.1552574676422; Thu, 14 Mar 2019 07:44:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552574676; cv=none; d=google.com; s=arc-20160816; b=jXBeuta2VDOlLRYCQBnI56ktkprZlCbwMNwzBBnsP7ATaT3qeVLlvPhpxSzjlKphlH lb103U9+D1OgIZn3+AtzjzPkgnWY6UmIzBS4ufchIMaveQ1I6dCiRGjTcgsuBjwMspCu BlkhSPkb0IXUrul4FKseYokhQE1b+mQzeVsaElr9hKtEX7UKijoCI3b6vnYFqsLEtYsA 49tPdZMd2ldBQnFso0FULOSaDBVNbU/qzJrjcr7hBXx0f08ZiwrY6qYv2cXoOR2r/cN5 7vsXgfAN5g4QK+PcKSxSH+0Fplc8JBhNvZd5u84NJSh04Pli/m65i2DedHjCxAE60Kd/ pTiw== 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=QQdYaHKxvsbT3jTPWBTPkBCnzb7r6mzTkDx/UONkpWQ=; b=myR0p3HJGYnVXgOB4oeS+tADQva7RrS2GTXV4JR/DXrK4lPlqIvtsq6sUkxFwA+PM2 YiuIeeTog3bQNkEkdTWcH3/dVx9slVBRBrk7Prx0GNZ7aYxQALX5skgL/2jiBmlKlM1n kerCALU4picPTCImnzd0DlTHvzAKQkq2vpiyK6w6uRZDPUzN7bTzrqrUzoQXvE+gdJ/Y Mm+zSlZiP+N9PzSoXEU+yUYeFEgbdfs1H0YQiC83XmpsLU9+UQ7+jzr0kF7oIT7cdoAa wSKn6socO6N0rla8aoWNsmzQXq3Yug5g7BFTSCSyLj3//AUWq42u74dp4yQrzBrT5TEv YK9g== 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 p4si828154qtn.189.2019.03.14.07.44.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Mar 2019 07:44:36 -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-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 040683060FDA; Thu, 14 Mar 2019 14:44:35 +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 D009635F2; Thu, 14 Mar 2019 14:44:34 +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 8DAB8181A264; Thu, 14 Mar 2019 14:44:34 +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 x2EEiSc5024536 for ; Thu, 14 Mar 2019 10:44:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id 716BB60FAB; Thu, 14 Mar 2019 14:44:28 +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 0122960FDC; Thu, 14 Mar 2019 14:44:25 +0000 (UTC) From: Cole Robinson To: libvirt-list@redhat.com Date: Thu, 14 Mar 2019 10:44:00 -0400 Message-Id: <4ba5569ff35e3d3019b26120ea76f869d4502689.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 07/21] tests: qemuxml2argv: handle migrate* with varargs 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Thu, 14 Mar 2019 14:44:35 +0000 (UTC) This allows us to drop migrateFrom and migrateFd from DO_TEST_FULL Signed-off-by: Cole Robinson --- tests/qemuxml2argvtest.c | 46 ++++++++++++++++++++++++++-------------- 1 file changed, 30 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 60df2c3a00..c6bd240c54 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -608,6 +608,8 @@ testCompareXMLToArgv(const void *data) typedef enum { ARG_QEMU_CAPS = 1, ARG_GIC, + ARG_MIGRATE_FROM, + ARG_MIGRATE_FD, ARG_END = QEMU_CAPS_LAST, } testInfoArgNames; @@ -632,6 +634,14 @@ testInfoSetArgs(struct testInfo *info, ...) goto cleanup; break; + case ARG_MIGRATE_FROM: + info->migrateFrom = va_arg(argptr, char *); + break; + + case ARG_MIGRATE_FD: + info->migrateFd = va_arg(argptr, int); + break; + case ARG_END: default: fprintf(stderr, "Unexpected test info argument"); @@ -822,11 +832,10 @@ mymain(void) # define DO_TEST_CAPS(name, ver) \ DO_TEST_CAPS_FULL(name, 0, 0, ver) -# define DO_TEST_FULL(name, migrateFrom, migrateFd, flags, \ - parseFlags, ...) \ +# define DO_TEST_FULL(name, flags, parseFlags, ...) \ do { \ static struct testInfo info = { \ - name, NULL, NULL, migrateFrom, migrateFd, (flags), parseFlags, \ + name, NULL, NULL, NULL, -1, (flags), parseFlags, \ }; \ if (!(info.qemuCaps = virQEMUCapsNew())) \ return EXIT_FAILURE; \ @@ -839,27 +848,27 @@ mymain(void) } while (0) # define DO_TEST(name, ...) \ - DO_TEST_FULL(name, NULL, -1, 0, 0, \ + DO_TEST_FULL(name, 0, 0, \ ARG_QEMU_CAPS, __VA_ARGS__) # define DO_TEST_GIC(name, gic, ...) \ - DO_TEST_FULL(name, NULL, -1, 0, 0, \ + DO_TEST_FULL(name, 0, 0, \ ARG_GIC, gic, \ ARG_QEMU_CAPS, __VA_ARGS__) # define DO_TEST_FAILURE(name, ...) \ - DO_TEST_FULL(name, NULL, -1, FLAG_EXPECT_FAILURE, \ + DO_TEST_FULL(name, FLAG_EXPECT_FAILURE, \ 0, \ ARG_QEMU_CAPS, __VA_ARGS__) # define DO_TEST_PARSE_ERROR(name, ...) \ - DO_TEST_FULL(name, NULL, -1, \ + DO_TEST_FULL(name, \ FLAG_EXPECT_PARSE_ERROR | FLAG_EXPECT_FAILURE, \ 0, \ ARG_QEMU_CAPS, __VA_ARGS__) # define DO_TEST_PARSE_FLAGS_ERROR(name, parseFlags, ...) \ - DO_TEST_FULL(name, NULL, -1, \ + DO_TEST_FULL(name, \ FLAG_EXPECT_PARSE_ERROR | FLAG_EXPECT_FAILURE, \ parseFlags, \ ARG_QEMU_CAPS, __VA_ARGS__) @@ -1700,16 +1709,21 @@ mymain(void) QEMU_CAPS_CCW_CSSID_UNRESTRICTED, QEMU_CAPS_DEVICE_VFIO_CCW); - DO_TEST_FULL("restore-v2", "exec:cat", 7, 0, 0, + DO_TEST_FULL("restore-v2", 0, 0, + ARG_MIGRATE_FROM, "exec:cat", ARG_MIGRATE_FD, 7, ARG_QEMU_CAPS, NONE); - DO_TEST_FULL("restore-v2-fd", "stdio", 7, 0, 0, + DO_TEST_FULL("restore-v2-fd", 0, 0, + ARG_MIGRATE_FROM, "stdio", ARG_MIGRATE_FD, 7, ARG_QEMU_CAPS, NONE); - DO_TEST_FULL("restore-v2-fd", "fd:7", 7, 0, 0, + DO_TEST_FULL("restore-v2-fd", 0, 0, + ARG_MIGRATE_FROM, "fd:7", ARG_MIGRATE_FD, 7, ARG_QEMU_CAPS, NONE); - DO_TEST_FULL("migrate", "tcp:10.0.0.1:5000", -1, 0, 0, + DO_TEST_FULL("migrate", 0, 0, + ARG_MIGRATE_FROM, "tcp:10.0.0.1:5000", ARG_QEMU_CAPS, NONE); - DO_TEST_FULL("migrate-numa-unaligned", "stdio", 7, 0, 0, + DO_TEST_FULL("migrate-numa-unaligned", 0, 0, + ARG_MIGRATE_FROM, "stdio", ARG_MIGRATE_FD, 7, ARG_QEMU_CAPS, QEMU_CAPS_NUMA, QEMU_CAPS_OBJECT_MEMORY_RAM); @@ -1752,10 +1766,10 @@ 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", NULL, -1, + DO_TEST_FULL("cpu-host-model-fallback", FLAG_SKIP_LEGACY_CPUS, 0, ARG_QEMU_CAPS, NONE); - DO_TEST_FULL("cpu-host-model-nofallback", NULL, -1, + DO_TEST_FULL("cpu-host-model-nofallback", FLAG_SKIP_LEGACY_CPUS | FLAG_EXPECT_FAILURE, 0, ARG_QEMU_CAPS, NONE); @@ -2846,7 +2860,7 @@ 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", NULL, -1, 0, + DO_TEST_FULL("ppc64-usb-controller-qemu-xhci", 0, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, ARG_QEMU_CAPS, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,