From nobody Sun Dec 14 06:21:57 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=1751619410; cv=none; d=zohomail.com; s=zohoarc; b=nizy1enWN0JhFwA6bu+WSN4GYX0VL//je2F8F4lcPIuzrN5jTfeSkW3Xzib8YfK44Xea39HXOLg8JGej4TzpYTlJ0K0bG+7TA5T5Bg6/BMIGf2F4hTNL0lX8pW1WPF7gsv5++hau/Gyi+Or0pn3w/3Q/8P7iosHAPIY48+55sxI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751619410; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post: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=Pd/AtyNiqAayEWedoGI0ptlA2MJPtVbRkKSYJlchW1g=; b=JpNQD76MKskgXnSW+/Pyx9K0aRvPqAN8mXO/Fgc3po3J0tcPR8MlUZo0wA/AIBorB2LtbDaqwXtiBuCSaxPrpcaEcI3rQd1qXUh3S/Mj6fONVaPVztcLYgj5K+Bpzje4W3g83yXCg959oZYJmE84vpUBAn94JMWyYg8zDoJlLI0= 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 1751619410159348.79259745593765; Fri, 4 Jul 2025 01:56:50 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 0076913ED; Fri, 4 Jul 2025 04:56:48 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id F1458140E; Fri, 4 Jul 2025 04:52:12 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 5ED3812D3; Fri, 4 Jul 2025 04:52:07 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 4D5C31389 for ; Fri, 4 Jul 2025 04:51:53 -0400 (EDT) Received: from mx-prod-mc-02.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-502-IXNe9kooOr-01uGtzYZ5fA-1; Fri, 04 Jul 2025 04:51:51 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 672CF1956086 for ; Fri, 4 Jul 2025 08:51:50 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.5]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 646C71800285 for ; Fri, 4 Jul 2025 08:51:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: ** X-Spam-Status: No, score=2.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_SBL_CSS,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE,WEIRD_PORT autolearn=no autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751619112; 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=uHplhcfAoEyRKi8xC3iM5aNn4XMHIqrnp2uCKLmdNoI=; b=akhzkCwwlRDpIQ9wYZr5wdLx9Cbhlan3APyHRV0nGEIyxfBzI6JTWqD7hQqIwnx1wbSo4u PlSFiKNRXfhjVmM+vUIarU9soYsi4Hk4Oypj5yJe26YzWDBD7jSFbP2vy0giAkNFQp3X6n sFEpO7wyRJgh3/Zac5eHjlJF5TXDW3o= X-MC-Unique: IXNe9kooOr-01uGtzYZ5fA-1 X-Mimecast-MFC-AGG-ID: IXNe9kooOr-01uGtzYZ5fA_1751619110 To: devel@lists.libvirt.org Subject: [PATCH 5/7] qemuxmlconftest: x86_64: Bump 'firmware*' test cases to 'pc-i440fx-10.0' Date: Fri, 4 Jul 2025 10:51:39 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: fDwHVoPYTlbtEhQr6tQ3OGWkL63YTlyN4e4tQA8j5dg_1751619110 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: N657JYUU6KG347JQ2LVGAGAH4LVDH4CW X-Message-ID-Hash: N657JYUU6KG347JQ2LVGAGAH4LVDH4CW X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: 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: 1751619412436116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa New qemu is deprecating 'pc-i440fx-4.0-machine', update to the latest released machine type. Apart from the previous cases where we could use the aliased machine type, the firmware auto-selection doesn't work properly for the unexpanded 'pc' alias and thus we need to use a real machine type here. Outside of tests a real machine type would be filled anyways, the use of the alias happens only inside our '-latest' test suite. Signed-off-by: Peter Krempa --- ...e-auto-efi-format-nvram-qcow2-network-nbd.x86_64-latest.args | 2 +- ...re-auto-efi-format-nvram-qcow2-network-nbd.x86_64-latest.xml | 2 +- .../firmware-auto-efi-format-nvram-qcow2-network-nbd.xml | 2 +- .../firmware-auto-efi-nvram-file.x86_64-latest.args | 2 +- .../firmware-auto-efi-nvram-file.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-auto-efi-nvram-file.xml | 2 +- .../firmware-auto-efi-nvram-network-iscsi.x86_64-latest.args | 2 +- .../firmware-auto-efi-nvram-network-iscsi.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-iscsi.xml | 2 +- .../firmware-auto-efi-nvram-network-nbd.x86_64-latest.args | 2 +- .../firmware-auto-efi-nvram-network-nbd.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-nbd.xml | 2 +- tests/qemuxmlconfdata/firmware-manual-bios-not-stateless.xml | 2 +- .../firmware-manual-bios-stateless.x86_64-latest.args | 2 +- .../firmware-manual-bios-stateless.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-manual-bios-stateless.xml | 2 +- tests/qemuxmlconfdata/firmware-manual-bios.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/firmware-manual-bios.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-manual-bios.xml | 2 +- .../firmware-manual-efi-features.x86_64-latest.args | 2 +- .../firmware-manual-efi-features.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-manual-efi-features.xml | 2 +- tests/qemuxmlconfdata/firmware-manual-efi-loader-no-path.xml | 2 +- .../firmware-manual-efi-nvram-file.x86_64-latest.args | 2 +- .../firmware-manual-efi-nvram-file.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-manual-efi-nvram-file.xml | 2 +- .../firmware-manual-efi-nvram-network-iscsi.x86_64-latest.args | 2 +- .../firmware-manual-efi-nvram-network-iscsi.x86_64-latest.xml | 2 +- .../qemuxmlconfdata/firmware-manual-efi-nvram-network-iscsi.xml | 2 +- .../firmware-manual-efi-nvram-network-nbd.x86_64-latest.args | 2 +- .../firmware-manual-efi-nvram-network-nbd.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-nbd.xml | 2 +- tests/qemuxmlconfdata/firmware-manual-efi-nvram-stateless.xml | 2 +- .../firmware-manual-efi-nvram-template-stateless.xml | 2 +- .../firmware-manual-efi-nvram-template.x86_64-latest.args | 2 +- .../firmware-manual-efi-nvram-template.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-manual-efi-nvram-template.xml | 2 +- .../firmware-manual-efi-rw-implicit.x86_64-latest.args | 2 +- .../firmware-manual-efi-rw-implicit.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-manual-efi-rw-implicit.xml | 2 +- tests/qemuxmlconfdata/firmware-manual-efi-rw.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/firmware-manual-efi-rw.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-manual-efi-rw.xml | 2 +- .../firmware-manual-efi-stateless.x86_64-latest.args | 2 +- .../firmware-manual-efi-stateless.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-manual-efi-stateless.xml | 2 +- tests/qemuxmlconfdata/firmware-manual-efi.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/firmware-manual-efi.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-manual-efi.xml | 2 +- 49 files changed, 49 insertions(+), 49 deletions(-) diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-net= work-nbd.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-forma= t-nvram-qcow2-network-nbd.x86_64-latest.args index e8e6157f67..046aeb77cd 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-network-nb= d.x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-network-nb= d.x86_64-latest.args @@ -14,7 +14,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"qcow2","file":"libvirt-pflash0-storage","backing":null}' \ -blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.org","p= ort":"6000"},"node-name":"libvirt-pflash1-storage","auto-read-only":true,"d= iscard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"qcow2","file":"libvirt-pflash1-storage","backing":null}' \ --machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,acpi= =3Don \ +-machine pc-i440fx-10.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,acp= i=3Don \ -accel tcg \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-net= work-nbd.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-format= -nvram-qcow2-network-nbd.x86_64-latest.xml index cc87905306..36597d2e8d 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-network-nb= d.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-network-nb= d.x86_64-latest.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-net= work-nbd.xml b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-n= etwork-nbd.xml index d604840edd..2c9b93a7d0 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-network-nb= d.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-network-nb= d.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-file.x86_64-late= st.args b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-file.x86_64-latest.= args index 42e075b1b6..0cb780853a 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-file.x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-file.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.fd"= ,"node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unm= ap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/path/to/guest_VARS.fd","node-name= ":"libvirt-pflash1-storage","read-only":false}' \ --machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,acp= i=3Don \ +-machine pc-i440fx-10.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,ac= pi=3Don \ -accel tcg \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-file.x86_64-late= st.xml b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-file.x86_64-latest.x= ml index dac07adb3e..d864a3b081 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-file.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-file.x86_64-latest.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-file.xml b/tests= /qemuxmlconfdata/firmware-auto-efi-nvram-file.xml index 8353cc3e82..d266741c2d 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-file.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-file.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-iscsi.x8= 6_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-is= csi.x86_64-latest.args index 8a85bbacce..026155edff 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-iscsi.x86_64-la= test.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-iscsi.x86_64-la= test.args @@ -14,7 +14,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ -object '{"qom-type":"secret","id":"libvirt-pflash1-storage-auth-secret0",= "data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","= keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}'= \ -blockdev '{"driver":"iscsi","portal":"example.com:6000","target":"iqn.201= 3-07.com.example:iscsi-nopool","lun":0,"transport":"tcp","user":"myname","p= assword-secret":"libvirt-pflash1-storage-auth-secret0","node-name":"libvirt= -pflash1-storage","read-only":false}' \ --machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,acp= i=3Don \ +-machine pc-i440fx-10.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,ac= pi=3Don \ -accel tcg \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-iscsi.x8= 6_64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-isc= si.x86_64-latest.xml index b21932d1b8..bdfc7b9589 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-iscsi.x86_64-la= test.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-iscsi.x86_64-la= test.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-iscsi.xm= l b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-iscsi.xml index c709f3e319..eda014fa14 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-iscsi.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-iscsi.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-nbd.x86_= 64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-nbd.= x86_64-latest.args index 086bfa1ee2..2999e321d7 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-nbd.x86_64-late= st.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-nbd.x86_64-late= st.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.fd"= ,"node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unm= ap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.org","p= ort":"6000"},"export":"bar","node-name":"libvirt-pflash1-storage","read-onl= y":false}' \ --machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,acp= i=3Don \ +-machine pc-i440fx-10.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,ac= pi=3Don \ -accel tcg \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-nbd.x86_= 64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-nbd.x= 86_64-latest.xml index 6418ff6c3c..2bc72e6c2b 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-nbd.x86_64-late= st.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-nbd.x86_64-late= st.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-nbd.xml = b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-nbd.xml index 2a46819ef2..cbd2e550b4 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-nbd.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-nbd.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-manual-bios-not-stateless.xml b= /tests/qemuxmlconfdata/firmware-manual-bios-not-stateless.xml index 8581e941f0..f1ad86de96 100644 --- a/tests/qemuxmlconfdata/firmware-manual-bios-not-stateless.xml +++ b/tests/qemuxmlconfdata/firmware-manual-bios-not-stateless.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm /usr/share/seabios/bios.bin diff --git a/tests/qemuxmlconfdata/firmware-manual-bios-stateless.x86_64-la= test.args b/tests/qemuxmlconfdata/firmware-manual-bios-stateless.x86_64-lat= est.args index effbdbe769..969c7ad68c 100644 --- a/tests/qemuxmlconfdata/firmware-manual-bios-stateless.x86_64-latest.ar= gs +++ b/tests/qemuxmlconfdata/firmware-manual-bios-stateless.x86_64-latest.ar= gs @@ -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.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,acpi=3Doff \ +-machine pc-i440fx-10.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram,acpi=3Doff \ -accel tcg \ -cpu qemu64 \ -bios /usr/share/seabios/bios.bin \ diff --git a/tests/qemuxmlconfdata/firmware-manual-bios-stateless.x86_64-la= test.xml b/tests/qemuxmlconfdata/firmware-manual-bios-stateless.x86_64-late= st.xml index 4f7bd872f6..dc641ff9f6 100644 --- a/tests/qemuxmlconfdata/firmware-manual-bios-stateless.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-manual-bios-stateless.x86_64-latest.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm /usr/share/seabi= os/bios.bin diff --git a/tests/qemuxmlconfdata/firmware-manual-bios-stateless.xml b/tes= ts/qemuxmlconfdata/firmware-manual-bios-stateless.xml index 0d20ad256f..8f37e7a577 100644 --- a/tests/qemuxmlconfdata/firmware-manual-bios-stateless.xml +++ b/tests/qemuxmlconfdata/firmware-manual-bios-stateless.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm /usr/share/seabios/bios.bin diff --git a/tests/qemuxmlconfdata/firmware-manual-bios.x86_64-latest.args = b/tests/qemuxmlconfdata/firmware-manual-bios.x86_64-latest.args index effbdbe769..969c7ad68c 100644 --- a/tests/qemuxmlconfdata/firmware-manual-bios.x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-manual-bios.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.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,acpi=3Doff \ +-machine pc-i440fx-10.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram,acpi=3Doff \ -accel tcg \ -cpu qemu64 \ -bios /usr/share/seabios/bios.bin \ diff --git a/tests/qemuxmlconfdata/firmware-manual-bios.x86_64-latest.xml b= /tests/qemuxmlconfdata/firmware-manual-bios.x86_64-latest.xml index 040c31b5b9..7c06d8e8b8 100644 --- a/tests/qemuxmlconfdata/firmware-manual-bios.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-manual-bios.x86_64-latest.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm /usr/share/seabios/bios.bin diff --git a/tests/qemuxmlconfdata/firmware-manual-bios.xml b/tests/qemuxml= confdata/firmware-manual-bios.xml index 0749f94c40..eeb8cc3ac0 100644 --- a/tests/qemuxmlconfdata/firmware-manual-bios.xml +++ b/tests/qemuxmlconfdata/firmware-manual-bios.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm /usr/share/seabios/bios.bin diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-features.x86_64-late= st.args b/tests/qemuxmlconfdata/firmware-manual-efi-features.x86_64-latest.= args index 90f8b15b9b..d8a1abd7ff 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-features.x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-features.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.fd"= ,"node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unm= ap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}' \ --machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,acp= i=3Don \ +-machine pc-i440fx-10.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,ac= pi=3Don \ -accel tcg \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-features.x86_64-late= st.xml b/tests/qemuxmlconfdata/firmware-manual-efi-features.x86_64-latest.x= ml index 5f958ec758..fe02122f98 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-features.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-features.x86_64-latest.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-features.xml b/tests= /qemuxmlconfdata/firmware-manual-efi-features.xml index 7dbef3acae..cb52bc02b0 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-features.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-features.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-loader-no-path.xml b= /tests/qemuxmlconfdata/firmware-manual-efi-loader-no-path.xml index 66ad0804ae..f393a9fcab 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-loader-no-path.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-loader-no-path.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-file.x86_64-la= test.args b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-file.x86_64-lat= est.args index 42e075b1b6..0cb780853a 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-file.x86_64-latest.ar= gs +++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-file.x86_64-latest.ar= gs @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.fd"= ,"node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unm= ap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/path/to/guest_VARS.fd","node-name= ":"libvirt-pflash1-storage","read-only":false}' \ --machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,acp= i=3Don \ +-machine pc-i440fx-10.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,ac= pi=3Don \ -accel tcg \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-file.x86_64-la= test.xml b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-file.x86_64-late= st.xml index dac07adb3e..d864a3b081 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-file.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-file.x86_64-latest.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-file.xml b/tes= ts/qemuxmlconfdata/firmware-manual-efi-nvram-file.xml index 69c4427fcf..3c06fd06e2 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-file.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-file.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm /usr/share/edk2/ovmf/OVMF_COD= E.fd diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-iscsi.= x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-networ= k-iscsi.x86_64-latest.args index 8a85bbacce..026155edff 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-iscsi.x86_64-= latest.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-iscsi.x86_64-= latest.args @@ -14,7 +14,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ -object '{"qom-type":"secret","id":"libvirt-pflash1-storage-auth-secret0",= "data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","= keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}'= \ -blockdev '{"driver":"iscsi","portal":"example.com:6000","target":"iqn.201= 3-07.com.example:iscsi-nopool","lun":0,"transport":"tcp","user":"myname","p= assword-secret":"libvirt-pflash1-storage-auth-secret0","node-name":"libvirt= -pflash1-storage","read-only":false}' \ --machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,acp= i=3Don \ +-machine pc-i440fx-10.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,ac= pi=3Don \ -accel tcg \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-iscsi.= x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network= -iscsi.x86_64-latest.xml index b21932d1b8..bdfc7b9589 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-iscsi.x86_64-= latest.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-iscsi.x86_64-= latest.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-iscsi.= xml b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-iscsi.xml index e1483d404a..0b8cea840d 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-iscsi.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-iscsi.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm /usr/share/edk2/ovmf/OVMF_COD= E.fd diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-nbd.x8= 6_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-= nbd.x86_64-latest.args index 086bfa1ee2..2999e321d7 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-nbd.x86_64-la= test.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-nbd.x86_64-la= test.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.fd"= ,"node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unm= ap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.org","p= ort":"6000"},"export":"bar","node-name":"libvirt-pflash1-storage","read-onl= y":false}' \ --machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,acp= i=3Don \ +-machine pc-i440fx-10.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,ac= pi=3Don \ -accel tcg \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-nbd.x8= 6_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-n= bd.x86_64-latest.xml index 6418ff6c3c..2bc72e6c2b 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-nbd.x86_64-la= test.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-nbd.x86_64-la= test.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-nbd.xm= l b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-nbd.xml index 3064441720..7129c0d906 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-nbd.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-nbd.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm /usr/share/edk2/ovmf/OVMF_COD= E.fd diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-stateless.xml = b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-stateless.xml index b352cfa341..2506d51b12 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-stateless.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-stateless.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm /usr/share/= edk2/ovmf/OVMF_CODE.fd diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-state= less.xml b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-statele= ss.xml index e0970b3341..3524096e0c 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-stateless.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-stateless.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm /usr/share/= edk2/ovmf/OVMF_CODE.fd diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template.x86_6= 4-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template.x8= 6_64-latest.args index 90f8b15b9b..d8a1abd7ff 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template.x86_64-lates= t.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template.x86_64-lates= t.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.fd"= ,"node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unm= ap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}' \ --machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,acp= i=3Don \ +-machine pc-i440fx-10.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,ac= pi=3Don \ -accel tcg \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template.x86_6= 4-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template.x86= _64-latest.xml index 5f958ec758..fe02122f98 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template.x86_64-lates= t.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template.x86_64-lates= t.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template.xml b= /tests/qemuxmlconfdata/firmware-manual-efi-nvram-template.xml index 73d310a7eb..f02da7cafc 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm /usr/share/edk2/ovmf/OVMF_COD= E.fd diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-rw-implicit.x86_64-l= atest.args b/tests/qemuxmlconfdata/firmware-manual-efi-rw-implicit.x86_64-l= atest.args index f1e136dda0..962ce5525b 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-rw-implicit.x86_64-latest.a= rgs +++ b/tests/qemuxmlconfdata/firmware-manual-efi-rw-implicit.x86_64-latest.a= rgs @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/path/to/guest_BOTH.fd","node-name= ":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash0-storage"}' \ --machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,acpi=3Don \ +-machine pc-i440fx-10.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram,pflash0=3Dlibvirt-pflash0-format,acpi=3Don \ -accel tcg \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-rw-implicit.x86_64-l= atest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-rw-implicit.x86_64-la= test.xml index 919c9030f0..3119121aa9 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-rw-implicit.x86_64-latest.x= ml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-rw-implicit.x86_64-latest.x= ml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm /path/to/guest_BOTH.fd diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-rw-implicit.xml b/te= sts/qemuxmlconfdata/firmware-manual-efi-rw-implicit.xml index 87fd1317f4..6b54b30d59 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-rw-implicit.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-rw-implicit.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm /path/to/guest_BOTH.fd diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-rw.x86_64-latest.arg= s b/tests/qemuxmlconfdata/firmware-manual-efi-rw.x86_64-latest.args index f1e136dda0..962ce5525b 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-rw.x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-rw.x86_64-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/path/to/guest_BOTH.fd","node-name= ":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash0-storage"}' \ --machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,acpi=3Don \ +-machine pc-i440fx-10.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram,pflash0=3Dlibvirt-pflash0-format,acpi=3Don \ -accel tcg \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-rw.x86_64-latest.xml= b/tests/qemuxmlconfdata/firmware-manual-efi-rw.x86_64-latest.xml index 5ffac0e811..6133687a8e 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-rw.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-rw.x86_64-latest.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm /path/to/guest_= BOTH.fd diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-rw.xml b/tests/qemux= mlconfdata/firmware-manual-efi-rw.xml index c98480c119..538308af2e 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-rw.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-rw.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm /path/to/guest_BOTH.fd diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-stateless.x86_64-lat= est.args b/tests/qemuxmlconfdata/firmware-manual-efi-stateless.x86_64-lates= t.args index 6a6146b1bc..ff30beeb35 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-stateless.x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-stateless.x86_64-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.fd"= ,"node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unm= ap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ --machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,acpi=3Don \ +-machine pc-i440fx-10.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram,pflash0=3Dlibvirt-pflash0-format,acpi=3Don \ -accel tcg \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-stateless.x86_64-lat= est.xml b/tests/qemuxmlconfdata/firmware-manual-efi-stateless.x86_64-latest= .xml index f55f17b09a..f634b33eb0 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-stateless.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-stateless.x86_64-latest.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm /usr/share/edk2/ovmf/OVMF_CODE.fd diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-stateless.xml b/test= s/qemuxmlconfdata/firmware-manual-efi-stateless.xml index 55c0049c34..4c258b2015 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-stateless.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-stateless.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm /usr/share/= edk2/ovmf/OVMF_CODE.fd diff --git a/tests/qemuxmlconfdata/firmware-manual-efi.x86_64-latest.args b= /tests/qemuxmlconfdata/firmware-manual-efi.x86_64-latest.args index 42e075b1b6..0cb780853a 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi.x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.fd"= ,"node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unm= ap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/path/to/guest_VARS.fd","node-name= ":"libvirt-pflash1-storage","read-only":false}' \ --machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,acp= i=3Don \ +-machine pc-i440fx-10.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,ac= pi=3Don \ -accel tcg \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi.x86_64-latest.xml b/= tests/qemuxmlconfdata/firmware-manual-efi.x86_64-latest.xml index 7c92aeb391..24e482298a 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi.x86_64-latest.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-manual-efi.xml b/tests/qemuxmlc= onfdata/firmware-manual-efi.xml index b42f927684..6cba2119a2 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm /usr/share/edk2/ovmf/OVMF_COD= E.fd /path/to/guest_VARS.fd --=20 2.49.0