From patchwork Thu Mar 14 14:44:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 160344 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp15595083jad; Thu, 14 Mar 2019 07:44:44 -0700 (PDT) X-Google-Smtp-Source: APXvYqykgmeAKPGwoiAWkVu+HLi8/aeGU6k70VZBd6S9WApCZ0e4PLTm+keu7mwrOw0oG2Fr7B3s X-Received: by 2002:ac8:26b2:: with SMTP id 47mr23524803qto.224.1552574684005; Thu, 14 Mar 2019 07:44:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552574684; cv=none; d=google.com; s=arc-20160816; b=cx4K8+fJMqQPqeweFe61u43JCDPdDT6O8ToYfkh7PCw2EmUjOysJvHTBSnKsPKccPI NAGxVwnqfrgsLjlKMJCCciDSr10ggC+DvplJBS6/rzoWpvTH5QA00BE/ZLTRCADS935/ rbJ4HxD8+s62cUlZ5hRKco0Y/vmrmxP3stvVPiSZllz/NkQFsFAGmdbJ5vvb2RukwLqz yiDVm3Ur05yq5OXeOJmysKWtjchF7XQfxpilQxKtHHKK0lYngMVqadjy9ZyAKHPTyHZ4 QLHeqNZS1T1iA7e87Co0kbnHXS9Tx8UEPcBjWhDl4ZFZ8sjwIJsQQnTQnnKg0ezdVJWr omsg== 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=1agBuIpOqqiwb7ehY7kwY0lx249eKzziHaDGCiugaM4=; b=fcxJDj43e9+h4GnFga3Ez8ErqXJwMvZb5/5nEre0r67Z1qZCgfLdhKkUvVy5C4aTnZ CFMRHLX0hYi0cOAeFAlYydPCYnN4sJYkY03TRaV0wML4nN2hgqvVkCEIb1WQRXoKsDQq OCzp6ce8jMNTGPvcImK8ulnqRAV4caqHZhwqtdoQSQXxIKrwemkWXu4ndfo7Ja4bMDWK 3Mt8t18n7sZij4LFilTiSYwS/A1wb9GckPLhTQMH+oIzJqZEe+Rd8GDwu9kElhUjAfZX yNvdOocByRKjSIutkB7sjos61AM6ltonmdCum5U4m74QfGuSbXesvF3tzQVc1y5dXpxy zI7g== 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 y53si2301082qth.156.2019.03.14.07.44.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Mar 2019 07:44:43 -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 9DBEB30017B5; Thu, 14 Mar 2019 14:44:42 +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 70D1017C65; Thu, 14 Mar 2019 14:44:42 +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 2A159181A266; Thu, 14 Mar 2019 14:44:42 +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 x2EEiaD3024592 for ; Thu, 14 Mar 2019 10:44:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id 401EC60BE6; Thu, 14 Mar 2019 14:44:36 +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 CD3076B483; Thu, 14 Mar 2019 14:44:35 +0000 (UTC) From: Cole Robinson To: libvirt-list@redhat.com Date: Thu, 14 Mar 2019 10:44:06 -0400 Message-Id: <1143c158aef329a7d52f26d7bd9e2cbc42f9ef29.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 13/21] tests: qemuxml2argv: remove unused CAPS migrateFrom 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.44]); Thu, 14 Mar 2019 14:44:43 +0000 (UTC) Signed-off-by: Cole Robinson --- tests/qemuxml2argvtest.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 b555166e82..7708e8db70 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -786,11 +786,11 @@ mymain(void) * the test cases should be forked using DO_TEST_CAPS_VER with the appropriate * version. */ -# define DO_TEST_CAPS_INTERNAL(name, suffix, migrateFrom, flags, parseFlags, \ +# define DO_TEST_CAPS_INTERNAL(name, suffix, flags, parseFlags, \ arch, capsfile, stripmachinealiases) \ do { \ static struct testInfo info = { \ - name, "." suffix, NULL, migrateFrom, migrateFrom ? 7 : -1,\ + name, "." suffix, NULL, NULL, -1,\ (flags | FLAG_REAL_CAPS), parseFlags, \ }; \ if (!(info.qemuCaps = qemuTestParseCapabilitiesArch(virArchFromString(arch), \ @@ -807,7 +807,7 @@ mymain(void) # define TEST_CAPS_PATH abs_srcdir "/qemucapabilitiesdata/caps_" # define DO_TEST_CAPS_ARCH_VER_FULL(name, flags, parseFlags, arch, ver) \ - DO_TEST_CAPS_INTERNAL(name, arch "-" ver, NULL, flags, parseFlags, \ + DO_TEST_CAPS_INTERNAL(name, arch "-" ver, flags, parseFlags, \ arch, TEST_CAPS_PATH ver "." arch ".xml", false) # define DO_TEST_CAPS_ARCH_VER(name, arch, ver) \ @@ -817,7 +817,7 @@ mymain(void) DO_TEST_CAPS_ARCH_VER(name, "x86_64", ver) # define DO_TEST_CAPS_ARCH_LATEST_FULL(name, arch, flags, parseFlags) \ - DO_TEST_CAPS_INTERNAL(name, arch "-latest", NULL, flags, parseFlags, arch, \ + DO_TEST_CAPS_INTERNAL(name, arch "-latest", flags, parseFlags, arch, \ virHashLookup(capslatest, arch), true) # define DO_TEST_CAPS_ARCH_LATEST(name, arch) \