From nobody Sun Dec 14 06:18:50 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=1751619545; cv=none; d=zohomail.com; s=zohoarc; b=g0SAL0jEYBNa7Ln4rYbweBAk6oS8arhCJRbMUj1u1qxmKMeO+ZQRL6JLS/48wxukOwoq+IIOrQPqPXMYJN0CjVWM72CGOa5cbRrwVzfjAeQjgTaKAp3TFFVR+fMI2t8wo+9ttezgd4LmE7SAMukO6RIAHLQcYBzjQixgqlVRG9I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751619545; 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=Wx96DI1lVRaPOlaytwA/ZWHeq1GKMb3F1nxRN/vfP1I=; b=Fj3MKhQ3BYyp51tqxeRsBZ+5KD07SOz8saxegVRq7YZNaC2uVmtHv0uueTJQnAOKnxiHsNncH4VQCylJ/6a4wukw7fCXETd0oebzWlNA0y7uORWDeqw1kaHS7JsreDOCP5HqURfuf477/phBTr3H9oBWBuAoSBJDLYL8p65PB/c= 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 1751619545880839.4681161696691; Fri, 4 Jul 2025 01:59:05 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id AF824868; Fri, 4 Jul 2025 04:59:04 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 8E416BD5; Fri, 4 Jul 2025 04:52:22 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 8830B1402; Fri, 4 Jul 2025 04:52:17 -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 9203D140F for ; Fri, 4 Jul 2025 04:51:55 -0400 (EDT) Received: from mx-prod-mc-01.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-478-bFJWyKClMQO5eK-sP8jQeg-1; Fri, 04 Jul 2025 04:51:52 -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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E188A19560A6 for ; Fri, 4 Jul 2025 08:51:51 +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 DECD91800285 for ; Fri, 4 Jul 2025 08:51:50 +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 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=1751619115; 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=8lh1GoaKOS7IFVGcjenrVijjmqWFrzmgcSPBlTdPpXU=; b=CzknBcHBB7m1+YZBCPBEX2RlW+TNCyszXOz1adI2270jbBDyugJrug0sXyLcK6P7xjvsHQ zQg53AjnsMIMZH0JQNEDn8gB3d9F7B9oIUONMlseHQzYZ8OLrF51oiQ1zx9NeXDqC9+oCP BqJl1vqU/FlvaLDMR4BiIYyW+Bvakvc= X-MC-Unique: bFJWyKClMQO5eK-sP8jQeg-1 X-Mimecast-MFC-AGG-ID: bFJWyKClMQO5eK-sP8jQeg_1751619112 To: devel@lists.libvirt.org Subject: [PATCH 6/7] qemuxmlconftest: x86_64: Bump 'firmware*' test cases to 'pc-q35-10.0' Date: Fri, 4 Jul 2025 10:51:40 +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: 3XLqNWc9xb3CRZM2n1dZZPYd15QFwfRPoZMXJHYnUdw_1751619112 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 6GUWGO57DKQFDL7MTKKIM25KVOHWPH45 X-Message-ID-Hash: 6GUWGO57DKQFDL7MTKKIM25KVOHWPH45 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: 1751619547412116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa New qemu is deprecating 'pc-q35-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 'q35' 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 --- tests/qemuxmlconfdata/firmware-auto-bios-not-stateless.xml | 2 +- tests/qemuxmlconfdata/firmware-auto-bios-nvram.xml | 2 +- .../firmware-auto-bios-stateless.x86_64-latest.args | 2 +- .../firmware-auto-bios-stateless.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-auto-bios-stateless.xml | 2 +- tests/qemuxmlconfdata/firmware-auto-bios.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/firmware-auto-bios.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-auto-bios.xml | 2 +- .../firmware-auto-efi-enrolled-keys-no-secboot.xml | 2 +- .../firmware-auto-efi-enrolled-keys.x86_64-latest.args | 2 +- .../firmware-auto-efi-enrolled-keys.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys.xml | 2 +- ...e-auto-efi-format-loader-qcow2-nvram-path.x86_64-latest.args | 2 +- ...re-auto-efi-format-loader-qcow2-nvram-path.x86_64-latest.xml | 2 +- .../firmware-auto-efi-format-loader-qcow2-nvram-path.xml | 2 +- .../firmware-auto-efi-format-loader-qcow2.x86_64-latest.args | 2 +- .../firmware-auto-efi-format-loader-qcow2.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2.xml | 2 +- .../firmware-auto-efi-format-mismatch.x86_64-latest.args | 2 +- .../firmware-auto-efi-format-mismatch.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-auto-efi-format-mismatch.xml | 2 +- ...firmware-auto-efi-format-nvram-qcow2-path.x86_64-latest.args | 2 +- .../firmware-auto-efi-format-nvram-qcow2-path.x86_64-latest.xml | 2 +- .../firmware-auto-efi-format-nvram-qcow2-path.xml | 2 +- .../firmware-auto-efi-format-nvram-qcow2.x86_64-latest.args | 2 +- .../firmware-auto-efi-format-nvram-qcow2.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2.xml | 2 +- .../firmware-auto-efi-loader-insecure.x86_64-latest.args | 2 +- .../firmware-auto-efi-loader-insecure.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-auto-efi-loader-insecure.xml | 2 +- .../firmware-auto-efi-loader-path-nonstandard.x86_64-latest.xml | 2 +- .../firmware-auto-efi-loader-path-nonstandard.xml | 2 +- .../firmware-auto-efi-loader-path.x86_64-latest.args | 2 +- .../firmware-auto-efi-loader-path.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-auto-efi-loader-path.xml | 2 +- ...irmware-auto-efi-loader-secure.x86_64-latest.abi-update.args | 2 +- ...firmware-auto-efi-loader-secure.x86_64-latest.abi-update.xml | 2 +- .../firmware-auto-efi-loader-secure.x86_64-latest.args | 2 +- .../firmware-auto-efi-loader-secure.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.xml | 2 +- .../firmware-auto-efi-no-enrolled-keys.x86_64-latest.args | 2 +- .../firmware-auto-efi-no-enrolled-keys.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-auto-efi-no-enrolled-keys.xml | 2 +- .../firmware-auto-efi-no-secboot.x86_64-latest.args | 2 +- .../firmware-auto-efi-no-secboot.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-auto-efi-no-secboot.xml | 2 +- .../firmware-auto-efi-nvram-path.x86_64-latest.args | 2 +- .../firmware-auto-efi-nvram-path.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-auto-efi-nvram-path.xml | 2 +- ...rmware-auto-efi-nvram-template-nonstandard.x86_64-latest.xml | 2 +- .../firmware-auto-efi-nvram-template-nonstandard.xml | 2 +- .../firmware-auto-efi-nvram-template.x86_64-latest.args | 2 +- .../firmware-auto-efi-nvram-template.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-auto-efi-nvram-template.xml | 2 +- .../firmware-auto-efi-rw-pflash.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-auto-efi-rw-pflash.xml | 2 +- tests/qemuxmlconfdata/firmware-auto-efi-rw.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-auto-efi-rw.xml | 2 +- .../firmware-auto-efi-secboot.x86_64-latest.args | 2 +- .../qemuxmlconfdata/firmware-auto-efi-secboot.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-auto-efi-secboot.xml | 2 +- .../firmware-auto-efi-smm-off.x86_64-latest.args | 2 +- .../qemuxmlconfdata/firmware-auto-efi-smm-off.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-auto-efi-smm-off.xml | 2 +- .../firmware-auto-efi-stateless.x86_64-latest.args | 2 +- .../firmware-auto-efi-stateless.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-auto-efi-stateless.xml | 2 +- .../firmware-auto-efi.x86_64-latest.abi-update.args | 2 +- .../firmware-auto-efi.x86_64-latest.abi-update.xml | 2 +- tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-auto-efi.xml | 2 +- .../firmware-manual-efi-acpi-q35.x86_64-latest.args | 2 +- .../firmware-manual-efi-acpi-q35.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-manual-efi-acpi-q35.xml | 2 +- ...rmware-manual-efi-loader-path-nonstandard.x86_64-latest.args | 2 +- ...irmware-manual-efi-loader-path-nonstandard.x86_64-latest.xml | 2 +- .../firmware-manual-efi-loader-path-nonstandard.xml | 2 +- .../firmware-manual-efi-loader-secure.x86_64-latest.args | 2 +- .../firmware-manual-efi-loader-secure.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-manual-efi-loader-secure.xml | 2 +- ...-manual-efi-no-enrolled-keys-legacy-paths.x86_64-latest.args | 2 +- ...e-manual-efi-no-enrolled-keys-legacy-paths.x86_64-latest.xml | 2 +- .../firmware-manual-efi-no-enrolled-keys-legacy-paths.xml | 2 +- .../firmware-manual-efi-no-enrolled-keys.x86_64-latest.args | 2 +- .../firmware-manual-efi-no-enrolled-keys.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys.xml | 2 +- ...rmware-manual-efi-no-secboot-legacy-paths.x86_64-latest.args | 2 +- ...irmware-manual-efi-no-secboot-legacy-paths.x86_64-latest.xml | 2 +- .../firmware-manual-efi-no-secboot-legacy-paths.xml | 2 +- .../firmware-manual-efi-no-secboot.x86_64-latest.args | 2 +- .../firmware-manual-efi-no-secboot.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-manual-efi-no-secboot.xml | 2 +- tests/qemuxmlconfdata/firmware-manual-efi-noacpi-q35.xml | 2 +- ...are-manual-efi-nvram-template-nonstandard.x86_64-latest.args | 2 +- ...ware-manual-efi-nvram-template-nonstandard.x86_64-latest.xml | 2 +- .../firmware-manual-efi-nvram-template-nonstandard.xml | 2 +- .../firmware-manual-efi-rw-legacy-paths.x86_64-latest.args | 2 +- .../firmware-manual-efi-rw-legacy-paths.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-manual-efi-rw-legacy-paths.xml | 2 +- .../firmware-manual-efi-rw-modern-paths.x86_64-latest.args | 2 +- .../firmware-manual-efi-rw-modern-paths.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-manual-efi-rw-modern-paths.xml | 2 +- .../firmware-manual-efi-secboot-legacy-paths.x86_64-latest.args | 2 +- .../firmware-manual-efi-secboot-legacy-paths.x86_64-latest.xml | 2 +- .../firmware-manual-efi-secboot-legacy-paths.xml | 2 +- .../firmware-manual-efi-secboot.x86_64-latest.args | 2 +- .../firmware-manual-efi-secboot.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-manual-efi-secboot.xml | 2 +- .../firmware-manual-noefi-acpi-q35.x86_64-latest.args | 2 +- .../firmware-manual-noefi-acpi-q35.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-manual-noefi-acpi-q35.xml | 2 +- .../firmware-manual-noefi-noacpi-q35.x86_64-latest.args | 2 +- .../firmware-manual-noefi-noacpi-q35.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-q35.xml | 2 +- 115 files changed, 115 insertions(+), 115 deletions(-) diff --git a/tests/qemuxmlconfdata/firmware-auto-bios-not-stateless.xml b/t= ests/qemuxmlconfdata/firmware-auto-bios-not-stateless.xml index a1f21e9bb4..47114a2b50 100644 --- a/tests/qemuxmlconfdata/firmware-auto-bios-not-stateless.xml +++ b/tests/qemuxmlconfdata/firmware-auto-bios-not-stateless.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-bios-nvram.xml b/tests/qem= uxmlconfdata/firmware-auto-bios-nvram.xml index c87debdb01..094b603362 100644 --- a/tests/qemuxmlconfdata/firmware-auto-bios-nvram.xml +++ b/tests/qemuxmlconfdata/firmware-auto-bios-nvram.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm /path/to/guest_VARS.fd diff --git a/tests/qemuxmlconfdata/firmware-auto-bios-stateless.x86_64-late= st.args b/tests/qemuxmlconfdata/firmware-auto-bios-stateless.x86_64-latest.= args index 0efb878bb2..a6a52e2b52 100644 --- a/tests/qemuxmlconfdata/firmware-auto-bios-stateless.x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-auto-bios-stateless.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.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,acpi=3Don \ +-machine pc-q35-10.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.r= am,acpi=3Don \ -accel kvm \ -cpu qemu64 \ -bios /usr/share/seabios/bios-256k.bin \ diff --git a/tests/qemuxmlconfdata/firmware-auto-bios-stateless.x86_64-late= st.xml b/tests/qemuxmlconfdata/firmware-auto-bios-stateless.x86_64-latest.x= ml index 31b83b5593..547dff5ed3 100644 --- a/tests/qemuxmlconfdata/firmware-auto-bios-stateless.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-auto-bios-stateless.x86_64-latest.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-bios-stateless.xml b/tests= /qemuxmlconfdata/firmware-auto-bios-stateless.xml index 540f61a2b8..6276ac7ef5 100644 --- a/tests/qemuxmlconfdata/firmware-auto-bios-stateless.xml +++ b/tests/qemuxmlconfdata/firmware-auto-bios-stateless.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-bios.x86_64-latest.args b/= tests/qemuxmlconfdata/firmware-auto-bios.x86_64-latest.args index 0efb878bb2..a6a52e2b52 100644 --- a/tests/qemuxmlconfdata/firmware-auto-bios.x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-auto-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-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,acpi=3Don \ +-machine pc-q35-10.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.r= am,acpi=3Don \ -accel kvm \ -cpu qemu64 \ -bios /usr/share/seabios/bios-256k.bin \ diff --git a/tests/qemuxmlconfdata/firmware-auto-bios.x86_64-latest.xml b/t= ests/qemuxmlconfdata/firmware-auto-bios.x86_64-latest.xml index d7471baa61..ae9c9f56d9 100644 --- a/tests/qemuxmlconfdata/firmware-auto-bios.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-auto-bios.x86_64-latest.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-bios.xml b/tests/qemuxmlco= nfdata/firmware-auto-bios.xml index 1911b40ae7..92464ca941 100644 --- a/tests/qemuxmlconfdata/firmware-auto-bios.xml +++ b/tests/qemuxmlconfdata/firmware-auto-bios.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys-no-secbo= ot.xml b/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys-no-secboot.x= ml index 897da8e126..560905dd39 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys-no-secboot.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys-no-secboot.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys.x86_64-l= atest.args b/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys.x86_64-l= atest.args index 1bdd482d71..e7c9110c95 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys.x86_64-latest.a= rgs +++ b/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys.x86_64-latest.a= rgs @@ -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.sec= boot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"disca= rd":"unmap"}' \ -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-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-stora= ge,acpi=3Don \ +-machine pc-q35-10.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backe= nd=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-stor= age,acpi=3Don \ -accel kvm \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys.x86_64-l= atest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys.x86_64-la= test.xml index 79ab55751b..f4df8c07ed 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys.x86_64-latest.x= ml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys.x86_64-latest.x= ml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys.xml b/te= sts/qemuxmlconfdata/firmware-auto-efi-enrolled-keys.xml index 01bba19a32..2447093295 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2-nv= ram-path.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-forma= t-loader-qcow2-nvram-path.x86_64-latest.args index 2694e0676f..25b93c8a2e 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2-nvram-pat= h.x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2-nvram-pat= h.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":"file","filename":"/path/to/guest_VARS.qcow2","node-n= ame":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"qcow2","file":"libvirt-pflash1-storage","backing":null}' \ --machine pc-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-forma= t,acpi=3Don \ +-machine pc-q35-10.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backe= nd=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-form= at,acpi=3Don \ -accel kvm \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2-nv= ram-path.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-format= -loader-qcow2-nvram-path.x86_64-latest.xml index dd044ac091..70d49c3bb5 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2-nvram-pat= h.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2-nvram-pat= h.x86_64-latest.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2-nv= ram-path.xml b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2-= nvram-path.xml index 75fa44fd20..03794d53c0 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2-nvram-pat= h.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2-nvram-pat= h.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm /path/to/guest_VARS.qcow2 diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2.x8= 6_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qc= ow2.x86_64-latest.args index 2bc7a1b9d5..468ad4326c 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2.x86_64-la= test.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2.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"= :"qcow2","file":"libvirt-pflash0-storage","backing":null}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.qcow2","node-name":"libvirt-pflash1-storage","auto-read-only":true,"di= scard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"qcow2","file":"libvirt-pflash1-storage","backing":null}' \ --machine pc-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-forma= t,acpi=3Don \ +-machine pc-q35-10.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backe= nd=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-form= at,acpi=3Don \ -accel kvm \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2.x8= 6_64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qco= w2.x86_64-latest.xml index 7cdc7eec1f..4061a0ae35 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2.x86_64-la= test.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2.x86_64-la= test.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2.xm= l b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2.xml index 4d4bea8ff8..7a8eeb9ffd 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-mismatch.x86_64= -latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-format-mismatch.x86_= 64-latest.args index 1bdd482d71..e7c9110c95 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-mismatch.x86_64-latest= .args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-mismatch.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.sec= boot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"disca= rd":"unmap"}' \ -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-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-stora= ge,acpi=3Don \ +-machine pc-q35-10.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backe= nd=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-stor= age,acpi=3Don \ -accel kvm \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-mismatch.x86_64= -latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-format-mismatch.x86_6= 4-latest.xml index 79ab55751b..f4df8c07ed 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-mismatch.x86_64-latest= .xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-mismatch.x86_64-latest= .xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-mismatch.xml b/= tests/qemuxmlconfdata/firmware-auto-efi-format-mismatch.xml index 6caec1a94c..7c2f01eefb 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-mismatch.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-mismatch.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-pat= h.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram= -qcow2-path.x86_64-latest.args index 2694e0676f..25b93c8a2e 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-path.x86_6= 4-latest.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-path.x86_6= 4-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":"file","filename":"/path/to/guest_VARS.qcow2","node-n= ame":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"qcow2","file":"libvirt-pflash1-storage","backing":null}' \ --machine pc-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-forma= t,acpi=3Don \ +-machine pc-q35-10.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backe= nd=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-form= at,acpi=3Don \ -accel kvm \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-pat= h.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-= qcow2-path.x86_64-latest.xml index dd044ac091..70d49c3bb5 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-path.x86_6= 4-latest.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-path.x86_6= 4-latest.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-pat= h.xml b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-path.xml index fe67aa8edf..4a850e2d25 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-path.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-path.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm /path/to/guest_VARS.qcow2 diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2.x86= _64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow= 2.x86_64-latest.args index 2bc7a1b9d5..468ad4326c 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2.x86_64-lat= est.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2.x86_64-lat= est.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":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.qcow2","node-name":"libvirt-pflash1-storage","auto-read-only":true,"di= scard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"qcow2","file":"libvirt-pflash1-storage","backing":null}' \ --machine pc-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-forma= t,acpi=3Don \ +-machine pc-q35-10.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backe= nd=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-form= at,acpi=3Don \ -accel kvm \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2.x86= _64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2= .x86_64-latest.xml index 7cdc7eec1f..4061a0ae35 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2.x86_64-lat= est.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2.x86_64-lat= est.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2.xml= b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2.xml index 6da8374ec6..e5eca098f8 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-loader-insecure.x86_64= -latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-loader-insecure.x86_= 64-latest.args index 0ecac2fda1..cbafadec2c 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-loader-insecure.x86_64-latest= .args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-loader-insecure.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-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,acpi= =3Don \ +-machine pc-q35-10.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.r= am,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,acpi= =3Don \ -accel kvm \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-loader-insecure.x86_64= -latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-loader-insecure.x86_6= 4-latest.xml index 28da16a5b4..9d06cf64aa 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-loader-insecure.x86_64-latest= .xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-loader-insecure.x86_64-latest= .xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-loader-insecure.xml b/= tests/qemuxmlconfdata/firmware-auto-efi-loader-insecure.xml index 08ddfe3cfe..5799448ade 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-loader-insecure.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-loader-insecure.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-loader-path-nonstandar= d.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-loader-path-n= onstandard.x86_64-latest.xml index 1f09253a16..0b2dcf8386 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-loader-path-nonstandard.x86_6= 4-latest.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-loader-path-nonstandard.x86_6= 4-latest.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm /path/to/OVMF_= CODE.fd diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-loader-path-nonstandar= d.xml b/tests/qemuxmlconfdata/firmware-auto-efi-loader-path-nonstandard.xml index daec5989d5..67fa58ec4b 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-loader-path-nonstandard.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-loader-path-nonstandard.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm /path/to/OVMF_CODE.fd diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-loader-path.x86_64-lat= est.args b/tests/qemuxmlconfdata/firmware-auto-efi-loader-path.x86_64-lates= t.args index 0ecac2fda1..cbafadec2c 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-loader-path.x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-loader-path.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-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,acpi= =3Don \ +-machine pc-q35-10.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.r= am,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,acpi= =3Don \ -accel kvm \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-loader-path.x86_64-lat= est.xml b/tests/qemuxmlconfdata/firmware-auto-efi-loader-path.x86_64-latest= .xml index e85b1be965..4699c24bb5 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-loader-path.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-loader-path.x86_64-latest.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-loader-path.xml b/test= s/qemuxmlconfdata/firmware-auto-efi-loader-path.xml index 36bc8f7735..6beb155045 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-loader-path.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-loader-path.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm /usr/share/edk2/ovmf/OVMF_COD= E.fd diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-l= atest.abi-update.args b/tests/qemuxmlconfdata/firmware-auto-efi-loader-secu= re.x86_64-latest.abi-update.args index 2bc7a1b9d5..468ad4326c 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-latest.a= bi-update.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-latest.a= bi-update.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":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.qcow2","node-name":"libvirt-pflash1-storage","auto-read-only":true,"di= scard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"qcow2","file":"libvirt-pflash1-storage","backing":null}' \ --machine pc-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-forma= t,acpi=3Don \ +-machine pc-q35-10.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backe= nd=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-form= at,acpi=3Don \ -accel kvm \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-l= atest.abi-update.xml b/tests/qemuxmlconfdata/firmware-auto-efi-loader-secur= e.x86_64-latest.abi-update.xml index 7cdc7eec1f..4061a0ae35 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-latest.a= bi-update.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-latest.a= bi-update.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-l= atest.args b/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-l= atest.args index 1bdd482d71..e7c9110c95 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-latest.a= rgs +++ b/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-latest.a= rgs @@ -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.sec= boot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"disca= rd":"unmap"}' \ -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-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-stora= ge,acpi=3Don \ +-machine pc-q35-10.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backe= nd=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-stor= age,acpi=3Don \ -accel kvm \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-l= atest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-la= test.xml index 79ab55751b..f4df8c07ed 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-latest.x= ml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-latest.x= ml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.xml b/te= sts/qemuxmlconfdata/firmware-auto-efi-loader-secure.xml index e67e3a0844..c93f16e8f4 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-no-enrolled-keys.x86_6= 4-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-no-enrolled-keys.x8= 6_64-latest.args index 1bdd482d71..e7c9110c95 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-no-enrolled-keys.x86_64-lates= t.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-no-enrolled-keys.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.sec= boot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"disca= rd":"unmap"}' \ -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-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-stora= ge,acpi=3Don \ +-machine pc-q35-10.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backe= nd=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-stor= age,acpi=3Don \ -accel kvm \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-no-enrolled-keys.x86_6= 4-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-no-enrolled-keys.x86= _64-latest.xml index 33134d405f..cfe6c33cec 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-no-enrolled-keys.x86_64-lates= t.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-no-enrolled-keys.x86_64-lates= t.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-no-enrolled-keys.xml b= /tests/qemuxmlconfdata/firmware-auto-efi-no-enrolled-keys.xml index 019faa29b9..b5529a860c 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-no-enrolled-keys.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-no-enrolled-keys.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-no-secboot.x86_64-late= st.args b/tests/qemuxmlconfdata/firmware-auto-efi-no-secboot.x86_64-latest.= args index 0ecac2fda1..cbafadec2c 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-no-secboot.x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-no-secboot.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-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,acpi= =3Don \ +-machine pc-q35-10.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.r= am,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,acpi= =3Don \ -accel kvm \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-no-secboot.x86_64-late= st.xml b/tests/qemuxmlconfdata/firmware-auto-efi-no-secboot.x86_64-latest.x= ml index e85b1be965..4699c24bb5 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-no-secboot.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-no-secboot.x86_64-latest.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-no-secboot.xml b/tests= /qemuxmlconfdata/firmware-auto-efi-no-secboot.xml index 7ddeb2d230..8d81ee89a0 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-no-secboot.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-no-secboot.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-path.x86_64-late= st.args b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-path.x86_64-latest.= args index f453e5117d..6fb2c7ffc4 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-path.x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-path.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.sec= boot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"disca= rd":"unmap"}' \ -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-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-stora= ge,acpi=3Don \ +-machine pc-q35-10.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backe= nd=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-stor= age,acpi=3Don \ -accel kvm \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-path.x86_64-late= st.xml b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-path.x86_64-latest.x= ml index 7f680e9fc5..51b6727f92 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-path.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-path.x86_64-latest.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-path.xml b/tests= /qemuxmlconfdata/firmware-auto-efi-nvram-path.xml index 4ea37550e0..896eec6b40 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-path.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-path.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm /path/to/guest_VARS.fd diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template-nonstan= dard.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-temp= late-nonstandard.x86_64-latest.xml index fbb51f1734..5bd8d3e921 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template-nonstandard.x8= 6_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template-nonstandard.x8= 6_64-latest.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm /usr/share/edk= 2/ovmf/OVMF_CODE.fd diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template-nonstan= dard.xml b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template-nonstanda= rd.xml index c225e5ef48..ab23cc122c 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template-nonstandard.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template-nonstandard.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm /usr/share/edk2/ovmf/OVMF_COD= E.fd diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template.x86_64-= latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template.x86_64= -latest.args index 1bdd482d71..e7c9110c95 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template.x86_64-latest.= args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template.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.sec= boot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"disca= rd":"unmap"}' \ -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-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-stora= ge,acpi=3Don \ +-machine pc-q35-10.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backe= nd=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-stor= age,acpi=3Don \ -accel kvm \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template.x86_64-= latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template.x86_64-= latest.xml index 33134d405f..cfe6c33cec 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template.x86_64-latest.= xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template.x86_64-latest.= xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template.xml b/t= ests/qemuxmlconfdata/firmware-auto-efi-nvram-template.xml index 8a91594f4b..1b67c0eab0 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-rw-pflash.x86_64-lates= t.xml b/tests/qemuxmlconfdata/firmware-auto-efi-rw-pflash.x86_64-latest.xml index c9bca900af..217c1f4b94 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-rw-pflash.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-rw-pflash.x86_64-latest.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-rw-pflash.xml b/tests/= qemuxmlconfdata/firmware-auto-efi-rw-pflash.xml index 0100585031..edc97bd916 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-rw-pflash.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-rw-pflash.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-rw.x86_64-latest.xml b= /tests/qemuxmlconfdata/firmware-auto-efi-rw.x86_64-latest.xml index 4e744b69a3..0f6b965067 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-rw.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-rw.x86_64-latest.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-rw.xml b/tests/qemuxml= confdata/firmware-auto-efi-rw.xml index 6bee044058..4db0a7c36c 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-rw.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-rw.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-secboot.x86_64-latest.= args b/tests/qemuxmlconfdata/firmware-auto-efi-secboot.x86_64-latest.args index 1bdd482d71..e7c9110c95 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-secboot.x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-secboot.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.sec= boot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"disca= rd":"unmap"}' \ -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-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-stora= ge,acpi=3Don \ +-machine pc-q35-10.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backe= nd=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-stor= age,acpi=3Don \ -accel kvm \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-secboot.x86_64-latest.= xml b/tests/qemuxmlconfdata/firmware-auto-efi-secboot.x86_64-latest.xml index 79ab55751b..f4df8c07ed 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-secboot.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-secboot.x86_64-latest.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-secboot.xml b/tests/qe= muxmlconfdata/firmware-auto-efi-secboot.xml index b2c18cdd54..0fe9489d19 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-secboot.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-secboot.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-smm-off.x86_64-latest.= args b/tests/qemuxmlconfdata/firmware-auto-efi-smm-off.x86_64-latest.args index 23d9ea98ab..42a47fe29e 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-smm-off.x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-smm-off.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-q35-4.0,usb=3Doff,smm=3Doff,dump-guest-core=3Doff,memory-backe= nd=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-stor= age,acpi=3Don \ +-machine pc-q35-10.0,usb=3Doff,smm=3Doff,dump-guest-core=3Doff,memory-back= end=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-sto= rage,acpi=3Don \ -accel kvm \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-smm-off.x86_64-latest.= xml b/tests/qemuxmlconfdata/firmware-auto-efi-smm-off.x86_64-latest.xml index c36c2b7b9d..011c89d0f2 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-smm-off.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-smm-off.x86_64-latest.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-smm-off.xml b/tests/qe= muxmlconfdata/firmware-auto-efi-smm-off.xml index 8e3d185efa..6359ec3f0a 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-smm-off.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-smm-off.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-stateless.x86_64-lates= t.args b/tests/qemuxmlconfdata/firmware-auto-efi-stateless.x86_64-latest.ar= gs index 47803b0961..0c0caf2468 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-stateless.x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-auto-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.amdsev.f= d","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"u= nmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ --machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,pflash0=3Dlibvirt-pflash0-format,acpi=3Don \ +-machine pc-q35-10.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.r= am,pflash0=3Dlibvirt-pflash0-format,acpi=3Don \ -accel kvm \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-stateless.x86_64-lates= t.xml b/tests/qemuxmlconfdata/firmware-auto-efi-stateless.x86_64-latest.xml index aa94bb32db..3fead35a66 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-stateless.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-stateless.x86_64-latest.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-stateless.xml b/tests/= qemuxmlconfdata/firmware-auto-efi-stateless.xml index 575d756265..3acc433ae8 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-stateless.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-stateless.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.abi-upda= te.args b/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.abi-update.= args index 2bc7a1b9d5..468ad4326c 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.abi-update.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.abi-update.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":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.qcow2","node-name":"libvirt-pflash1-storage","auto-read-only":true,"di= scard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"qcow2","file":"libvirt-pflash1-storage","backing":null}' \ --machine pc-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-forma= t,acpi=3Don \ +-machine pc-q35-10.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backe= nd=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-form= at,acpi=3Don \ -accel kvm \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.abi-upda= te.xml b/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.abi-update.x= ml index 7cdc7eec1f..4061a0ae35 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.abi-update.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.abi-update.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.args b/t= ests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.args index 1bdd482d71..e7c9110c95 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-auto-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.sec= boot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"disca= rd":"unmap"}' \ -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-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-stora= ge,acpi=3Don \ +-machine pc-q35-10.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backe= nd=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-stor= age,acpi=3Don \ -accel kvm \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.xml b/te= sts/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.xml index 79ab55751b..f4df8c07ed 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-auto-efi.xml b/tests/qemuxmlcon= fdata/firmware-auto-efi.xml index 8bf079a1c7..b20cf23dfa 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-acpi-q35.x86_64-late= st.args b/tests/qemuxmlconfdata/firmware-manual-efi-acpi-q35.x86_64-latest.= args index d2e2f9c0f3..fd560fa9fe 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-acpi-q35.x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-acpi-q35.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-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,acpi= =3Don \ +-machine pc-q35-10.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.r= am,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,acpi= =3Don \ -accel tcg \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-acpi-q35.x86_64-late= st.xml b/tests/qemuxmlconfdata/firmware-manual-efi-acpi-q35.x86_64-latest.x= ml index 0a4367ea75..da7455da09 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-acpi-q35.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-acpi-q35.x86_64-latest.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-acpi-q35.xml b/tests= /qemuxmlconfdata/firmware-manual-efi-acpi-q35.xml index 369bc3c7c5..96e6110b3f 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-acpi-q35.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-acpi-q35.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm /usr/share/edk2/ovmf/OVMF_COD= E.fd /path/to/guest_VARS.fd diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-loader-path-nonstand= ard.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-loader-p= ath-nonstandard.x86_64-latest.args index f702d80818..a77d7fe7fd 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-loader-path-nonstandard.x86= _64-latest.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-loader-path-nonstandard.x86= _64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -blockdev '{"driver":"file","filename":"/path/to/OVMF_CODE.fd","node-name"= :"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \ -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-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,acpi= =3Don \ +-machine pc-q35-10.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.r= am,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,acpi= =3Don \ -accel tcg \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-loader-path-nonstand= ard.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-loader-pa= th-nonstandard.x86_64-latest.xml index 783a82336c..c17834b5e6 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-loader-path-nonstandard.x86= _64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-loader-path-nonstandard.x86= _64-latest.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm /path/to/OVMF_= CODE.fd /var/lib/libv= irt/qemu/nvram/guest_VARS.fd diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-loader-path-nonstand= ard.xml b/tests/qemuxmlconfdata/firmware-manual-efi-loader-path-nonstandard= .xml index 5a3da3c25b..8c3801ae56 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-loader-path-nonstandard.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-loader-path-nonstandard.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm /path/to/OVMF_CODE.fd diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-loader-secure.x86_64= -latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-loader-secure.x86_= 64-latest.args index 307832a354..07f220db04 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-loader-secure.x86_64-latest= .args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-loader-secure.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.sec= boot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"disca= rd":"unmap"}' \ -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-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-stora= ge,acpi=3Don \ +-machine pc-q35-10.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backe= nd=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-stor= age,acpi=3Don \ -accel tcg \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-loader-secure.x86_64= -latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-loader-secure.x86_6= 4-latest.xml index 3465be2eb0..1c92ec5a6e 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-loader-secure.x86_64-latest= .xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-loader-secure.x86_64-latest= .xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-loader-secure.xml b/= tests/qemuxmlconfdata/firmware-manual-efi-loader-secure.xml index 711a784c52..fbbd03cc43 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-loader-secure.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-loader-secure.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm /usr/share/edk= 2/ovmf/OVMF_CODE.secboot.fd /path/to/guest_VARS.fd diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys-leg= acy-paths.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-no= -enrolled-keys-legacy-paths.x86_64-latest.args index da5f53f733..1bbba7e99f 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys-legacy-pat= hs.x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys-legacy-pat= hs.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/OVMF/OVMF_CODE.secboot.= fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"= unmap"}' \ -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-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-stora= ge,acpi=3Don \ +-machine pc-q35-10.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backe= nd=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-stor= age,acpi=3Don \ -accel tcg \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys-leg= acy-paths.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-no-= enrolled-keys-legacy-paths.x86_64-latest.xml index 76a9b62f19..b452ebaca2 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys-legacy-pat= hs.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys-legacy-pat= hs.x86_64-latest.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm /usr/share/OVMF/OVMF_CODE.secboot.fd /var/lib/libvirt/qemu/nvram/guest_VARS.fd diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys-leg= acy-paths.xml b/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys-= legacy-paths.xml index cfc27226b5..71b83099b2 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys-legacy-pat= hs.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys-legacy-pat= hs.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm /usr/share/OVM= F/OVMF_CODE.secboot.fd diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys.x86= _64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-key= s.x86_64-latest.args index 307832a354..07f220db04 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys.x86_64-lat= est.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys.x86_64-lat= est.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.sec= boot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"disca= rd":"unmap"}' \ -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-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-stora= ge,acpi=3Don \ +-machine pc-q35-10.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backe= nd=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-stor= age,acpi=3Don \ -accel tcg \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys.x86= _64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys= .x86_64-latest.xml index 97515f917e..cffae3f8d7 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys.x86_64-lat= est.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys.x86_64-lat= est.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys.xml= b/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys.xml index 5b215abf12..09853cbd07 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm /usr/share/edk= 2/ovmf/OVMF_CODE.secboot.fd /path/to/guest_V= ARS.fd diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot-legacy-pa= ths.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-no-secbo= ot-legacy-paths.x86_64-latest.args index e35cbd4f16..2113a46e80 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot-legacy-paths.x86= _64-latest.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot-legacy-paths.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/OVMF/OVMF_CODE.fd","nod= e-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'= \ -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-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,acpi= =3Don \ +-machine pc-q35-10.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.r= am,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,acpi= =3Don \ -accel tcg \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot-legacy-pa= ths.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-no-secboo= t-legacy-paths.x86_64-latest.xml index d2d9777284..83623f1de2 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot-legacy-paths.x86= _64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot-legacy-paths.x86= _64-latest.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm /usr/share/OVM= F/OVMF_CODE.fd /var/lib/libvirt/qemu/nvram/guest_VARS.fd diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot-legacy-pa= ths.xml b/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot-legacy-paths= .xml index f85aeb251b..83f94724ab 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot-legacy-paths.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot-legacy-paths.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm /usr/share/OVMF/OVMF_CODE.fd<= /loader> diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot.x86_64-la= test.args b/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot.x86_64-lat= est.args index d2e2f9c0f3..fd560fa9fe 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot.x86_64-latest.ar= gs +++ b/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot.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-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,acpi= =3Don \ +-machine pc-q35-10.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.r= am,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,acpi= =3Don \ -accel tcg \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot.x86_64-la= test.xml b/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot.x86_64-late= st.xml index 0a4367ea75..da7455da09 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot.x86_64-latest.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot.xml b/tes= ts/qemuxmlconfdata/firmware-manual-efi-no-secboot.xml index b51209f3ca..86d4b044d5 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm /usr/share/edk2/ovmf/OVMF_COD= E.fd /path/to/guest_V= ARS.fd diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-q35.xml b/tes= ts/qemuxmlconfdata/firmware-manual-efi-noacpi-q35.xml index 5654ebe434..4a86dfdaae 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-q35.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-q35.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm /usr/share/edk2/ovmf/OVMF_COD= E.fd /path/to/guest_VARS.fd diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonst= andard.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-nvram= -template-nonstandard.x86_64-latest.args index 0ecac2fda1..cbafadec2c 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard.= x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard.= 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-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,acpi= =3Don \ +-machine pc-q35-10.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.r= am,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,acpi= =3Don \ -accel kvm \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonst= andard.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-= template-nonstandard.x86_64-latest.xml index 6c83568f62..cbadd0f0c8 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard.= x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard.= x86_64-latest.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm /usr/share/edk= 2/ovmf/OVMF_CODE.fd /var/lib/libv= irt/qemu/nvram/guest_VARS.fd diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonst= andard.xml b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonst= andard.xml index ffa7c5f4cd..38fb2908de 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard.= xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard.= 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-legacy-paths.x86_= 64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-rw-legacy-paths.= x86_64-latest.args index 85495da6f5..f724cca477 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-rw-legacy-paths.x86_64-late= st.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-rw-legacy-paths.x86_64-late= st.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/OVMF/OVMF_CODE.fd","nod= e-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-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,pflash0=3Dlibvirt-pflash0-format,acpi=3Don \ +-machine pc-q35-10.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.r= am,pflash0=3Dlibvirt-pflash0-format,acpi=3Don \ -accel tcg \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-rw-legacy-paths.x86_= 64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-rw-legacy-paths.x= 86_64-latest.xml index eaf8ce41bb..df2888f357 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-rw-legacy-paths.x86_64-late= st.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-rw-legacy-paths.x86_64-late= st.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm /usr/share/OVMF= /OVMF_CODE.fd diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-rw-legacy-paths.xml = b/tests/qemuxmlconfdata/firmware-manual-efi-rw-legacy-paths.xml index 2abea51318..3aa9580b35 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-rw-legacy-paths.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-rw-legacy-paths.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm /usr/share/OVMF/OVMF_CODE.fd diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-rw-modern-paths.x86_= 64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-rw-modern-paths.= x86_64-latest.args index c26daad29f..4e4b7d563d 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-rw-modern-paths.x86_64-late= st.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-rw-modern-paths.x86_64-late= st.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":false,"driver= ":"raw","file":"libvirt-pflash0-storage"}' \ --machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,pflash0=3Dlibvirt-pflash0-format,acpi=3Don \ +-machine pc-q35-10.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.r= am,pflash0=3Dlibvirt-pflash0-format,acpi=3Don \ -accel tcg \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-rw-modern-paths.x86_= 64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-rw-modern-paths.x= 86_64-latest.xml index 38c515c647..dbe82726cd 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-rw-modern-paths.x86_64-late= st.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-rw-modern-paths.x86_64-late= st.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm /usr/share/edk2= /ovmf/OVMF_CODE.fd diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-rw-modern-paths.xml = b/tests/qemuxmlconfdata/firmware-manual-efi-rw-modern-paths.xml index e0da71db36..16f8185bd2 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-rw-modern-paths.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-rw-modern-paths.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm /usr/share/edk2/ovmf/OVMF_CODE= .fd diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-secboot-legacy-paths= .x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-secboot-leg= acy-paths.x86_64-latest.args index da5f53f733..1bbba7e99f 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-secboot-legacy-paths.x86_64= -latest.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-secboot-legacy-paths.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/OVMF/OVMF_CODE.secboot.= fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"= unmap"}' \ -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-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-stora= ge,acpi=3Don \ +-machine pc-q35-10.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backe= nd=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-stor= age,acpi=3Don \ -accel tcg \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-secboot-legacy-paths= .x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-secboot-lega= cy-paths.x86_64-latest.xml index 10e1450db6..44d200134b 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-secboot-legacy-paths.x86_64= -latest.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-secboot-legacy-paths.x86_64= -latest.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm /usr/share/OVMF/OVMF_CODE.secboot.fd /var/lib/libvirt/qemu/nvram/guest_VARS.fd diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-secboot-legacy-paths= .xml b/tests/qemuxmlconfdata/firmware-manual-efi-secboot-legacy-paths.xml index 99f2218645..a6b05002a8 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-secboot-legacy-paths.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-secboot-legacy-paths.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm /usr/share/OVM= F/OVMF_CODE.secboot.fd diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-secboot.x86_64-lates= t.args b/tests/qemuxmlconfdata/firmware-manual-efi-secboot.x86_64-latest.ar= gs index 307832a354..07f220db04 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-secboot.x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-secboot.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.sec= boot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"disca= rd":"unmap"}' \ -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-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-stora= ge,acpi=3Don \ +-machine pc-q35-10.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backe= nd=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-stor= age,acpi=3Don \ -accel tcg \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-secboot.x86_64-lates= t.xml b/tests/qemuxmlconfdata/firmware-manual-efi-secboot.x86_64-latest.xml index 3465be2eb0..1c92ec5a6e 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-secboot.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-secboot.x86_64-latest.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-secboot.xml b/tests/= qemuxmlconfdata/firmware-manual-efi-secboot.xml index bd31948e28..0793a5094f 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-secboot.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-secboot.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm /usr/share/edk= 2/ovmf/OVMF_CODE.secboot.fd /path/to= /guest_VARS.fd diff --git a/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-q35.x86_64-la= test.args b/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-q35.x86_64-lat= est.args index 4dbf350abc..72fa81a9b3 100644 --- a/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-q35.x86_64-latest.ar= gs +++ b/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-q35.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-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,acpi=3Don \ +-machine pc-q35-10.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.r= am,acpi=3Don \ -accel tcg \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-q35.x86_64-la= test.xml b/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-q35.x86_64-late= st.xml index 813ebbe7bb..3ca048848a 100644 --- a/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-q35.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-q35.x86_64-latest.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-q35.xml b/tes= ts/qemuxmlconfdata/firmware-manual-noefi-acpi-q35.xml index cd619db5a6..4e422b9565 100644 --- a/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-q35.xml +++ b/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-q35.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-q35.x86_64-= latest.args b/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-q35.x86_64= -latest.args index 4112106540..203e91e3c0 100644 --- a/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-q35.x86_64-latest.= args +++ b/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-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.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,acpi=3Doff \ +-machine pc-q35-10.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.r= am,acpi=3Doff \ -accel tcg \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-q35.x86_64-= latest.xml b/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-q35.x86_64-= latest.xml index 13ada385ea..65753ded95 100644 --- a/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-q35.x86_64-latest.= xml +++ b/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-q35.x86_64-latest.= xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-q35.xml b/t= ests/qemuxmlconfdata/firmware-manual-noefi-noacpi-q35.xml index a5cfd48a34..cfe2bee93b 100644 --- a/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-q35.xml +++ b/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-q35.xml @@ -4,7 +4,7 @@ 1048576 1 - hvm + hvm /usr/bin/qemu-system-x86_64 --=20 2.49.0