From patchwork Mon Apr 15 23:09:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 162289 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp3508407jan; Mon, 15 Apr 2019 16:09:52 -0700 (PDT) X-Google-Smtp-Source: APXvYqwuba7MsjMQz+BvRPCThTm/ayPDGI6u4/FAgLLVHEYmEDVWNWrCIBMXPfedxC+q1ta1ZH6a X-Received: by 2002:a0c:928a:: with SMTP id b10mr64854964qvb.4.1555369792253; Mon, 15 Apr 2019 16:09:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555369792; cv=none; d=google.com; s=arc-20160816; b=K1wBze8JMCAhnjcHydq4XvdcrH+C9zV9zkpIAcbSU3EVmkYGdWLIRrmAZLZryi0/11 RmhIZnigouA8eknkI9sYySYb55eWGP5SAcnsEvdUX0KVo1+tdkQ/7pd0Qb8pSCUZMSTu R/UEvszAaoqF9t0E+f21+gdEugT/iayoiJoWP8P9LGRnoRxkjcAFREE5WLGaEDdCXXIY gzV+VqUyZFvsVsxfnfk9X+Gur99eC44wxSyIHBJtFw98T02N0DxZucaOlEZ3vwWzCUJ9 IE4jdkWVruYK/ze/cHBpvhh6feXxpnIae2RU0AIjipgU+kkZLqOlqvS9Mr/JY2gnC5Iu xlaA== 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 :cc:mime-version:references:in-reply-to:message-id:date:to:from :delivered-to; bh=Vrzcz3HLvI9LQBvXzxRFZcvtDyW74IqbTCNw46PHl28=; b=faP+ZYhdpGshKPN7ILcvNdSpzV7QYQ4RyAAZqZKxtV1Fo5UrZoSymJTSZQ75YbOY3O xKx9iSR2Ydr2kG6KvP7WCGAWOG3zdmjXxnKWGgRmx5qadugXIIq3K+oAIjmbVJoVRnBp uliRQDIVEk414FL5+S2HyNGOi5gSuo6fw7/rXVSuAqbGnrXFNzv8uF2L0SGcpsyAv6P+ MJG5JjXjFoBLLQ1q33XMYxcpohJuUJlkElGDMfoS526H5efigkuH9wyy4URi7bgl0Rls et6ZdiuAlQ/zQMugo9f3J5W1IRTblTAZp0sGs72yOvaK2vPbwrWaVozuZi2FQ26cNFsc Vg1w== 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 h23si17998153qkl.13.2019.04.15.16.09.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Apr 2019 16:09:52 -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-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EB4A430ADBB3; Mon, 15 Apr 2019 23:09:50 +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 C18675C22D; Mon, 15 Apr 2019 23:09:50 +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 7B6993FB11; Mon, 15 Apr 2019 23:09:50 +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 x3FN9Xvm019651 for ; Mon, 15 Apr 2019 19:09:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1198560C5F; Mon, 15 Apr 2019 23:09:33 +0000 (UTC) Delivered-To: libvirt-list@redhat.com Received: from worklaptop.redhat.com (ovpn-124-108.rdu2.redhat.com [10.10.124.108]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7E1F860C05; Mon, 15 Apr 2019 23:09:32 +0000 (UTC) From: Cole Robinson To: libvirt-list@redhat.com Date: Mon, 15 Apr 2019 19:09:20 -0400 Message-Id: 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 Cc: =?utf-8?q?J=C3=A1n_Tomko?= , Andrea Bolognani Subject: [libvirt] [PATCH v2 6/6] tests: qemuxml2xml: Convert aarch64-os-firmware-efi to TEST_CAPS 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Mon, 15 Apr 2019 23:09:51 +0000 (UTC) Demostrate DO_TEST_CAPS_ARCH_LATEST by converting the test case 'aarch64-os-firmware-efi' Signed-off-by: Cole Robinson --- ...aarch64-os-firmware-efi.aarch64-latest.xml | 31 +++++++++++++++++++ .../aarch64-os-firmware-efi.xml | 1 - tests/qemuxml2xmltest.c | 3 +- 3 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 tests/qemuxml2xmloutdata/aarch64-os-firmware-efi.aarch64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/aarch64-os-firmware-efi.xml -- 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list diff --git a/tests/qemuxml2xmloutdata/aarch64-os-firmware-efi.aarch64-latest.xml b/tests/qemuxml2xmloutdata/aarch64-os-firmware-efi.aarch64-latest.xml new file mode 100644 index 0000000000..529ce6f3c2 --- /dev/null +++ b/tests/qemuxml2xmloutdata/aarch64-os-firmware-efi.aarch64-latest.xml @@ -0,0 +1,31 @@ + + aarch64test + 496d7ea8-9739-544b-4ebd-ef08be936e8b + 1048576 + 1048576 + 1 + + hvm + /aarch64.kernel + /aarch64.initrd + earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait + /aarch64.dtb + + + + + + + + + cortex-a53 + + + destroy + restart + restart + + /usr/bin/qemu-system-aarch64 + + + diff --git a/tests/qemuxml2xmloutdata/aarch64-os-firmware-efi.xml b/tests/qemuxml2xmloutdata/aarch64-os-firmware-efi.xml deleted file mode 120000 index beea6b2955..0000000000 --- a/tests/qemuxml2xmloutdata/aarch64-os-firmware-efi.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/aarch64-os-firmware-efi.xml \ No newline at end of file diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 812f5c7ea0..8e85710d45 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1010,8 +1010,7 @@ mymain(void) DO_TEST("aarch64-aavmf-virtio-mmio", QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); - DO_TEST("aarch64-os-firmware-efi", - QEMU_CAPS_DEVICE_VIRTIO_MMIO); + DO_TEST_CAPS_ARCH_LATEST("aarch64-os-firmware-efi", "aarch64"); DO_TEST("aarch64-virtio-pci-default", QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, QEMU_CAPS_DEVICE_VIRTIO_MMIO,