From nobody Mon Dec 15 23:38:57 2025 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=1658846358; cv=none; d=zohomail.com; s=zohoarc; b=j0hwivOJ9whQPocyya+TaqlkDOznstgmWtiUrskKaMCzNAkIZrYBWaL07DkagqCVsFBQElbKp/LeM7zSIOH6zC73zABRg0FyU9zWwfmp0C91Q4updVs8cRtWt5CBwcbcdYlRYVMLtERCuYtY00rdoOHKxHPm+0SKXgHQi7oY1VE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658846358; 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=SWnedPPbHB+I8Ghwe46UQxGvmprEbiSqilOWpKmnZh0=; b=htnR9wT1hgT6NRIPz91f91Mp7G5t5OBwSWev02ibOL1tcX9QocDrrZk2Yqed/153bE8PFbf2m/gTM/hxLbl1+qGIs9i4/9YzRnZQvdj4v8V1HNh82Jc/M9Oz1joOQheqQOfAzjsMmcb4lZ+IZ0IXEpqj6cKOviImwqw6kq8Xw2A= 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 1658846358634656.3834235145888; Tue, 26 Jul 2022 07:39:18 -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-340-lne-M8VaNZuwaFTjhmzKig-1; Tue, 26 Jul 2022 10:38:54 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DC4593C11E85; Tue, 26 Jul 2022 14:38:11 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id C503C2024CBB; Tue, 26 Jul 2022 14:38:11 +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 6EBB71945DA5; Tue, 26 Jul 2022 14:38:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C0B991945DA0 for ; Tue, 26 Jul 2022 14:38:09 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 9E4F0400EA8E; Tue, 26 Jul 2022 14:38:09 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 23A7A400DFD7 for ; Tue, 26 Jul 2022 14:38:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658846356; 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=SWnedPPbHB+I8Ghwe46UQxGvmprEbiSqilOWpKmnZh0=; b=Il71O+e9WK08hjVCJGD4DCM4sOgVL5WKo+hU0z6TNydm+QK3kRl++GkhE3SZsRq7cALWF1 FJpVEHEjFKS0oGYO7aKmoxK70IkKYZIf8Co3wpZcDzA+UAiYYORynTkU06s9zn4f7IokIw vDAi++HvS73JUpasd/EfwfY6gLmreSM= X-MC-Unique: lne-M8VaNZuwaFTjhmzKig-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 10/80] qemuxml2xmltest: Modernize all test cases using QEMU_CAPS_QCOW2_LUKS Date: Tue, 26 Jul 2022 16:36:48 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 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 2.78 on 10.11.54.4 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com 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: 1658846360367100001 Content-Type: text/plain; charset="utf-8" Modernize 'disk-nvme', 'encrypted-disk-usage', 'encrypted-disk', and 'user-aliases' cases to use DO_TEST_CAPS_LATEST. This will remove all uses of QEMU_CAPS_QCOW2_LUKS from the test suite. Since the output files are done via symlinks to input files, the input files need to be modernized with few auto-added XML bits. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- tests/qemuxml2argvdata/disk-nvme.xml | 5 ++++- tests/qemuxml2argvdata/encrypted-disk-usage.xml | 5 ++++- tests/qemuxml2argvdata/user-aliases.xml | 5 +++-- ...{disk-nvme.xml =3D> disk-nvme.x86_64-latest.xml} | 0 ...xml =3D> encrypted-disk-usage.x86_64-latest.xml} | 0 ...-disk.xml =3D> encrypted-disk.x86_64-latest.xml} | 5 ++++- ...aliases.xml =3D> user-aliases.x86_64-latest.xml} | 0 tests/qemuxml2xmltest.c | 15 ++++----------- 8 files changed, 19 insertions(+), 16 deletions(-) rename tests/qemuxml2xmloutdata/{disk-nvme.xml =3D> disk-nvme.x86_64-lates= t.xml} (100%) rename tests/qemuxml2xmloutdata/{encrypted-disk-usage.xml =3D> encrypted-d= isk-usage.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{encrypted-disk.xml =3D> encrypted-disk.x8= 6_64-latest.xml} (89%) rename tests/qemuxml2xmloutdata/{user-aliases.xml =3D> user-aliases.x86_64= -latest.xml} (100%) diff --git a/tests/qemuxml2argvdata/disk-nvme.xml b/tests/qemuxml2argvdata/= disk-nvme.xml index 226ea3d686..5e521ad6d3 100644 --- a/tests/qemuxml2argvdata/disk-nvme.xml +++ b/tests/qemuxml2argvdata/disk-nvme.xml @@ -8,6 +8,9 @@ hvm + + qemu64 + destroy restart @@ -49,7 +52,7 @@
- +
diff --git a/tests/qemuxml2argvdata/encrypted-disk-usage.xml b/tests/qemuxm= l2argvdata/encrypted-disk-usage.xml index 43afacf220..7c5781b96f 100644 --- a/tests/qemuxml2argvdata/encrypted-disk-usage.xml +++ b/tests/qemuxml2argvdata/encrypted-disk-usage.xml @@ -8,6 +8,9 @@ hvm + + qemu64 + destroy restart @@ -23,7 +26,7 @@
- +
diff --git a/tests/qemuxml2argvdata/user-aliases.xml b/tests/qemuxml2argvda= ta/user-aliases.xml index b688b84b56..9998c1e08f 100644 --- a/tests/qemuxml2argvdata/user-aliases.xml +++ b/tests/qemuxml2argvdata/user-aliases.xml @@ -19,7 +19,8 @@ - + + qemu64 @@ -70,7 +71,7 @@
- +
diff --git a/tests/qemuxml2xmloutdata/disk-nvme.xml b/tests/qemuxml2xmloutd= ata/disk-nvme.x86_64-latest.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-nvme.xml rename to tests/qemuxml2xmloutdata/disk-nvme.x86_64-latest.xml diff --git a/tests/qemuxml2xmloutdata/encrypted-disk-usage.xml b/tests/qemu= xml2xmloutdata/encrypted-disk-usage.x86_64-latest.xml similarity index 100% rename from tests/qemuxml2xmloutdata/encrypted-disk-usage.xml rename to tests/qemuxml2xmloutdata/encrypted-disk-usage.x86_64-latest.xml diff --git a/tests/qemuxml2xmloutdata/encrypted-disk.xml b/tests/qemuxml2xm= loutdata/encrypted-disk.x86_64-latest.xml similarity index 89% rename from tests/qemuxml2xmloutdata/encrypted-disk.xml rename to tests/qemuxml2xmloutdata/encrypted-disk.x86_64-latest.xml index b840f35fa7..abf0bf59fe 100644 --- a/tests/qemuxml2xmloutdata/encrypted-disk.xml +++ b/tests/qemuxml2xmloutdata/encrypted-disk.x86_64-latest.xml @@ -8,6 +8,9 @@ hvm + + qemu64 + destroy restart @@ -23,7 +26,7 @@
- +
diff --git a/tests/qemuxml2xmloutdata/user-aliases.xml b/tests/qemuxml2xmlo= utdata/user-aliases.x86_64-latest.xml similarity index 100% rename from tests/qemuxml2xmloutdata/user-aliases.xml rename to tests/qemuxml2xmloutdata/user-aliases.x86_64-latest.xml diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index da0f6eabb7..6bf2ed8d30 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -349,7 +349,7 @@ mymain(void) DO_TEST_NOCAPS("disk-network-tlsx509-nbd"); DO_TEST_CAPS_LATEST("disk-network-tlsx509-nbd-hostname"); DO_TEST_NOCAPS("disk-network-tlsx509-vxhs"); - DO_TEST("disk-nvme", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_QCOW2_LUKS); + DO_TEST_CAPS_LATEST("disk-nvme"); DO_TEST_CAPS_LATEST("disk-vhostuser"); DO_TEST_CAPS_LATEST("disk-scsi"); DO_TEST("disk-virtio-scsi-reservations", @@ -570,8 +570,8 @@ mymain(void) DO_TEST_CAPS_LATEST("disk-slices"); DO_TEST_CAPS_LATEST("disk-rotation"); - DO_TEST("encrypted-disk", QEMU_CAPS_QCOW2_LUKS); - DO_TEST("encrypted-disk-usage", QEMU_CAPS_QCOW2_LUKS); + DO_TEST_CAPS_LATEST("encrypted-disk"); + DO_TEST_CAPS_LATEST("encrypted-disk-usage"); DO_TEST_CAPS_LATEST("luks-disks"); DO_TEST_CAPS_LATEST("luks-disks-source"); DO_TEST_CAPS_LATEST("luks-disks-source-qcow2"); @@ -1293,14 +1293,7 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("pseries-cpu-compat", "ppc64"); DO_TEST_CAPS_ARCH_LATEST("pseries-cpu-exact", "ppc64"); - DO_TEST("user-aliases", - QEMU_CAPS_DEVICE_CIRRUS_VGA, - QEMU_CAPS_QCOW2_LUKS, - QEMU_CAPS_OBJECT_MEMORY_FILE, - QEMU_CAPS_PIIX_DISABLE_S3, - QEMU_CAPS_PIIX_DISABLE_S4, - QEMU_CAPS_VNC, - QEMU_CAPS_CCID_EMULATED); + DO_TEST_CAPS_LATEST("user-aliases"); DO_TEST("input-virtio-ccw", QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_KEYBOARD, --=20 2.36.1