From nobody Mon Sep 8 17:04:31 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1756306891; cv=none; d=zohomail.com; s=zohoarc; b=khqZGMf9S6ZANS89RRwV/YjV9Xea8JqWhdl/qWidRSa9SALv41h0eNeqfbz/IC8MJ1dWsIWAhSJxYTzwnBCz6WSbTeStG6yOn/YQqj5KDf1TLdxMhT3DkhKGKAOKrUX6G5hhJ4sVCD5yUSt0riTSb6r69Lm9S6IlIrp4m9IgI8w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756306891; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=WHHfPLggrJVSvtWXzFTGVVXY3HhkD2NTLPR9PcTlV3I=; b=VycVxNdltySSqIIMq9ZYqKYjtTLWEAxh/CS7blL8VlqHNTD2RmIzzVRnVJyIFwRu55MBQPCEbKkrR5bbFQxE71XTFi/3lelcWP+zOoL7zwgaM/Hm97VoZeWWorGbGQm6S+80T9aTLC5oC31CXpU1+oWLBqihO+PMAQoRtzfOy7A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1756306890997110.33866359425883; Wed, 27 Aug 2025 08:01:30 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id C40BB440A5; Wed, 27 Aug 2025 11:01:29 -0400 (EDT) Received: from [172.19.199.3] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 83C3044226; Wed, 27 Aug 2025 10:48:31 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 8EA604400B; Wed, 27 Aug 2025 10:47:28 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 4C63A4401F for ; Wed, 27 Aug 2025 10:47:09 -0400 (EDT) Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-295-VvaJqf-1OVSdenT0cllUcg-1; Wed, 27 Aug 2025 10:47:07 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D02C719541BF for ; Wed, 27 Aug 2025 14:47:06 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.44.22.3]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 199F330001A5 for ; Wed, 27 Aug 2025 14:47:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1756306029; h=from:from: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; bh=WHHfPLggrJVSvtWXzFTGVVXY3HhkD2NTLPR9PcTlV3I=; b=WMursBJ4xihh+rWJ4IrvNdLV02qj57Yj1tLsOcG4yR5Vt3x7WoBJlip2xBGmv50PFnyJym 6iGGNY03T8ec8kwMGALYSv5E5AUK4vQ3ufHY5TZG0GRNr5LbZgsnzSHB/F1Nld5B2gjvqf aLoPB08kbta3w9/Fj2FxBF8UhUK0B/U= X-MC-Unique: VvaJqf-1OVSdenT0cllUcg-1 X-Mimecast-MFC-AGG-ID: VvaJqf-1OVSdenT0cllUcg_1756306026 To: devel@lists.libvirt.org Subject: [PATCH 08/10] qemuxmlconftest: Rename and strip specific machine type from 'x86_64-default-cpu-*' cases Date: Wed, 27 Aug 2025 16:46:51 +0200 Message-ID: <9c7cc00bc739bfbd124e789736297e8cc10d6514.1756305881.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: OLZoBUfuTlN_ZoVreJyn6jJhXoiT_bkEL30vpqwKAXc_1756306026 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 5D4CCDFP2UHIGID22QANIEXQN2464E4Z X-Message-ID-Hash: 5D4CCDFP2UHIGID22QANIEXQN2464E4Z X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1756306893379116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa qemu-10.2 which we're about to add capabilities dump for will remove the '4.2' machine type per deprecation policy. The 'x86_64-default-cpu-*' still reference it. Since there is no functional difference when upgrading the tests to the latest machine type (pc/q35 alias as handled internally by qemuxmlconftest) let's rename and modernize these. Signed-off-by: Peter Krempa --- ....args =3D> x86_64-default-cpu-kvm-pc.x86_64-latest.args} | 2 +- ...st.xml =3D> x86_64-default-cpu-kvm-pc.x86_64-latest.xml} | 2 +- ...-cpu-kvm-q35-4.2.xml =3D> x86_64-default-cpu-kvm-pc.xml} | 2 +- ...args =3D> x86_64-default-cpu-kvm-q35.x86_64-latest.args} | 2 +- ...t.xml =3D> x86_64-default-cpu-kvm-q35.x86_64-latest.xml} | 2 +- ...-cpu-kvm-pc-4.2.xml =3D> x86_64-default-cpu-kvm-q35.xml} | 2 +- ....args =3D> x86_64-default-cpu-tcg-pc.x86_64-latest.args} | 2 +- ...st.xml =3D> x86_64-default-cpu-tcg-pc.x86_64-latest.xml} | 2 +- ...-cpu-tcg-q35-4.2.xml =3D> x86_64-default-cpu-tcg-pc.xml} | 2 +- ...args =3D> x86_64-default-cpu-tcg-q35.x86_64-latest.args} | 2 +- ...t.xml =3D> x86_64-default-cpu-tcg-q35.x86_64-latest.xml} | 2 +- ...-cpu-tcg-pc-4.2.xml =3D> x86_64-default-cpu-tcg-q35.xml} | 2 +- tests/qemuxmlconftest.c | 8 ++++---- 13 files changed, 16 insertions(+), 16 deletions(-) rename tests/qemuxmlconfdata/{x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.= args =3D> x86_64-default-cpu-kvm-pc.x86_64-latest.args} (95%) rename tests/qemuxmlconfdata/{x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.= xml =3D> x86_64-default-cpu-kvm-pc.x86_64-latest.xml} (95%) rename tests/qemuxmlconfdata/{x86_64-default-cpu-kvm-q35-4.2.xml =3D> x86_= 64-default-cpu-kvm-pc.xml} (90%) rename tests/qemuxmlconfdata/{x86_64-default-cpu-kvm-q35-4.2.x86_64-latest= .args =3D> x86_64-default-cpu-kvm-q35.x86_64-latest.args} (96%) rename tests/qemuxmlconfdata/{x86_64-default-cpu-kvm-q35-4.2.x86_64-latest= .xml =3D> x86_64-default-cpu-kvm-q35.x86_64-latest.xml} (97%) rename tests/qemuxmlconfdata/{x86_64-default-cpu-kvm-pc-4.2.xml =3D> x86_6= 4-default-cpu-kvm-q35.xml} (90%) rename tests/qemuxmlconfdata/{x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.= args =3D> x86_64-default-cpu-tcg-pc.x86_64-latest.args} (95%) rename tests/qemuxmlconfdata/{x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.= xml =3D> x86_64-default-cpu-tcg-pc.x86_64-latest.xml} (95%) rename tests/qemuxmlconfdata/{x86_64-default-cpu-tcg-q35-4.2.xml =3D> x86_= 64-default-cpu-tcg-pc.xml} (90%) rename tests/qemuxmlconfdata/{x86_64-default-cpu-tcg-q35-4.2.x86_64-latest= .args =3D> x86_64-default-cpu-tcg-q35.x86_64-latest.args} (96%) rename tests/qemuxmlconfdata/{x86_64-default-cpu-tcg-q35-4.2.x86_64-latest= .xml =3D> x86_64-default-cpu-tcg-q35.x86_64-latest.xml} (97%) rename tests/qemuxmlconfdata/{x86_64-default-cpu-tcg-pc-4.2.xml =3D> x86_6= 4-default-cpu-tcg-q35.xml} (90%) diff --git a/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-lat= est.args b/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc.x86_64-latest.ar= gs similarity index 95% rename from tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-late= st.args rename to tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc.x86_64-latest.args index 59a4a21451..eb3d834a6c 100644 --- a/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.args +++ b/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc.x86_64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -name guest=3Dguest,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --machine pc-i440fx-4.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,acpi=3Don \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Don \ -accel kvm \ -cpu qemu64 \ -m size=3D4194304k \ diff --git a/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-lat= est.xml b/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc.x86_64-latest.xml similarity index 95% rename from tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-late= st.xml rename to tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc.x86_64-latest.xml index 3a610ab49f..0b33815d67 100644 --- a/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc.x86_64-latest.xml @@ -5,7 +5,7 @@ 4194304 4 - hvm + hvm diff --git a/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35-4.2.xml b/tes= ts/qemuxmlconfdata/x86_64-default-cpu-kvm-pc.xml similarity index 90% rename from tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35-4.2.xml rename to tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc.xml index bf2678e674..461cfc3020 100644 --- a/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35-4.2.xml +++ b/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc.xml @@ -5,7 +5,7 @@ 4194304 4 - hvm + hvm diff --git a/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-la= test.args b/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35.x86_64-latest.= args similarity index 96% rename from tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-lat= est.args rename to tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35.x86_64-latest.ar= gs index 18b682e9b7..c82cf98fd2 100644 --- a/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.ar= gs +++ b/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35.x86_64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -name guest=3Dguest,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --machine pc-q35-4.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,acpi=3Don \ +-machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Don \ -accel kvm \ -cpu qemu64 \ -m size=3D4194304k \ diff --git a/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-la= test.xml b/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35.x86_64-latest.x= ml similarity index 97% rename from tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-lat= est.xml rename to tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35.x86_64-latest.xml index bf9010ec57..15d756830f 100644 --- a/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35.x86_64-latest.xml @@ -5,7 +5,7 @@ 4194304 4 - hvm + hvm diff --git a/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc-4.2.xml b/test= s/qemuxmlconfdata/x86_64-default-cpu-kvm-q35.xml similarity index 90% rename from tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc-4.2.xml rename to tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35.xml index ce432ef52f..c80ae0c126 100644 --- a/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc-4.2.xml +++ b/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35.xml @@ -5,7 +5,7 @@ 4194304 4 - hvm + hvm diff --git a/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-lat= est.args b/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc.x86_64-latest.ar= gs similarity index 95% rename from tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-late= st.args rename to tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc.x86_64-latest.args index 74a54d6d87..a8fb64384c 100644 --- a/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.args +++ b/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc.x86_64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -name guest=3Dguest,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --machine pc-i440fx-4.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,acpi=3Don \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Don \ -accel tcg \ -cpu qemu64 \ -m size=3D4194304k \ diff --git a/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-lat= est.xml b/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc.x86_64-latest.xml similarity index 95% rename from tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-late= st.xml rename to tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc.x86_64-latest.xml index 634b59efa7..50ba5343e9 100644 --- a/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc.x86_64-latest.xml @@ -5,7 +5,7 @@ 4194304 4 - hvm + hvm diff --git a/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35-4.2.xml b/tes= ts/qemuxmlconfdata/x86_64-default-cpu-tcg-pc.xml similarity index 90% rename from tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35-4.2.xml rename to tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc.xml index 4e3b341800..01bce4109f 100644 --- a/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35-4.2.xml +++ b/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc.xml @@ -5,7 +5,7 @@ 4194304 4 - hvm + hvm diff --git a/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-la= test.args b/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35.x86_64-latest.= args similarity index 96% rename from tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-lat= est.args rename to tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35.x86_64-latest.ar= gs index 5971d03336..33981e6dd0 100644 --- a/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.ar= gs +++ b/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35.x86_64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -name guest=3Dguest,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --machine pc-q35-4.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,acpi=3Don \ +-machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Don \ -accel tcg \ -cpu qemu64 \ -m size=3D4194304k \ diff --git a/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-la= test.xml b/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35.x86_64-latest.x= ml similarity index 97% rename from tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-lat= est.xml rename to tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35.x86_64-latest.xml index a0c1563fbd..59ebdd87a0 100644 --- a/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35.x86_64-latest.xml @@ -5,7 +5,7 @@ 4194304 4 - hvm + hvm diff --git a/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc-4.2.xml b/test= s/qemuxmlconfdata/x86_64-default-cpu-tcg-q35.xml similarity index 90% rename from tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc-4.2.xml rename to tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35.xml index 8e77a3ad92..cd293215e0 100644 --- a/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc-4.2.xml +++ b/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35.xml @@ -5,7 +5,7 @@ 4194304 4 - hvm + hvm diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index 5d416be9db..36ad51185d 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -2985,10 +2985,10 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("ppc64-default-cpu-tcg-pseries-4.2", "ppc64"); DO_TEST_CAPS_ARCH_LATEST("s390-default-cpu-kvm-ccw-virtio-4.2", "s390x= "); DO_TEST_CAPS_ARCH_LATEST("s390-default-cpu-tcg-ccw-virtio-4.2", "s390x= "); - DO_TEST_CAPS_ARCH_LATEST("x86_64-default-cpu-kvm-pc-4.2", "x86_64"); - DO_TEST_CAPS_ARCH_LATEST("x86_64-default-cpu-tcg-pc-4.2", "x86_64"); - DO_TEST_CAPS_ARCH_LATEST("x86_64-default-cpu-kvm-q35-4.2", "x86_64"); - DO_TEST_CAPS_ARCH_LATEST("x86_64-default-cpu-tcg-q35-4.2", "x86_64"); + DO_TEST_CAPS_ARCH_LATEST("x86_64-default-cpu-kvm-pc", "x86_64"); + DO_TEST_CAPS_ARCH_LATEST("x86_64-default-cpu-tcg-pc", "x86_64"); + DO_TEST_CAPS_ARCH_LATEST("x86_64-default-cpu-kvm-q35", "x86_64"); + DO_TEST_CAPS_ARCH_LATEST("x86_64-default-cpu-tcg-q35", "x86_64"); DO_TEST_CAPS_ARCH_LATEST("x86_64-default-cpu-tcg-features", "x86_64"); DO_TEST_CAPS_ARCH_LATEST("riscv64-virt-features-aia", "riscv64"); --=20 2.51.0