From nobody Mon Feb 9 12:28:59 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1641462330; cv=none; d=zohomail.com; s=zohoarc; b=GMfesH5kZGTm5Qdhh3ZHVlF6LPvF+1DyrpcJKH/uNjgrJHr/NItEkbEs98kHcAIiqzVEs/Wto4Yx4pZvKJ1qH0V0gxR1JE1PecWFx1Xs4eplmYZ79psW4s4IHm8LAOimvHemRIOO0GssYDUWnQYEZIspU3FRxsbyG2ypYlGsYcE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641462330; 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=6QgFNdUXae5+aAZ8ZtRuUrKc9167fZwif67AxmJrekA=; b=ErzO9y6oPcIxhqDkWJXjJEjJbNoN6+s/wZWY4jTgnJkzqL92uJlOefc2IEeNoiYvOq0UAkSnPIWvWNSRCPb+Vb/9BTBKnDHzDlzblAgnCrjA4mgnVyl9awfR7MHe6q/k6/rhdsUktamiod9pCH4I2YSCopTnG+HL2phGE4mLvys= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1641462330697172.90550951641274; Thu, 6 Jan 2022 01:45:30 -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-653-vgkvvIWYMpGkIrAyR3g1Eg-1; Thu, 06 Jan 2022 04:45:25 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 97BCB1006AA3; Thu, 6 Jan 2022 09:45:20 +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 75735106F74C; Thu, 6 Jan 2022 09:45:20 +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 4229B1806D2C; Thu, 6 Jan 2022 09:45:20 +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 2069jJnh005632 for ; Thu, 6 Jan 2022 04:45:19 -0500 Received: by smtp.corp.redhat.com (Postfix) id 6B1617D4AF; Thu, 6 Jan 2022 09:45:19 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.34]) by smtp.corp.redhat.com (Postfix) with ESMTP id A8B257D4A4 for ; Thu, 6 Jan 2022 09:45:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1641462329; 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=6QgFNdUXae5+aAZ8ZtRuUrKc9167fZwif67AxmJrekA=; b=bD7G8q26hgM6djJn1vz4zUGOVUXBMFr35o8+4NSTzyPwYYUb1TLGRsEVvyz80hy4yo1Wff zTBSBYflOJEwwfFLx12rKDVvTTgUJM6lPPHW4UkNuFxyDrlEkmGErUGB0pd3fsXEJ0owkV FUJb9vnu9vahdkL0/lJSy2Dd68mFckM= X-MC-Unique: vgkvvIWYMpGkIrAyR3g1Eg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 05/21] tests: qemuxml2argvdata: Remove use of 'pc-1.0' and 'pc-1.2' machine types Date: Thu, 6 Jan 2022 10:44:04 +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.84 on 10.5.11.22 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: 1641462331889100001 Content-Type: text/plain; charset="utf-8" There's nothing special about the tests requiring to use very old machine types. Most usage is cargo-culted from other tests. Switch all the tests to use 'pc' instead. Signed-off-by: Peter Krempa --- ...launch-security-sev-missing-platform-info.x86_64-2.12.0.args | 2 +- .../launch-security-sev-missing-platform-info.xml | 2 +- tests/qemuxml2argvdata/pci-autoadd-addr.args | 2 +- tests/qemuxml2argvdata/pci-autoadd-addr.xml | 2 +- tests/qemuxml2argvdata/pci-autoadd-idx.args | 2 +- tests/qemuxml2argvdata/pci-autoadd-idx.xml | 2 +- tests/qemuxml2argvdata/pci-autofill-addr.args | 2 +- tests/qemuxml2argvdata/pci-autofill-addr.xml | 2 +- tests/qemuxml2argvdata/pci-bridge-duplicate-index.xml | 2 +- tests/qemuxml2argvdata/pci-bridge-negative-index-invalid.xml | 2 +- tests/qemuxml2argvdata/pci-bridge.args | 2 +- tests/qemuxml2argvdata/pci-bridge.xml | 2 +- tests/qemuxml2argvdata/pci-many.args | 2 +- tests/qemuxml2argvdata/pci-many.xml | 2 +- tests/qemuxml2argvdata/pci-root-address.xml | 2 +- tests/qemuxml2argvdata/pci-root-nonzero-index.xml | 2 +- tests/qemuxml2argvdata/pcihole64-gib.xml | 2 +- tests/qemuxml2argvdata/pcihole64-none.xml | 2 +- tests/qemuxml2argvdata/pcihole64.args | 2 +- tests/qemuxml2argvdata/pcihole64.xml | 2 +- tests/qemuxml2xmloutdata/pci-autoadd-addr.xml | 2 +- tests/qemuxml2xmloutdata/pci-autoadd-idx.xml | 2 +- tests/qemuxml2xmloutdata/pci-autofill-addr.xml | 2 +- tests/qemuxml2xmloutdata/pci-bridge.xml | 2 +- tests/qemuxml2xmloutdata/pci-many.xml | 2 +- tests/qemuxml2xmloutdata/pcihole64-gib.xml | 2 +- tests/qemuxml2xmloutdata/pcihole64-none.xml | 2 +- tests/qemuxml2xmloutdata/pcihole64.xml | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/tests/qemuxml2argvdata/launch-security-sev-missing-platform-in= fo.x86_64-2.12.0.args b/tests/qemuxml2argvdata/launch-security-sev-missing-= platform-info.x86_64-2.12.0.args index 20ad935a68..f7000ea11d 100644 --- a/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_= 64-2.12.0.args +++ b/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_= 64-2.12.0.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-1.0,usb=3Doff,dump-guest-core=3Doff,memory-encryption=3Dlsec0 \ +-machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff,memory-encryption= =3Dlsec0 \ -accel kvm \ -m 214 \ -realtime mlock=3Doff \ diff --git a/tests/qemuxml2argvdata/launch-security-sev-missing-platform-in= fo.xml b/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x= ml index 41ec4cb872..b4f3eb4998 100644 --- a/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.xml +++ b/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.xml @@ -5,7 +5,7 @@ 219100 1 - hvm + hvm diff --git a/tests/qemuxml2argvdata/pci-autoadd-addr.args b/tests/qemuxml2a= rgvdata/pci-autoadd-addr.args index 4643e87933..b77611bbdd 100644 --- a/tests/qemuxml2argvdata/pci-autoadd-addr.args +++ b/tests/qemuxml2argvdata/pci-autoadd-addr.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3Dfdr-br,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-fdr-= br/master-key.aes \ --machine pc-1.2,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 2048 \ -realtime mlock=3Doff \ diff --git a/tests/qemuxml2argvdata/pci-autoadd-addr.xml b/tests/qemuxml2ar= gvdata/pci-autoadd-addr.xml index 57b920ba09..fec2b151ed 100644 --- a/tests/qemuxml2argvdata/pci-autoadd-addr.xml +++ b/tests/qemuxml2argvdata/pci-autoadd-addr.xml @@ -5,7 +5,7 @@ 2097152 2 - hvm + hvm diff --git a/tests/qemuxml2argvdata/pci-autoadd-idx.args b/tests/qemuxml2ar= gvdata/pci-autoadd-idx.args index bf1f0460d1..b9ec27af3f 100644 --- a/tests/qemuxml2argvdata/pci-autoadd-idx.args +++ b/tests/qemuxml2argvdata/pci-autoadd-idx.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3Dfdr-br,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-fdr-= br/master-key.aes \ --machine pc-1.2,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 2048 \ -realtime mlock=3Doff \ diff --git a/tests/qemuxml2argvdata/pci-autoadd-idx.xml b/tests/qemuxml2arg= vdata/pci-autoadd-idx.xml index 0a72956f9e..614a60329e 100644 --- a/tests/qemuxml2argvdata/pci-autoadd-idx.xml +++ b/tests/qemuxml2argvdata/pci-autoadd-idx.xml @@ -5,7 +5,7 @@ 2097152 2 - hvm + hvm diff --git a/tests/qemuxml2argvdata/pci-autofill-addr.args b/tests/qemuxml2= argvdata/pci-autofill-addr.args index d30b31e7f5..002bd37416 100644 --- a/tests/qemuxml2argvdata/pci-autofill-addr.args +++ b/tests/qemuxml2argvdata/pci-autofill-addr.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3Dfdr-br,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-fdr-= br/master-key.aes \ --machine pc-1.2,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 2048 \ -realtime mlock=3Doff \ diff --git a/tests/qemuxml2argvdata/pci-autofill-addr.xml b/tests/qemuxml2a= rgvdata/pci-autofill-addr.xml index a601c50ab9..1d5dbf9b23 100644 --- a/tests/qemuxml2argvdata/pci-autofill-addr.xml +++ b/tests/qemuxml2argvdata/pci-autofill-addr.xml @@ -5,7 +5,7 @@ 2097152 2 - hvm + hvm diff --git a/tests/qemuxml2argvdata/pci-bridge-duplicate-index.xml b/tests/= qemuxml2argvdata/pci-bridge-duplicate-index.xml index e298d66618..ef7b828233 100644 --- a/tests/qemuxml2argvdata/pci-bridge-duplicate-index.xml +++ b/tests/qemuxml2argvdata/pci-bridge-duplicate-index.xml @@ -4,7 +4,7 @@ 2097152 2 - hvm + hvm diff --git a/tests/qemuxml2argvdata/pci-bridge-negative-index-invalid.xml b= /tests/qemuxml2argvdata/pci-bridge-negative-index-invalid.xml index 790827ae04..36a5fafae0 100644 --- a/tests/qemuxml2argvdata/pci-bridge-negative-index-invalid.xml +++ b/tests/qemuxml2argvdata/pci-bridge-negative-index-invalid.xml @@ -4,7 +4,7 @@ 2097152 2 - hvm + hvm diff --git a/tests/qemuxml2argvdata/pci-bridge.args b/tests/qemuxml2argvdat= a/pci-bridge.args index d9a7b78b97..9608f79dfa 100644 --- a/tests/qemuxml2argvdata/pci-bridge.args +++ b/tests/qemuxml2argvdata/pci-bridge.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3Dfdr-br,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-fdr-= br/master-key.aes \ --machine pc-1.2,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 2048 \ -realtime mlock=3Doff \ diff --git a/tests/qemuxml2argvdata/pci-bridge.xml b/tests/qemuxml2argvdata= /pci-bridge.xml index c28adfe43e..886b8ae641 100644 --- a/tests/qemuxml2argvdata/pci-bridge.xml +++ b/tests/qemuxml2argvdata/pci-bridge.xml @@ -5,7 +5,7 @@ 2097152 2 - hvm + hvm diff --git a/tests/qemuxml2argvdata/pci-many.args b/tests/qemuxml2argvdata/= pci-many.args index b098fbaeab..0139f12ccd 100644 --- a/tests/qemuxml2argvdata/pci-many.args +++ b/tests/qemuxml2argvdata/pci-many.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3Dfdr-br,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-fdr-= br/master-key.aes \ --machine pc-1.2,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 2048 \ -realtime mlock=3Doff \ diff --git a/tests/qemuxml2argvdata/pci-many.xml b/tests/qemuxml2argvdata/p= ci-many.xml index 28654d5a48..e5603f04b6 100644 --- a/tests/qemuxml2argvdata/pci-many.xml +++ b/tests/qemuxml2argvdata/pci-many.xml @@ -5,7 +5,7 @@ 2097152 2 - hvm + hvm diff --git a/tests/qemuxml2argvdata/pci-root-address.xml b/tests/qemuxml2ar= gvdata/pci-root-address.xml index 2f5058b330..08b4c61619 100644 --- a/tests/qemuxml2argvdata/pci-root-address.xml +++ b/tests/qemuxml2argvdata/pci-root-address.xml @@ -4,7 +4,7 @@ 2097152 2 - hvm + hvm diff --git a/tests/qemuxml2argvdata/pci-root-nonzero-index.xml b/tests/qemu= xml2argvdata/pci-root-nonzero-index.xml index 5d0dcc7dd5..49fd0f6e60 100644 --- a/tests/qemuxml2argvdata/pci-root-nonzero-index.xml +++ b/tests/qemuxml2argvdata/pci-root-nonzero-index.xml @@ -4,7 +4,7 @@ 2097152 2 - hvm + hvm diff --git a/tests/qemuxml2argvdata/pcihole64-gib.xml b/tests/qemuxml2argvd= ata/pcihole64-gib.xml index ef5237edd7..a82c847fda 100644 --- a/tests/qemuxml2argvdata/pcihole64-gib.xml +++ b/tests/qemuxml2argvdata/pcihole64-gib.xml @@ -5,7 +5,7 @@ 2097152 2 - hvm + hvm diff --git a/tests/qemuxml2argvdata/pcihole64-none.xml b/tests/qemuxml2argv= data/pcihole64-none.xml index 5f96ef3b0d..e924747418 100644 --- a/tests/qemuxml2argvdata/pcihole64-none.xml +++ b/tests/qemuxml2argvdata/pcihole64-none.xml @@ -5,7 +5,7 @@ 2097152 2 - hvm + hvm diff --git a/tests/qemuxml2argvdata/pcihole64.args b/tests/qemuxml2argvdata= /pcihole64.args index 69733910e6..45e49c7a3f 100644 --- a/tests/qemuxml2argvdata/pcihole64.args +++ b/tests/qemuxml2argvdata/pcihole64.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3Dfoo,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-foo/= master-key.aes \ --machine pc-1.2,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 2048 \ -realtime mlock=3Doff \ diff --git a/tests/qemuxml2argvdata/pcihole64.xml b/tests/qemuxml2argvdata/= pcihole64.xml index 7ed2ce3ba4..0b289b1733 100644 --- a/tests/qemuxml2argvdata/pcihole64.xml +++ b/tests/qemuxml2argvdata/pcihole64.xml @@ -5,7 +5,7 @@ 2097152 2 - hvm + hvm diff --git a/tests/qemuxml2xmloutdata/pci-autoadd-addr.xml b/tests/qemuxml2= xmloutdata/pci-autoadd-addr.xml index cff6b2fa4d..2670c9d951 100644 --- a/tests/qemuxml2xmloutdata/pci-autoadd-addr.xml +++ b/tests/qemuxml2xmloutdata/pci-autoadd-addr.xml @@ -5,7 +5,7 @@ 2097152 2 - hvm + hvm diff --git a/tests/qemuxml2xmloutdata/pci-autoadd-idx.xml b/tests/qemuxml2x= mloutdata/pci-autoadd-idx.xml index f42c77d219..8812868ba8 100644 --- a/tests/qemuxml2xmloutdata/pci-autoadd-idx.xml +++ b/tests/qemuxml2xmloutdata/pci-autoadd-idx.xml @@ -5,7 +5,7 @@ 2097152 2 - hvm + hvm diff --git a/tests/qemuxml2xmloutdata/pci-autofill-addr.xml b/tests/qemuxml= 2xmloutdata/pci-autofill-addr.xml index 30dc7625ec..e12dc4bae3 100644 --- a/tests/qemuxml2xmloutdata/pci-autofill-addr.xml +++ b/tests/qemuxml2xmloutdata/pci-autofill-addr.xml @@ -5,7 +5,7 @@ 2097152 2 - hvm + hvm diff --git a/tests/qemuxml2xmloutdata/pci-bridge.xml b/tests/qemuxml2xmlout= data/pci-bridge.xml index d95660a381..46e42a8bc3 100644 --- a/tests/qemuxml2xmloutdata/pci-bridge.xml +++ b/tests/qemuxml2xmloutdata/pci-bridge.xml @@ -5,7 +5,7 @@ 2097152 2 - hvm + hvm diff --git a/tests/qemuxml2xmloutdata/pci-many.xml b/tests/qemuxml2xmloutda= ta/pci-many.xml index b610e3aa3c..635bccc696 100644 --- a/tests/qemuxml2xmloutdata/pci-many.xml +++ b/tests/qemuxml2xmloutdata/pci-many.xml @@ -5,7 +5,7 @@ 2097152 2 - hvm + hvm diff --git a/tests/qemuxml2xmloutdata/pcihole64-gib.xml b/tests/qemuxml2xml= outdata/pcihole64-gib.xml index d9b821bfe2..1ad7ca40d8 100644 --- a/tests/qemuxml2xmloutdata/pcihole64-gib.xml +++ b/tests/qemuxml2xmloutdata/pcihole64-gib.xml @@ -5,7 +5,7 @@ 2097152 2 - hvm + hvm diff --git a/tests/qemuxml2xmloutdata/pcihole64-none.xml b/tests/qemuxml2xm= loutdata/pcihole64-none.xml index f4941bc67b..c4b12510bf 100644 --- a/tests/qemuxml2xmloutdata/pcihole64-none.xml +++ b/tests/qemuxml2xmloutdata/pcihole64-none.xml @@ -5,7 +5,7 @@ 2097152 2 - hvm + hvm diff --git a/tests/qemuxml2xmloutdata/pcihole64.xml b/tests/qemuxml2xmloutd= ata/pcihole64.xml index 52d61603aa..5058107227 100644 --- a/tests/qemuxml2xmloutdata/pcihole64.xml +++ b/tests/qemuxml2xmloutdata/pcihole64.xml @@ -5,7 +5,7 @@ 2097152 2 - hvm + hvm --=20 2.31.1