From nobody Sun Feb 8 20:17:34 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=1641462367; cv=none; d=zohomail.com; s=zohoarc; b=AwWG1FRv4ZVZrT9obQgfaD6xB3LFfovE8l4BpKrCE8Q4iay2oKZ0GEnOn516ocl8qePZpwpHqQRRU3I+/d5yKYX8XXzF7zs74nICYrK+lPBM6eJeXSY/8Z0tppHf6+IN63a9H3+JQEUKot2S4BBGvS7ZcF1eI6EJO+UKuS4BPd8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641462367; 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=xyqtFdvyui9o9BIWtJgAfkQ9vLI8Dj7e5lfJR4RD/P4=; b=Lganoiq/trYi1efgDFNhLwzmPLc1qiK/qJ9xoz8JIOgP0v4i0VO9IFf0S2AM9V4/acf6hrQTgsKGVckakAnSg679DjS5yDSVVYKS8MPKpbIvuhqTXHqZXIl4wv5ei6gmL0+ZlaYS1gkxm8KhMmG4g7q39tB5Ko/sxQjK+9IDP74= 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 1641462367649542.5865192890037; Thu, 6 Jan 2022 01:46:07 -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-608-dIfUgnu9MPOQvsHiZmgF6w-1; Thu, 06 Jan 2022 04:46:02 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 763F08015CD; 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 585CD7CAD2; Thu, 6 Jan 2022 09:45:54 +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 294811802FE8; Thu, 6 Jan 2022 09:45:54 +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 2069jpuv005715 for ; Thu, 6 Jan 2022 04:45:51 -0500 Received: by smtp.corp.redhat.com (Postfix) id C4A117CD6C; Thu, 6 Jan 2022 09:45:51 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.34]) by smtp.corp.redhat.com (Postfix) with ESMTP id 23A547D4AF for ; Thu, 6 Jan 2022 09:45:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1641462366; 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=xyqtFdvyui9o9BIWtJgAfkQ9vLI8Dj7e5lfJR4RD/P4=; b=ZR9ghd/0eMJhLQsu7SCOXvDtNFn2OHTPtuZJgRosHH3yvyCpGBAl4MFRLw7oOU8ZiAYSI2 fkrC690yge4yreDHtxLrdAdJXv+fFKEA0WMqvbBtOK+hbcU4thCXhNPEmze00Qn91vR64f XU9vMiRgV6mvgvYTqLPuUS7mu3WYwnQ= X-MC-Unique: dIfUgnu9MPOQvsHiZmgF6w-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 10/21] tests: qemuxml2argvdata: Purge versioned i440fx machine types from fake-caps tests Date: Thu, 6 Jan 2022 10:44:09 +0100 Message-Id: <733b007b245db0499a55fa5308c0ce752db14e67.1641461748.git.pkrempa@redhat.com> 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.12 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: 1641462368173100006 Content-Type: text/plain; charset="utf-8" Use the 'pc' alias for them as it's equivalent. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- tests/qemuxml2argvdata/fd-memory-no-numa-topology.args | 2 +- tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml | 2 +- tests/qemuxml2argvdata/fd-memory-numa-topology.args | 2 +- tests/qemuxml2argvdata/fd-memory-numa-topology.xml | 2 +- tests/qemuxml2argvdata/fd-memory-numa-topology2.args | 2 +- tests/qemuxml2argvdata/fd-memory-numa-topology2.xml | 2 +- tests/qemuxml2argvdata/fd-memory-numa-topology3.args | 2 +- tests/qemuxml2argvdata/fd-memory-numa-topology3.xml | 2 +- tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/hugepages-memaccess3.xml | 2 +- tests/qemuxml2argvdata/hugepages-numa-default-dimm.args | 2 +- tests/qemuxml2argvdata/hugepages-numa-default-dimm.xml | 2 +- tests/qemuxml2argvdata/hugepages-numa-default.args | 2 +- tests/qemuxml2argvdata/hugepages-numa-default.xml | 2 +- tests/qemuxml2argvdata/pages-dimm-discard.args | 2 +- tests/qemuxml2argvdata/pages-dimm-discard.xml | 2 +- tests/qemuxml2argvdata/pci-bridge-many-disks.args | 2 +- tests/qemuxml2argvdata/pci-bridge-many-disks.xml | 2 +- tests/qemuxml2argvdata/pci-expander-bus-bad-bus.xml | 2 +- tests/qemuxml2argvdata/pci-expander-bus-bad-node.xml | 2 +- tests/qemuxml2argvdata/pci-expander-bus.args | 2 +- tests/qemuxml2argvdata/pci-expander-bus.xml | 2 +- tests/qemuxml2argvdata/pcie-expander-bus-bad-machine.xml | 2 +- tests/qemuxml2argvdata/seclabel-dynamic-none-relabel.xml | 2 +- tests/qemuxml2argvdata/user-aliases-usb.args | 2 +- tests/qemuxml2argvdata/user-aliases-usb.xml | 2 +- tests/qemuxml2argvdata/user-aliases.args | 2 +- tests/qemuxml2argvdata/user-aliases.xml | 2 +- tests/qemuxml2xmloutdata/pci-bridge-many-disks.xml | 2 +- tests/qemuxml2xmloutdata/pci-expander-bus.xml | 2 +- .../seclabel-dynamic-none-relabel-inactive.xml | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) diff --git a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args b/tests= /qemuxml2argvdata/fd-memory-no-numa-topology.args index e84d6ce6a7..df5dc2f37a 100644 --- a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args +++ b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3Dinstance-00000092,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-inst= ance-00000092/master-key.aes \ --machine pc-i440fx-2.3,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -m 14336 \ -mem-prealloc \ diff --git a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml b/tests/= qemuxml2argvdata/fd-memory-no-numa-topology.xml index cf90ae9f3f..2a986e6d83 100644 --- a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml +++ b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml @@ -10,7 +10,7 @@ 8 - hvm + hvm diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology.args b/tests/qe= muxml2argvdata/fd-memory-numa-topology.args index 1e1bb80912..dd5da42661 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology.args +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3Dinstance-00000092,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-inst= ance-00000092/master-key.aes \ --machine pc-i440fx-2.3,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -m 14336 \ -realtime mlock=3Doff \ diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology.xml b/tests/qem= uxml2argvdata/fd-memory-numa-topology.xml index 8bc0a68ed4..22719b9545 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology.xml +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology.xml @@ -10,7 +10,7 @@ 8 - hvm + hvm diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology2.args b/tests/q= emuxml2argvdata/fd-memory-numa-topology2.args index 17accabf6a..1b27d6b7bf 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology2.args +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology2.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3Dinstance-00000092,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-inst= ance-00000092/master-key.aes \ --machine pc-i440fx-2.3,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -m 28672 \ -realtime mlock=3Doff \ diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml b/tests/qe= muxml2argvdata/fd-memory-numa-topology2.xml index d054963eb8..f6af88a2a8 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml @@ -10,7 +10,7 @@ 20 - hvm + hvm diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology3.args b/tests/q= emuxml2argvdata/fd-memory-numa-topology3.args index a838877a03..a324ce13fd 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology3.args +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology3.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3Dinstance-00000092,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-inst= ance-00000092/master-key.aes \ --machine pc-i440fx-2.3,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -m 43008 \ -realtime mlock=3Doff \ diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml b/tests/qe= muxml2argvdata/fd-memory-numa-topology3.xml index 139bdfd871..1bf006c21c 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml @@ -10,7 +10,7 @@ 32 - hvm + hvm diff --git a/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args= b/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args index 1d8ecbcf52..f8559a99f2 100644 --- a/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ -name guest=3Dfedora,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-fedora/master-key.aes"}' \ --machine pc-i440fx-2.9,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ -accel kvm \ -cpu qemu64 \ -m 4096 \ diff --git a/tests/qemuxml2argvdata/hugepages-memaccess3.xml b/tests/qemuxm= l2argvdata/hugepages-memaccess3.xml index a9d2cd9da0..54b27e971d 100644 --- a/tests/qemuxml2argvdata/hugepages-memaccess3.xml +++ b/tests/qemuxml2argvdata/hugepages-memaccess3.xml @@ -9,7 +9,7 @@ 4 - hvm + hvm destroy diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args b/test= s/qemuxml2argvdata/hugepages-numa-default-dimm.args index f5c79572b8..f560cabf8e 100644 --- a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args +++ b/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3Dfedora,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-fedo= ra/master-key.aes \ --machine pc-i440fx-2.3,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D1048576k,slots=3D16,maxmem=3D1099511627776k \ -realtime mlock=3Doff \ diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.xml b/tests= /qemuxml2argvdata/hugepages-numa-default-dimm.xml index 51768334d2..260cbb4869 100644 --- a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.xml +++ b/tests/qemuxml2argvdata/hugepages-numa-default-dimm.xml @@ -9,7 +9,7 @@ 2 - hvm + hvm diff --git a/tests/qemuxml2argvdata/hugepages-numa-default.args b/tests/qem= uxml2argvdata/hugepages-numa-default.args index 0cf0bdae39..ed38025797 100644 --- a/tests/qemuxml2argvdata/hugepages-numa-default.args +++ b/tests/qemuxml2argvdata/hugepages-numa-default.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3Dfedora,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-fedo= ra/master-key.aes \ --machine pc-i440fx-2.3,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 1024 \ -realtime mlock=3Doff \ diff --git a/tests/qemuxml2argvdata/hugepages-numa-default.xml b/tests/qemu= xml2argvdata/hugepages-numa-default.xml index 6bbd80d515..d7c82cd8c1 100644 --- a/tests/qemuxml2argvdata/hugepages-numa-default.xml +++ b/tests/qemuxml2argvdata/hugepages-numa-default.xml @@ -8,7 +8,7 @@ 2 - hvm + hvm diff --git a/tests/qemuxml2argvdata/pages-dimm-discard.args b/tests/qemuxml= 2argvdata/pages-dimm-discard.args index d1dd0c1883..2ebe9c1350 100644 --- a/tests/qemuxml2argvdata/pages-dimm-discard.args +++ b/tests/qemuxml2argvdata/pages-dimm-discard.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3Dfedora,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-fedo= ra/master-key.aes \ --machine pc-i440fx-2.3,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m size=3D1048576k,slots=3D16,maxmem=3D1099511627776k \ -realtime mlock=3Doff \ diff --git a/tests/qemuxml2argvdata/pages-dimm-discard.xml b/tests/qemuxml2= argvdata/pages-dimm-discard.xml index 75aa21f0c7..de7e63ad32 100644 --- a/tests/qemuxml2argvdata/pages-dimm-discard.xml +++ b/tests/qemuxml2argvdata/pages-dimm-discard.xml @@ -6,7 +6,7 @@ 2621439 2 - hvm + hvm diff --git a/tests/qemuxml2argvdata/pci-bridge-many-disks.args b/tests/qemu= xml2argvdata/pci-bridge-many-disks.args index 7b28ad6851..659440636c 100644 --- a/tests/qemuxml2argvdata/pci-bridge-many-disks.args +++ b/tests/qemuxml2argvdata/pci-bridge-many-disks.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3Dlots-of-disks,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-lots= -of-disks/master-key.aes \ --machine pc-i440fx-1.4,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -cpu qemu64,kvmclock=3Doff \ -bios /usr/share/seabios/bios.bin \ diff --git a/tests/qemuxml2argvdata/pci-bridge-many-disks.xml b/tests/qemux= ml2argvdata/pci-bridge-many-disks.xml index 8f87f2a93e..5000574073 100644 --- a/tests/qemuxml2argvdata/pci-bridge-many-disks.xml +++ b/tests/qemuxml2argvdata/pci-bridge-many-disks.xml @@ -4,7 +4,7 @@ 4000768 4000000 - hvm + hvm /usr/share/seabios/bios.bin diff --git a/tests/qemuxml2argvdata/pci-expander-bus-bad-bus.xml b/tests/qe= muxml2argvdata/pci-expander-bus-bad-bus.xml index 85c1115da4..237b718e73 100644 --- a/tests/qemuxml2argvdata/pci-expander-bus-bad-bus.xml +++ b/tests/qemuxml2argvdata/pci-expander-bus-bad-bus.xml @@ -5,7 +5,7 @@ 219100 16 - hvm + hvm /usr/bin/qemu-system-x86_64 diff --git a/tests/qemuxml2argvdata/pci-expander-bus-bad-node.xml b/tests/q= emuxml2argvdata/pci-expander-bus-bad-node.xml index 2c390eae8c..3adae42317 100644 --- a/tests/qemuxml2argvdata/pci-expander-bus-bad-node.xml +++ b/tests/qemuxml2argvdata/pci-expander-bus-bad-node.xml @@ -5,7 +5,7 @@ 219100 16 - hvm + hvm /usr/bin/qemu-system-x86_64 diff --git a/tests/qemuxml2argvdata/pci-expander-bus.args b/tests/qemuxml2a= rgvdata/pci-expander-bus.args index 988ad94545..2b8ad5d3bf 100644 --- a/tests/qemuxml2argvdata/pci-expander-bus.args +++ b/tests/qemuxml2argvdata/pci-expander-bus.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3Dexpander-test,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-expa= nder-test/master-key.aes \ --machine pc-i440fx-2.5,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 214 \ -realtime mlock=3Doff \ diff --git a/tests/qemuxml2argvdata/pci-expander-bus.xml b/tests/qemuxml2ar= gvdata/pci-expander-bus.xml index d9aeda1757..53a8943d73 100644 --- a/tests/qemuxml2argvdata/pci-expander-bus.xml +++ b/tests/qemuxml2argvdata/pci-expander-bus.xml @@ -5,7 +5,7 @@ 219100 16 - hvm + hvm diff --git a/tests/qemuxml2argvdata/pcie-expander-bus-bad-machine.xml b/tes= ts/qemuxml2argvdata/pcie-expander-bus-bad-machine.xml index 1c27047b75..5d01336ebb 100644 --- a/tests/qemuxml2argvdata/pcie-expander-bus-bad-machine.xml +++ b/tests/qemuxml2argvdata/pcie-expander-bus-bad-machine.xml @@ -5,7 +5,7 @@ 219100 16 - hvm + hvm diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-none-relabel.xml b/tes= ts/qemuxml2argvdata/seclabel-dynamic-none-relabel.xml index e954250009..d50b8f4aba 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-none-relabel.xml +++ b/tests/qemuxml2argvdata/seclabel-dynamic-none-relabel.xml @@ -10,7 +10,7 @@ 4 - hvm + hvm diff --git a/tests/qemuxml2argvdata/user-aliases-usb.args b/tests/qemuxml2a= rgvdata/user-aliases-usb.args index 92a0ae78b1..1c04eddf12 100644 --- a/tests/qemuxml2argvdata/user-aliases-usb.args +++ b/tests/qemuxml2argvdata/user-aliases-usb.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3Dgentoo,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-gent= oo/master-key.aes \ --machine pc-i440fx-1.4,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -m 4096 \ -realtime mlock=3Doff \ diff --git a/tests/qemuxml2argvdata/user-aliases-usb.xml b/tests/qemuxml2ar= gvdata/user-aliases-usb.xml index 668a9c384b..87b343dc51 100644 --- a/tests/qemuxml2argvdata/user-aliases-usb.xml +++ b/tests/qemuxml2argvdata/user-aliases-usb.xml @@ -5,7 +5,7 @@ 4194304 4 - hvm + hvm diff --git a/tests/qemuxml2argvdata/user-aliases.args b/tests/qemuxml2argvd= ata/user-aliases.args index 486473a566..248469a668 100644 --- a/tests/qemuxml2argvdata/user-aliases.args +++ b/tests/qemuxml2argvdata/user-aliases.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3Dgentoo,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-gent= oo/master-key.aes \ --machine pc-i440fx-1.4,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -m 4096 \ -realtime mlock=3Doff \ diff --git a/tests/qemuxml2argvdata/user-aliases.xml b/tests/qemuxml2argvda= ta/user-aliases.xml index 10b7749521..b688b84b56 100644 --- a/tests/qemuxml2argvdata/user-aliases.xml +++ b/tests/qemuxml2argvdata/user-aliases.xml @@ -10,7 +10,7 @@ 4 - hvm + hvm diff --git a/tests/qemuxml2xmloutdata/pci-bridge-many-disks.xml b/tests/qem= uxml2xmloutdata/pci-bridge-many-disks.xml index 08969c773d..9584c81ae9 100644 --- a/tests/qemuxml2xmloutdata/pci-bridge-many-disks.xml +++ b/tests/qemuxml2xmloutdata/pci-bridge-many-disks.xml @@ -5,7 +5,7 @@ 4000000 1 - hvm + hvm /usr/share/seabios/bios.bin diff --git a/tests/qemuxml2xmloutdata/pci-expander-bus.xml b/tests/qemuxml2= xmloutdata/pci-expander-bus.xml index dbabf55f74..7263d71e9a 100644 --- a/tests/qemuxml2xmloutdata/pci-expander-bus.xml +++ b/tests/qemuxml2xmloutdata/pci-expander-bus.xml @@ -5,7 +5,7 @@ 219100 16 - hvm + hvm diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-none-relabel-inactiv= e.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-none-relabel-inactive.xml index e232a41500..09c019e474 100644 --- a/tests/qemuxml2xmloutdata/seclabel-dynamic-none-relabel-inactive.xml +++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-none-relabel-inactive.xml @@ -10,7 +10,7 @@ 4 - hvm + hvm --=20 2.31.1