From nobody Sun Feb 8 20:53:39 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=1641462425; cv=none; d=zohomail.com; s=zohoarc; b=Ooft9KfMwHIt5t/4N+aXUCE+4nOGFH5uZ0Vpos6EZVa4QO0Q0dWAVj0WqNxY6nbePH0iVBDpRdiBOm0RUb7rx9ek5s9iBcBYYu09Ba1NG3w+6HPEuYwGGZoeep9InfVy7oiViL7imkDYmi2NgndH+bESI3DYhGloL1lSxhnDQlc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641462425; 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=smkeieZMqHFzXu0eLOg3KzxeWqfwkEvRhpyeg3KTaAg=; b=knHSnG9O1imris5f9nMJbVjJ0smlHuacoJ0elALJYuz/p/1KPx3tpPCAavVOj3iyN3FAdCPa67XNgohcMA6v5CJE3UQLC8P0ubxOKRGIqN0rv6F7IfRYYIWKacsSU2gabWYnkHppCRsSncYOB4F5ctppa7pwSM4MOTCx06W6ysE= 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 1641462425556855.7095380689676; Thu, 6 Jan 2022 01:47:05 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-531-0_sZxCaCMqOD1_0NuL4qdA-1; Thu, 06 Jan 2022 04:46:02 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0CDD0802E3C; Thu, 6 Jan 2022 09:45:54 +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 BDE3260C5A; Thu, 6 Jan 2022 09:45:53 +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 7F94918045C5; Thu, 6 Jan 2022 09:45:53 +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 2069jopm005705 for ; Thu, 6 Jan 2022 04:45:50 -0500 Received: by smtp.corp.redhat.com (Postfix) id B72A67D535; Thu, 6 Jan 2022 09:45:50 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.34]) by smtp.corp.redhat.com (Postfix) with ESMTP id 221937CAD5 for ; Thu, 6 Jan 2022 09:45:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1641462424; 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=smkeieZMqHFzXu0eLOg3KzxeWqfwkEvRhpyeg3KTaAg=; b=WWdP0mF/TO1YoNREamnXmnSwZBRfoeTUZ2M05SpN8Nnf1gN15TDwPXmjt31la150TsSJWY DlrDIUbYvuu7lp/HoZeBBty/+hNyocW/HPdEF1g3IjvXQAY4iMyyo49S+npQdgprMdjAzO tIaKpgMqoZce19eeUctnXIcftQkJJsA= X-MC-Unique: 0_sZxCaCMqOD1_0NuL4qdA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 09/21] qemuxml2(argv|xml)test: Unify usage of DO_TEST_CAPS_LATEST Date: Thu, 6 Jan 2022 10:44:08 +0100 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 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 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: 1641462426671100002 Content-Type: text/plain; charset="utf-8" The qemuxml2argv invocation of some tests used DO_TEST_CAPS_LATEST while the qemuxml2xmltest invocation uses fake caps. Unify them on DO_TEST_CAPS_LATEST. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- .../luks-disks.x86_64-4.1.0.args | 1 + tests/qemuxml2argvdata/luks-disks.xml | 5 +++- .../memfd-memory-default-hugepage.xml | 5 ++-- tests/qemuxml2argvdata/memfd-memory-numa.xml | 5 ++-- tests/qemuxml2argvdata/vhost-vsock.xml | 5 +++- ...ml =3D> luks-disks-source.x86_64-latest.xml} | 5 +++- ...disks.xml =3D> luks-disks.x86_64-latest.xml} | 0 ...memory-default-hugepage.x86_64-latest.xml} | 0 ...ml =3D> memfd-memory-numa.x86_64-latest.xml} | 0 ...l =3D> tseg-explicit-size.x86_64-latest.xml} | 29 ++++++++++++------- ...xml =3D> vhost-vsock-auto.x86_64-latest.xml} | 5 +++- ...sock.xml =3D> vhost-vsock.x86_64-latest.xml} | 0 tests/qemuxml2xmltest.c | 27 +++++------------ 13 files changed, 48 insertions(+), 39 deletions(-) rename tests/qemuxml2xmloutdata/{luks-disks-source.xml =3D> luks-disks-sou= rce.x86_64-latest.xml} (95%) rename tests/qemuxml2xmloutdata/{luks-disks.xml =3D> luks-disks.x86_64-lat= est.xml} (100%) rename tests/qemuxml2xmloutdata/{memfd-memory-default-hugepage.xml =3D> me= mfd-memory-default-hugepage.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{memfd-memory-numa.xml =3D> memfd-memory-n= uma.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{tseg-explicit-size.xml =3D> tseg-explicit= -size.x86_64-latest.xml} (61%) rename tests/qemuxml2xmloutdata/{vhost-vsock-auto.xml =3D> vhost-vsock-aut= o.x86_64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{vhost-vsock.xml =3D> vhost-vsock.x86_64-l= atest.xml} (100%) diff --git a/tests/qemuxml2argvdata/luks-disks.x86_64-4.1.0.args b/tests/qe= muxml2argvdata/luks-disks.x86_64-4.1.0.args index a4beb606f4..27f567642c 100644 --- a/tests/qemuxml2argvdata/luks-disks.x86_64-4.1.0.args +++ b/tests/qemuxml2argvdata/luks-disks.x86_64-4.1.0.args @@ -13,6 +13,7 @@ QEMU_AUDIO_DRV=3Dnone \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-encr= yptdisk/master-key.aes \ -machine pc-i440fx-2.1,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ +-cpu qemu64 \ -m 1024 \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/luks-disks.xml b/tests/qemuxml2argvdata= /luks-disks.xml index 1c76f0dc26..93718daaf4 100644 --- a/tests/qemuxml2argvdata/luks-disks.xml +++ b/tests/qemuxml2argvdata/luks-disks.xml @@ -8,6 +8,9 @@ hvm + + qemu64 + destroy restart @@ -32,7 +35,7 @@
- +
diff --git a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.xml b/tes= ts/qemuxml2argvdata/memfd-memory-default-hugepage.xml index 6e2f83c8a9..238d4c6b52 100644 --- a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.xml +++ b/tests/qemuxml2argvdata/memfd-memory-default-hugepage.xml @@ -17,7 +17,8 @@ hvm - + + qemu64 @@ -29,7 +30,7 @@ destroy /usr/bin/qemu-system-x86_64 - +
diff --git a/tests/qemuxml2argvdata/memfd-memory-numa.xml b/tests/qemuxml2a= rgvdata/memfd-memory-numa.xml index d9e1a9f564..1ebcee8939 100644 --- a/tests/qemuxml2argvdata/memfd-memory-numa.xml +++ b/tests/qemuxml2argvdata/memfd-memory-numa.xml @@ -20,7 +20,8 @@ hvm - + + qemu64 @@ -32,7 +33,7 @@ destroy /usr/bin/qemu-system-x86_64 - +
diff --git a/tests/qemuxml2argvdata/vhost-vsock.xml b/tests/qemuxml2argvdat= a/vhost-vsock.xml index 68eab38319..e95b0b736a 100644 --- a/tests/qemuxml2argvdata/vhost-vsock.xml +++ b/tests/qemuxml2argvdata/vhost-vsock.xml @@ -9,13 +9,16 @@ + + qemu64 + destroy restart restart /usr/bin/qemu-system-x86_64 - +
diff --git a/tests/qemuxml2xmloutdata/luks-disks-source.xml b/tests/qemuxml= 2xmloutdata/luks-disks-source.x86_64-latest.xml similarity index 95% rename from tests/qemuxml2xmloutdata/luks-disks-source.xml rename to tests/qemuxml2xmloutdata/luks-disks-source.x86_64-latest.xml index 891b5d9d17..ed9df66413 100644 --- a/tests/qemuxml2xmloutdata/luks-disks-source.xml +++ b/tests/qemuxml2xmloutdata/luks-disks-source.x86_64-latest.xml @@ -8,6 +8,9 @@ hvm + + qemu64 + destroy restart @@ -71,7 +74,7 @@
- +
diff --git a/tests/qemuxml2xmloutdata/luks-disks.xml b/tests/qemuxml2xmlout= data/luks-disks.x86_64-latest.xml similarity index 100% rename from tests/qemuxml2xmloutdata/luks-disks.xml rename to tests/qemuxml2xmloutdata/luks-disks.x86_64-latest.xml diff --git a/tests/qemuxml2xmloutdata/memfd-memory-default-hugepage.xml b/t= ests/qemuxml2xmloutdata/memfd-memory-default-hugepage.x86_64-latest.xml similarity index 100% rename from tests/qemuxml2xmloutdata/memfd-memory-default-hugepage.xml rename to tests/qemuxml2xmloutdata/memfd-memory-default-hugepage.x86_64-lat= est.xml diff --git a/tests/qemuxml2xmloutdata/memfd-memory-numa.xml b/tests/qemuxml= 2xmloutdata/memfd-memory-numa.x86_64-latest.xml similarity index 100% rename from tests/qemuxml2xmloutdata/memfd-memory-numa.xml rename to tests/qemuxml2xmloutdata/memfd-memory-numa.x86_64-latest.xml diff --git a/tests/qemuxml2xmloutdata/tseg-explicit-size.xml b/tests/qemuxm= l2xmloutdata/tseg-explicit-size.x86_64-latest.xml similarity index 61% rename from tests/qemuxml2xmloutdata/tseg-explicit-size.xml rename to tests/qemuxml2xmloutdata/tseg-explicit-size.x86_64-latest.xml index 791b34f864..78ffe820cf 100644 --- a/tests/qemuxml2xmloutdata/tseg-explicit-size.xml +++ b/tests/qemuxml2xmloutdata/tseg-explicit-size.x86_64-latest.xml @@ -13,35 +13,42 @@ 48 + + qemu64 + destroy restart destroy /usr/bin/qemu-system-x86_64 + +
+
- - -
+ + + +
- - - -
+ + + +
- - -
+ + +