From nobody Mon Feb 9 08:30:04 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1680262144; cv=none; d=zohomail.com; s=zohoarc; b=E/gFSNmj6JTJHOySlFXLRtL+Hm1aBnRqZwvNBJUZIlaY/TEl7J9rlTUaDPVtJ6ty02YmKc4xfbKDoRAma86xeFlscBoWj3czwRJ8VU+FZ6UTC0prcXRJSoNa5l6/ziiHMc1NOFc519mAXt4LOZb9g3BFV+2oKUqs1muTb535Ar4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680262144; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=kdXMdTbvnnwIMQu8khytTZRD2rVf4Bd2NlaHvbx6mpA=; b=i+Ye6rSMUFeMMe0F5PaBSgk9y47LcpRg2TS/sJutTcVxFLXfkkW4B99kTZ4HM7+H+E8Nk021f2lvsvEr/VVUfFBvUIhH8OXLt/Pb+bOPLG6Qfcp8SW+y43+PVbxhuhWZOMe4KkDe66+W4dGeO7Z+XVqgp73nl8RxglMH8n1fekY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1680262144701369.67796771226585; Fri, 31 Mar 2023 04:29:04 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-493-zctGcpxzMqyvZ6ZHlPi1DA-1; Fri, 31 Mar 2023 07:26:43 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D62681C00AAD; Fri, 31 Mar 2023 11:26:38 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id C08DB14171B6; Fri, 31 Mar 2023 11:26:38 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id B1F5A19465BD; Fri, 31 Mar 2023 11:26:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 932141946A49 for ; Fri, 31 Mar 2023 11:26:37 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 842BB1121325; Fri, 31 Mar 2023 11:26:37 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id E613B1121314 for ; Fri, 31 Mar 2023 11:26:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680262143; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=kdXMdTbvnnwIMQu8khytTZRD2rVf4Bd2NlaHvbx6mpA=; b=dL7uHw7g6pJvZ7zbvemtI4vQXoY8U1H0Skn14DN1GJe9RKc+O/6QLWanmKNhblVERp8mgG ktnex/tN8vPz+g1eEdD8W5DdgCEgIysgn8ig6q/PFCXb40vlcNElB5J32haz+KwsjqKJIB kMYVTRs4g0//2DNAjn8yBOkxsVmnkdg= X-MC-Unique: zctGcpxzMqyvZ6ZHlPi1DA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 19/21] qemuxml2xmltest: Modernize 'mach-virt*' cases Date: Fri, 31 Mar 2023 13:26:13 +0200 Message-Id: <6be5180c67a6d2ff380701e004ec23d9d6a591b6.1680260939.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1680262145046100001 Content-Type: text/plain; charset="utf-8" Use real capabilities. Signed-off-by: Peter Krempa --- ...ch-virt-console-native.aarch64-latest.xml} | 4 +++ ...ch-virt-console-virtio.aarch64-latest.xml} | 16 +++++++++++- ...-serial+console-native.aarch64-latest.xml} | 4 +++ ...ach-virt-serial-compat.aarch64-latest.xml} | 4 +++ ...ach-virt-serial-native.aarch64-latest.xml} | 4 +++ ...> mach-virt-serial-pci.aarch64-latest.xml} | 19 ++++++++------ ...> mach-virt-serial-usb.aarch64-latest.xml} | 3 +++ tests/qemuxml2xmltest.c | 25 ++++++------------- 8 files changed, 52 insertions(+), 27 deletions(-) rename tests/qemuxml2xmloutdata/{mach-virt-console-native.xml =3D> mach-vi= rt-console-native.aarch64-latest.xml} (84%) rename tests/qemuxml2xmloutdata/{mach-virt-console-virtio.xml =3D> mach-vi= rt-console-virtio.aarch64-latest.xml} (52%) rename tests/qemuxml2xmloutdata/{mach-virt-serial-native.xml =3D> mach-vir= t-serial+console-native.aarch64-latest.xml} (84%) rename tests/qemuxml2xmloutdata/{mach-virt-serial+console-native.xml =3D> = mach-virt-serial-compat.aarch64-latest.xml} (84%) rename tests/qemuxml2xmloutdata/{mach-virt-serial-compat.xml =3D> mach-vir= t-serial-native.aarch64-latest.xml} (84%) rename tests/qemuxml2xmloutdata/{mach-virt-serial-pci.xml =3D> mach-virt-s= erial-pci.aarch64-latest.xml} (71%) rename tests/qemuxml2xmloutdata/{mach-virt-serial-usb.xml =3D> mach-virt-s= erial-usb.aarch64-latest.xml} (93%) diff --git a/tests/qemuxml2xmloutdata/mach-virt-console-native.xml b/tests/= qemuxml2xmloutdata/mach-virt-console-native.aarch64-latest.xml similarity index 84% rename from tests/qemuxml2xmloutdata/mach-virt-console-native.xml rename to tests/qemuxml2xmloutdata/mach-virt-console-native.aarch64-latest.= xml index f66fe2916a..66da5927e3 100644 --- a/tests/qemuxml2xmloutdata/mach-virt-console-native.xml +++ b/tests/qemuxml2xmloutdata/mach-virt-console-native.aarch64-latest.xml @@ -11,6 +11,9 @@ + + cortex-a15 + destroy restart @@ -18,6 +21,7 @@ /usr/bin/qemu-system-aarch64 + diff --git a/tests/qemuxml2xmloutdata/mach-virt-console-virtio.xml b/tests/= qemuxml2xmloutdata/mach-virt-console-virtio.aarch64-latest.xml similarity index 52% rename from tests/qemuxml2xmloutdata/mach-virt-console-virtio.xml rename to tests/qemuxml2xmloutdata/mach-virt-console-virtio.aarch64-latest.= xml index 6224089879..e1ff62f2c5 100644 --- a/tests/qemuxml2xmloutdata/mach-virt-console-virtio.xml +++ b/tests/qemuxml2xmloutdata/mach-virt-console-virtio.aarch64-latest.xml @@ -11,6 +11,9 @@ + + cortex-a15 + destroy restart @@ -18,8 +21,19 @@ /usr/bin/qemu-system-aarch64 + -
+
+ + + + +
+ + + + +
diff --git a/tests/qemuxml2xmloutdata/mach-virt-serial-native.xml b/tests/q= emuxml2xmloutdata/mach-virt-serial+console-native.aarch64-latest.xml similarity index 84% rename from tests/qemuxml2xmloutdata/mach-virt-serial-native.xml rename to tests/qemuxml2xmloutdata/mach-virt-serial+console-native.aarch64-= latest.xml index f66fe2916a..66da5927e3 100644 --- a/tests/qemuxml2xmloutdata/mach-virt-serial-native.xml +++ b/tests/qemuxml2xmloutdata/mach-virt-serial+console-native.aarch64-late= st.xml @@ -11,6 +11,9 @@ + + cortex-a15 + destroy restart @@ -18,6 +21,7 @@ /usr/bin/qemu-system-aarch64 + diff --git a/tests/qemuxml2xmloutdata/mach-virt-serial+console-native.xml b= /tests/qemuxml2xmloutdata/mach-virt-serial-compat.aarch64-latest.xml similarity index 84% rename from tests/qemuxml2xmloutdata/mach-virt-serial+console-native.xml rename to tests/qemuxml2xmloutdata/mach-virt-serial-compat.aarch64-latest.x= ml index f66fe2916a..66da5927e3 100644 --- a/tests/qemuxml2xmloutdata/mach-virt-serial+console-native.xml +++ b/tests/qemuxml2xmloutdata/mach-virt-serial-compat.aarch64-latest.xml @@ -11,6 +11,9 @@ + + cortex-a15 + destroy restart @@ -18,6 +21,7 @@ /usr/bin/qemu-system-aarch64 + diff --git a/tests/qemuxml2xmloutdata/mach-virt-serial-compat.xml b/tests/q= emuxml2xmloutdata/mach-virt-serial-native.aarch64-latest.xml similarity index 84% rename from tests/qemuxml2xmloutdata/mach-virt-serial-compat.xml rename to tests/qemuxml2xmloutdata/mach-virt-serial-native.aarch64-latest.x= ml index f66fe2916a..66da5927e3 100644 --- a/tests/qemuxml2xmloutdata/mach-virt-serial-compat.xml +++ b/tests/qemuxml2xmloutdata/mach-virt-serial-native.aarch64-latest.xml @@ -11,6 +11,9 @@ + + cortex-a15 + destroy restart @@ -18,6 +21,7 @@ /usr/bin/qemu-system-aarch64 + diff --git a/tests/qemuxml2xmloutdata/mach-virt-serial-pci.xml b/tests/qemu= xml2xmloutdata/mach-virt-serial-pci.aarch64-latest.xml similarity index 71% rename from tests/qemuxml2xmloutdata/mach-virt-serial-pci.xml rename to tests/qemuxml2xmloutdata/mach-virt-serial-pci.aarch64-latest.xml index 09478419e2..abf8407a72 100644 --- a/tests/qemuxml2xmloutdata/mach-virt-serial-pci.xml +++ b/tests/qemuxml2xmloutdata/mach-virt-serial-pci.aarch64-latest.xml @@ -11,6 +11,9 @@ + + cortex-a15 + destroy restart @@ -19,19 +22,19 @@ /usr/bin/qemu-system-aarch64 - - -
+ + + +
- - - + +
- -
+ +
diff --git a/tests/qemuxml2xmloutdata/mach-virt-serial-usb.xml b/tests/qemu= xml2xmloutdata/mach-virt-serial-usb.aarch64-latest.xml similarity index 93% rename from tests/qemuxml2xmloutdata/mach-virt-serial-usb.xml rename to tests/qemuxml2xmloutdata/mach-virt-serial-usb.aarch64-latest.xml index 0578d7ad72..9afbeee12d 100644 --- a/tests/qemuxml2xmloutdata/mach-virt-serial-usb.xml +++ b/tests/qemuxml2xmloutdata/mach-virt-serial-usb.aarch64-latest.xml @@ -11,6 +11,9 @@ + + cortex-a15 + destroy restart diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 61474ecb0d..64edd26faf 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -643,24 +643,13 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("pseries-console-native", "ppc64"); DO_TEST_CAPS_ARCH_LATEST("pseries-console-virtio", "ppc64"); - DO_TEST_NOCAPS("mach-virt-serial-native"); - DO_TEST_NOCAPS("mach-virt-serial+console-native"); - DO_TEST_NOCAPS("mach-virt-serial-compat"); - DO_TEST("mach-virt-serial-pci", - QEMU_CAPS_OBJECT_GPEX, - QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_PCI_SERIAL); - DO_TEST("mach-virt-serial-usb", - QEMU_CAPS_OBJECT_GPEX, - QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, - QEMU_CAPS_DEVICE_QEMU_XHCI, - QEMU_CAPS_DEVICE_USB_SERIAL); - DO_TEST("mach-virt-console-native", - QEMU_CAPS_DEVICE_PL011); - DO_TEST("mach-virt-console-virtio", - QEMU_CAPS_DEVICE_VIRTIO_MMIO); + DO_TEST_CAPS_ARCH_LATEST("mach-virt-serial-native", "aarch64"); + DO_TEST_CAPS_ARCH_LATEST("mach-virt-serial+console-native", "aarch64"); + DO_TEST_CAPS_ARCH_LATEST("mach-virt-serial-compat", "aarch64"); + DO_TEST_CAPS_ARCH_LATEST("mach-virt-serial-pci", "aarch64"); + DO_TEST_CAPS_ARCH_LATEST("mach-virt-serial-usb", "aarch64"); + DO_TEST_CAPS_ARCH_LATEST("mach-virt-console-native", "aarch64"); + DO_TEST_CAPS_ARCH_LATEST("mach-virt-console-virtio", "aarch64"); DO_TEST_NOCAPS("balloon-device-auto"); DO_TEST_NOCAPS("balloon-device-period"); --=20 2.39.2