From nobody Sat Nov 23 12:17:34 2024 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1730793639712701.853837647758; Tue, 5 Nov 2024 00:00:39 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 959EB11C5; Tue, 5 Nov 2024 03:00:38 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id AEB0412E9; Tue, 5 Nov 2024 02:58:47 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id DA27812CA; Tue, 5 Nov 2024 02:58:42 -0500 (EST) 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 5B98611AF for ; Tue, 5 Nov 2024 02:58:20 -0500 (EST) Received: from mx-prod-mc-04.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-658-hXYYvgjBNKOlXbCPlpvCKA-1; Tue, 05 Nov 2024 02:58:18 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E1E5A1955F57 for ; Tue, 5 Nov 2024 07:58:17 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.2]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D55F23000198 for ; Tue, 5 Nov 2024 07:58:16 +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=-0.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1730793500; 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=nmw/5TqDBbM0ibMyr1WRIsU3PzLy70IRRxwu5n9CTUw=; b=SOLsqNlWQuqmtDfaaQt3Lwj6qhoPFUkG1VxhNdU7gKVt451bsJ1Q+49iRYIQad5gkyJKOV IqaoAlTg8ACrKQ8yXHk9Uic9ri337Q2ILO7KpQhnhE3a55mN/p6bYEZRNzN67rsnxTDDlX 496Rs52Nq03pInq6B5nWEayPsnwu/L0= X-MC-Unique: hXYYvgjBNKOlXbCPlpvCKA-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 03/13] qemu: Install backing store terminators for 'pflash' blockdevs Date: Tue, 5 Nov 2024 08:58:01 +0100 Message-ID: <475b11967bbdb0054fc43f040a13cec8a9b91af6.1730793407.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: F6IQ4R3H7FIJVIGIZAN6COVG2HPZURB3 X-Message-ID-Hash: F6IQ4R3H7FIJVIGIZAN6COVG2HPZURB3 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: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1730793641444116600 Content-Type: text/plain; charset="utf-8" The qemu driver does support qcow2 images for the firmware and nvram pflash devices, but we do not do the full backing chain setup for them as we don't expect that those images would actually have a backing store. We don't tell that to qemu though which theoretically can lead to qemu probing the backing store from the image itself. We don't want that for now. Deny qemu probing the backing store by installing a "terminator" empty virStorageSource as 'backingStore' for pflash and nvram. Signed-off-by: Peter Krempa --- src/qemu/qemu_domain.c | 2 ++ .../firmware-auto-efi-aarch64.aarch64-latest.abi-update.args | 4 ++-- ...auto-efi-format-loader-qcow2-nvram-path.x86_64-latest.args | 4 ++-- .../firmware-auto-efi-format-loader-qcow2.x86_64-latest.args | 4 ++-- ...auto-efi-format-nvram-qcow2-network-nbd.x86_64-latest.args | 4 ++-- ...rmware-auto-efi-format-nvram-qcow2-path.x86_64-latest.args | 4 ++-- .../firmware-auto-efi-format-nvram-qcow2.x86_64-latest.args | 4 ++-- ...mware-auto-efi-loader-secure.x86_64-latest.abi-update.args | 4 ++-- .../firmware-auto-efi-riscv64.riscv64-latest.abi-update.args | 4 ++-- .../firmware-auto-efi.x86_64-latest.abi-update.args | 4 ++-- 10 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 7b702cfc6b..a256775960 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -12069,11 +12069,13 @@ qemuDomainInitializePflashStorageSource(virDomain= Obj *vm, pflash0->format =3D def->os.loader->format; pflash0->path =3D g_strdup(def->os.loader->path); pflash0->readonly =3D false; + pflash0->backingStore =3D virStorageSourceNew(); /* terminator */ virTristateBoolToBool(def->os.loader->readonly, &pflash0->readonly); qemuBlockStorageSourceSetFormatNodename(pflash0, g_strdup("libvirt-pfl= ash0-format")); qemuBlockStorageSourceSetStorageNodename(pflash0, g_strdup("libvirt-pf= lash0-storage")); if (def->os.loader->nvram) { + def->os.loader->nvram->backingStore =3D virStorageSourceNew(); /* = terminator */ if (qemuDomainPrepareStorageSourceBlockdevNodename(NULL, def->os.loader-= >nvram, "libvirt-pflash= 1", diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest= .abi-update.args b/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-= latest.abi-update.args index 30f86aa046..3e20cb4aa5 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.abi-up= date.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.abi-up= date.args @@ -11,9 +11,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -S \ -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/aarch64/QEMU_EFI-s= ilent-pflash.qcow2","node-name":"libvirt-pflash0-storage","auto-read-only":= true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"qcow2","file":"libvirt-pflash0-storage"}' \ +-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"}' \ +-blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"qcow2","file":"libvirt-pflash1-storage","backing":null}' \ -machine virt-4.0,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-b= ackend=3Dmach-virt.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-p= flash1-format,acpi=3Don \ -accel tcg \ -cpu cortex-a15 \ 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 e8d7d580f7..2694e0676f 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 @@ -11,9 +11,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -S \ -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_4M.= secboot.qcow2","node-name":"libvirt-pflash0-storage","auto-read-only":true,= "discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"qcow2","file":"libvirt-pflash0-storage"}' \ +-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"}' \ +-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 \ -accel kvm \ -cpu qemu64 \ 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 790fb619e8..2bc7a1b9d5 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 @@ -11,9 +11,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -S \ -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_4M.= secboot.qcow2","node-name":"libvirt-pflash0-storage","auto-read-only":true,= "discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"qcow2","file":"libvirt-pflash0-storage"}' \ +-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"}' \ +-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 \ -accel kvm \ -cpu qemu64 \ 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 f78b4e7abf..e8e6157f67 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 @@ -11,9 +11,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -S \ -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_4M.= qcow2","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard= ":"unmap"}' \ --blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"qcow2","file":"libvirt-pflash0-storage"}' \ +-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"}' \ +-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 \ -accel tcg \ -cpu qemu64 \ 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 e8d7d580f7..2694e0676f 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 @@ -11,9 +11,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -S \ -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_4M.= secboot.qcow2","node-name":"libvirt-pflash0-storage","auto-read-only":true,= "discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"qcow2","file":"libvirt-pflash0-storage"}' \ +-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"}' \ +-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 \ -accel kvm \ -cpu qemu64 \ 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 790fb619e8..2bc7a1b9d5 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 @@ -11,9 +11,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -S \ -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_4M.= secboot.qcow2","node-name":"libvirt-pflash0-storage","auto-read-only":true,= "discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"qcow2","file":"libvirt-pflash0-storage"}' \ +-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"}' \ +-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 \ -accel kvm \ -cpu qemu64 \ 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 790fb619e8..2bc7a1b9d5 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 @@ -11,9 +11,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -S \ -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_4M.= secboot.qcow2","node-name":"libvirt-pflash0-storage","auto-read-only":true,= "discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"qcow2","file":"libvirt-pflash0-storage"}' \ +-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"}' \ +-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 \ -accel kvm \ -cpu qemu64 \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-riscv64.riscv64-latest= .abi-update.args b/tests/qemuxmlconfdata/firmware-auto-efi-riscv64.riscv64-= latest.abi-update.args index e10575bf81..f467f71d72 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-riscv64.riscv64-latest.abi-up= date.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-riscv64.riscv64-latest.abi-up= date.args @@ -11,9 +11,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -S \ -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/riscv/RISCV_VIRT_C= ODE.qcow2","node-name":"libvirt-pflash0-storage","auto-read-only":true,"dis= card":"unmap"}' \ --blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"qcow2","file":"libvirt-pflash0-storage"}' \ +-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"}' \ +-blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"qcow2","file":"libvirt-pflash1-storage","backing":null}' \ -machine virt,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Driscv_virt_= board.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format= ,acpi=3Doff \ -accel tcg \ -cpu rv64 \ 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 790fb619e8..2bc7a1b9d5 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 @@ -11,9 +11,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -S \ -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_4M.= secboot.qcow2","node-name":"libvirt-pflash0-storage","auto-read-only":true,= "discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"qcow2","file":"libvirt-pflash0-storage"}' \ +-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"}' \ +-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 \ -accel kvm \ -cpu qemu64 \ --=20 2.47.0