From nobody Sun May 12 21:15:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1645622022; cv=none; d=zohomail.com; s=zohoarc; b=n+p97NEhNhxX6c55UqT9dEeVqLCLRZAtlyujr8BTlslepblrBHgG+fTGurEzllv0ydWZyulUkcw8PsbXbPAYCG9GhxhtYWn8vF+qpgeKang/LW715fgIAqXUWGTYGm974jRwYxdt97Szk09DfrqxSjcNHbNp4EpqgHPmhlYREjc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1645622022; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=C6am4pH5jUCXxdj1c85CUfwFd8dbcsh9qC+I3TAej0A=; b=f9TCGOtZ9W3qVGkaXEmPasIs91GhbGz2jvB0vEHpoUwfCey8rYs6Ws5vghWsQySp80aD3rGr6HqwNRnWuvjxxrYACDcsHJ5nraR6L9Mhb4comhAAt5K5fhIN1YmIO+RrKja7W1+1yzY9bu25TxnAaMWVu/+7MTbm8o4N9eqG7e4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1645622022448100.88792598531847; Wed, 23 Feb 2022 05:13:42 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-596-rm-4ThyDPAqPuqa5yT-XpQ-1; Wed, 23 Feb 2022 08:13:39 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D8AAC1006AB1; Wed, 23 Feb 2022 13:13:34 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D4D851062253; Wed, 23 Feb 2022 13:13:33 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 2CA9C1807D71; Wed, 23 Feb 2022 13:13:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 21ND3BOB025337 for ; Wed, 23 Feb 2022 08:03:11 -0500 Received: by smtp.corp.redhat.com (Postfix) id 906A47C0FF; Wed, 23 Feb 2022 13:03:11 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.39.195.66]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5D42F7C0FB; Wed, 23 Feb 2022 13:03:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645622021; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=C6am4pH5jUCXxdj1c85CUfwFd8dbcsh9qC+I3TAej0A=; b=WTRPlTPudBQ0au9gwvynOqplVTna3sqit/ouhQUXPbrybNUcoI4agLSoeIf3zoEa1n6mnY C6DIvBp3vhfVCKwn5YzdezqoW/+PayEsUI+jO73D+Q2LmpfIyXYHAzfBQllgCPnI63m3za DqlNM3udGXlrtSLYGEYTna7DABEtuBw= X-MC-Unique: rm-4ThyDPAqPuqa5yT-XpQ-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [PATCH] tests: don't use auto-generated NVRAM path in tests Date: Wed, 23 Feb 2022 13:03:00 +0000 Message-Id: <20220223130300.2085306-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1645622024672100003 By using the auto-generated NVRAM path in test data files, we won't see bugs where a user specified path gets accidentally overwritten by a post-parse callback, or VM startup. For example, this caused us to miss the bug fixed by: commit 24adb6c7a6cbd8ce5f9de67e6af5d89e0e57c270 Author: Michal Pr=C3=ADvozn=C3=ADk Date: Wed Feb 23 08:50:44 2022 +0100 qemu: Don't regenerate NVRAM path if parsed from domain XML Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Michal Privoznik --- tests/qemuxml2argvdata/aarch64-acpi-uefi.args | 2 +- tests/qemuxml2argvdata/aarch64-acpi-uefi.xml | 2 +- tests/qemuxml2argvdata/aarch64-noacpi-uefi.args | 2 +- tests/qemuxml2argvdata/aarch64-noacpi-uefi.xml | 2 +- .../qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args | 2 +- tests/qemuxml2argvdata/aarch64-virt-graphics.xml | 2 +- .../qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args | 2 +- tests/qemuxml2argvdata/aarch64-virt-headless.xml | 2 +- tests/qemuxml2argvdata/bios-nvram-os-interleave.xml | 2 +- tests/qemuxml2argvdata/bios-nvram-secure.args | 2 +- tests/qemuxml2argvdata/bios-nvram-secure.xml | 2 +- tests/qemuxml2argvdata/bios-nvram.args | 2 +- tests/qemuxml2argvdata/bios-nvram.xml | 2 +- tests/qemuxml2argvdata/hvf-aarch64-virt-headless.args | 2 +- tests/qemuxml2argvdata/hvf-aarch64-virt-headless.xml | 2 +- tests/qemuxml2argvdata/os-firmware-bios.xml | 2 +- .../qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/os-firmware-efi-secboot.xml | 2 +- tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/os-firmware-efi.xml | 2 +- tests/qemuxml2argvdata/q35-acpi-uefi.args | 2 +- tests/qemuxml2argvdata/q35-acpi-uefi.xml | 2 +- tests/qemuxml2argvdata/q35-noacpi-uefi.xml | 2 +- .../qemuxml2xmloutdata/aarch64-virt-graphics.aarch64-latest.xml | 2 +- .../qemuxml2xmloutdata/aarch64-virt-headless.aarch64-latest.xml | 2 +- tests/qemuxml2xmloutdata/bios-nvram-os-interleave.xml | 2 +- tests/qemuxml2xmloutdata/bios-nvram.xml | 2 +- tests/qemuxml2xmloutdata/hvf-aarch64-virt-headless.xml | 2 +- tests/qemuxml2xmloutdata/os-firmware-bios.x86_64-latest.xml | 2 +- .../os-firmware-efi-secboot.x86_64-latest.xml | 2 +- tests/qemuxml2xmloutdata/os-firmware-efi.x86_64-latest.xml | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) diff --git a/tests/qemuxml2argvdata/aarch64-acpi-uefi.args b/tests/qemuxml2= argvdata/aarch64-acpi-uefi.args index a92f22744d..21ee68be07 100644 --- a/tests/qemuxml2argvdata/aarch64-acpi-uefi.args +++ b/tests/qemuxml2argvdata/aarch64-acpi-uefi.args @@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=3Dnone \ -accel tcg \ -cpu cortex-a57 \ -drive file=3D/usr/share/AAVMF/AAVMF_CODE.fd,if=3Dpflash,format=3Draw,unit= =3D0,readonly=3Don \ --drive file=3D/var/lib/libvirt/qemu/nvram/guest_VARS.fd,if=3Dpflash,format= =3Draw,unit=3D1 \ +-drive file=3D/some/user/nvram/path/guest_VARS.fd,if=3Dpflash,format=3Draw= ,unit=3D1 \ -m 1024 \ -realtime mlock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/aarch64-acpi-uefi.xml b/tests/qemuxml2a= rgvdata/aarch64-acpi-uefi.xml index 5de2eb5d3c..ef95ba5c17 100644 --- a/tests/qemuxml2argvdata/aarch64-acpi-uefi.xml +++ b/tests/qemuxml2argvdata/aarch64-acpi-uefi.xml @@ -6,7 +6,7 @@ hvm /usr/share/AAVMF/AAVMF_CODE.f= d - /var/lib/libvirt/qemu/nvram/guest_VARS.fd + /some/user/nvram/path/guest_VARS.fd diff --git a/tests/qemuxml2argvdata/aarch64-noacpi-uefi.args b/tests/qemuxm= l2argvdata/aarch64-noacpi-uefi.args index 4ffbad8188..4382f0736c 100644 --- a/tests/qemuxml2argvdata/aarch64-noacpi-uefi.args +++ b/tests/qemuxml2argvdata/aarch64-noacpi-uefi.args @@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=3Dnone \ -accel tcg \ -cpu cortex-a57 \ -drive file=3D/usr/share/AAVMF/AAVMF_CODE.fd,if=3Dpflash,format=3Draw,unit= =3D0,readonly=3Don \ --drive file=3D/var/lib/libvirt/qemu/nvram/guest_VARS.fd,if=3Dpflash,format= =3Draw,unit=3D1 \ +-drive file=3D/some/user/nvram/path/guest_VARS.fd,if=3Dpflash,format=3Draw= ,unit=3D1 \ -m 1024 \ -realtime mlock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/aarch64-noacpi-uefi.xml b/tests/qemuxml= 2argvdata/aarch64-noacpi-uefi.xml index e66b805da4..c36ce824ac 100644 --- a/tests/qemuxml2argvdata/aarch64-noacpi-uefi.xml +++ b/tests/qemuxml2argvdata/aarch64-noacpi-uefi.xml @@ -6,7 +6,7 @@ hvm /usr/share/AAVMF/AAVMF_CODE.f= d - /var/lib/libvirt/qemu/nvram/guest_VARS.fd + /some/user/nvram/path/guest_VARS.fd cortex-a57 diff --git a/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.ar= gs b/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args index 2e311adf33..6604d1e5bd 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-guest/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/AAVMF/AAVMF_CODE.fd","n= ode-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","auto-read-only":true,"disca= rd":"unmap"}' \ +-blockdev '{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.f= d","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"u= nmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ -machine virt,usb=3Doff,dump-guest-core=3Doff,gic-version=3D2,pflash0=3Dli= bvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,memory-backend=3Dmach= -virt.ram \ -accel tcg \ diff --git a/tests/qemuxml2argvdata/aarch64-virt-graphics.xml b/tests/qemux= ml2argvdata/aarch64-virt-graphics.xml index e908d24ac2..b1b5e87c22 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-graphics.xml +++ b/tests/qemuxml2argvdata/aarch64-virt-graphics.xml @@ -12,7 +12,7 @@ hvm /usr/share/AAVMF/AAVMF_CODE.f= d - /var/lib/libvirt/qemu/nvram/guest_VARS.fd + /some/user/nvram/path/guest_VARS.fd diff --git a/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.ar= gs b/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args index 3ca8409e35..0f78840cb3 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-guest/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/AAVMF/AAVMF_CODE.fd","n= ode-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","auto-read-only":true,"disca= rd":"unmap"}' \ +-blockdev '{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.f= d","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"u= nmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ -machine virt,usb=3Doff,dump-guest-core=3Doff,gic-version=3D2,pflash0=3Dli= bvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,memory-backend=3Dmach= -virt.ram \ -accel tcg \ diff --git a/tests/qemuxml2argvdata/aarch64-virt-headless.xml b/tests/qemux= ml2argvdata/aarch64-virt-headless.xml index 7e4fe64b43..27825e9a55 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-headless.xml +++ b/tests/qemuxml2argvdata/aarch64-virt-headless.xml @@ -12,7 +12,7 @@ hvm /usr/share/AAVMF/AAVMF_CODE.f= d - /var/lib/libvirt/qemu/nvram/guest_VARS.fd + /some/user/nvram/path/guest_VARS.fd diff --git a/tests/qemuxml2argvdata/bios-nvram-os-interleave.xml b/tests/qe= muxml2argvdata/bios-nvram-os-interleave.xml index 8e2286e519..d6c86c661c 100644 --- a/tests/qemuxml2argvdata/bios-nvram-os-interleave.xml +++ b/tests/qemuxml2argvdata/bios-nvram-os-interleave.xml @@ -6,7 +6,7 @@ 1 /usr/share/OVMF/OVMF_CODE.fd<= /loader> - /usr/share/OVMF/OVMF_VARS.fd + /some/user/nvram/path/guest_VARS.fd hvm diff --git a/tests/qemuxml2argvdata/bios-nvram-secure.args b/tests/qemuxml2= argvdata/bios-nvram-secure.args index f0799bec3c..e5595d3de7 100644 --- a/tests/qemuxml2argvdata/bios-nvram-secure.args +++ b/tests/qemuxml2argvdata/bios-nvram-secure.args @@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=3Dnone \ -accel tcg \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ -drive file=3D/usr/share/OVMF/OVMF_CODE.secboot.fd,if=3Dpflash,format=3Dra= w,unit=3D0,readonly=3Don \ --drive file=3D/usr/share/OVMF/OVMF_VARS.fd,if=3Dpflash,format=3Draw,unit= =3D1 \ +-drive file=3D/some/user/nvram/path/guest_VARS.fd,if=3Dpflash,format=3Draw= ,unit=3D1 \ -m 1024 \ -realtime mlock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/bios-nvram-secure.xml b/tests/qemuxml2a= rgvdata/bios-nvram-secure.xml index 0788bb9b03..fb5ca4c48d 100644 --- a/tests/qemuxml2argvdata/bios-nvram-secure.xml +++ b/tests/qemuxml2argvdata/bios-nvram-secure.xml @@ -7,7 +7,7 @@ hvm /usr/share/OVM= F/OVMF_CODE.secboot.fd - /usr/share/OVMF/OVMF_VARS.fd + /some/user/nvram/path/guest_VARS.fd diff --git a/tests/qemuxml2argvdata/bios-nvram.args b/tests/qemuxml2argvdat= a/bios-nvram.args index bfbe29a63e..e5f4e2bc4c 100644 --- a/tests/qemuxml2argvdata/bios-nvram.args +++ b/tests/qemuxml2argvdata/bios-nvram.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=3Dnone \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -drive file=3D/usr/share/OVMF/OVMF_CODE.fd,if=3Dpflash,format=3Draw,unit= =3D0,readonly=3Don \ --drive file=3D/usr/share/OVMF/OVMF_VARS.fd,if=3Dpflash,format=3Draw,unit= =3D1 \ +-drive file=3D/some/user/nvram/path/guest_VARS.fd,if=3Dpflash,format=3Draw= ,unit=3D1 \ -m 1024 \ -realtime mlock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/bios-nvram.xml b/tests/qemuxml2argvdata= /bios-nvram.xml index 9cc7853e48..329d510e95 100644 --- a/tests/qemuxml2argvdata/bios-nvram.xml +++ b/tests/qemuxml2argvdata/bios-nvram.xml @@ -7,7 +7,7 @@ hvm /usr/share/OVMF/OVMF_CODE.fd<= /loader> - /usr/share/OVMF/OVMF_VARS.fd + /some/user/nvram/path/guest_VARS.fd diff --git a/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.args b/tests/= qemuxml2argvdata/hvf-aarch64-virt-headless.args index 0f1eed66c2..840ece3893 100644 --- a/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.args +++ b/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=3Dnone \ -machine virt,usb=3Doff,dump-guest-core=3Doff,gic-version=3D2 \ -accel hvf \ -drive file=3D/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw,if=3Dpfla= sh,format=3Draw,unit=3D0,readonly=3Don \ --drive file=3D/var/lib/libvirt/qemu/nvram/test_VARS.fd,if=3Dpflash,format= =3Draw,unit=3D1 \ +-drive file=3D/some/user/nvram/path/guest_VARS.fd,if=3Dpflash,format=3Draw= ,unit=3D1 \ -m 4096 \ -realtime mlock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.xml b/tests/q= emuxml2argvdata/hvf-aarch64-virt-headless.xml index ef13820e17..01997b9731 100644 --- a/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.xml +++ b/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.xml @@ -7,7 +7,7 @@ hvm /usr/share/edk2/aarch64/QEMU_= EFI-silent-pflash.raw - /var/lib/libvirt/qemu/nvram/test_VARS.fd + /some/user/nvram/path/guest_VARS.fd diff --git a/tests/qemuxml2argvdata/os-firmware-bios.xml b/tests/qemuxml2ar= gvdata/os-firmware-bios.xml index 63886666dd..18ceafa948 100644 --- a/tests/qemuxml2argvdata/os-firmware-bios.xml +++ b/tests/qemuxml2argvdata/os-firmware-bios.xml @@ -7,7 +7,7 @@ hvm - /var/lib/libvirt/qemu/nvram/fedora_VARS.fd + /some/user/nvram/path/guest_VARS.fd diff --git a/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args index fdbf8deabe..1bf6ec65bd 100644 --- a/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args +++ b/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-fedora/master-key.aes"}' \ -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/fedora= _VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"disc= ard":"unmap"}' \ +-blockdev '{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.f= d","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"u= nmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ -machine pc-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,pflash0=3Dlib= virt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,memory-backend=3Dpc.ra= m \ -accel kvm \ diff --git a/tests/qemuxml2argvdata/os-firmware-efi-secboot.xml b/tests/qem= uxml2argvdata/os-firmware-efi-secboot.xml index a285e06334..67c93fdbb9 100644 --- a/tests/qemuxml2argvdata/os-firmware-efi-secboot.xml +++ b/tests/qemuxml2argvdata/os-firmware-efi-secboot.xml @@ -7,7 +7,7 @@ hvm - /var/lib/libvirt/qemu/nvram/fedora_VARS.fd + /some/user/nvram/path/guest_VARS.fd diff --git a/tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args b/te= sts/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args index 470fe31256..16eb08078c 100644 --- a/tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-fedora/master-key.aes"}' \ -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/fedora= _VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"disc= ard":"unmap"}' \ +-blockdev '{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.f= d","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"u= nmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ -machine pc-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,pflash0=3Dlib= virt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,memory-backend=3Dpc.ra= m \ -accel kvm \ diff --git a/tests/qemuxml2argvdata/os-firmware-efi.xml b/tests/qemuxml2arg= vdata/os-firmware-efi.xml index 46a7b1b780..8109e227c0 100644 --- a/tests/qemuxml2argvdata/os-firmware-efi.xml +++ b/tests/qemuxml2argvdata/os-firmware-efi.xml @@ -7,7 +7,7 @@ hvm - /var/lib/libvirt/qemu/nvram/fedora_VARS.fd + /some/user/nvram/path/guest_VARS.fd diff --git a/tests/qemuxml2argvdata/q35-acpi-uefi.args b/tests/qemuxml2argv= data/q35-acpi-uefi.args index 60da1e282a..52d902612b 100644 --- a/tests/qemuxml2argvdata/q35-acpi-uefi.args +++ b/tests/qemuxml2argvdata/q35-acpi-uefi.args @@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=3Dnone \ -accel tcg \ -cpu Haswell \ -drive file=3D/usr/share/OVMF/OVMF_CODE.fd,if=3Dpflash,format=3Draw,unit= =3D0,readonly=3Don \ --drive file=3D/var/lib/libvirt/qemu/nvram/guest_VARS.fd,if=3Dpflash,format= =3Draw,unit=3D1 \ +-drive file=3D/some/user/nvram/path/guest_VARS.fd,if=3Dpflash,format=3Draw= ,unit=3D1 \ -m 1024 \ -realtime mlock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/q35-acpi-uefi.xml b/tests/qemuxml2argvd= ata/q35-acpi-uefi.xml index 4eb5a466e9..7e3fa48e9d 100644 --- a/tests/qemuxml2argvdata/q35-acpi-uefi.xml +++ b/tests/qemuxml2argvdata/q35-acpi-uefi.xml @@ -6,7 +6,7 @@ hvm /usr/share/OVMF/OVMF_CODE.fd<= /loader> - /var/lib/libvirt/qemu/nvram/guest_VARS.fd + /some/user/nvram/path/guest_VARS.fd diff --git a/tests/qemuxml2argvdata/q35-noacpi-uefi.xml b/tests/qemuxml2arg= vdata/q35-noacpi-uefi.xml index 91c83c808c..4e4d6fa3d1 100644 --- a/tests/qemuxml2argvdata/q35-noacpi-uefi.xml +++ b/tests/qemuxml2argvdata/q35-noacpi-uefi.xml @@ -6,7 +6,7 @@ hvm /usr/share/OVMF/OVMF_CODE.fd<= /loader> - /var/lib/libvirt/qemu/nvram/guest_VARS.fd + /some/user/nvram/path/guest_VARS.fd Haswell diff --git a/tests/qemuxml2xmloutdata/aarch64-virt-graphics.aarch64-latest.= xml b/tests/qemuxml2xmloutdata/aarch64-virt-graphics.aarch64-latest.xml index a3571c62d7..b4e7e0a944 100644 --- a/tests/qemuxml2xmloutdata/aarch64-virt-graphics.aarch64-latest.xml +++ b/tests/qemuxml2xmloutdata/aarch64-virt-graphics.aarch64-latest.xml @@ -12,7 +12,7 @@ hvm /usr/share/AAVMF/AAVMF_CODE.f= d - /var/lib/libvirt/qemu/nvram/guest_VARS.fd + /some/user/nvram/path/guest_VARS.fd diff --git a/tests/qemuxml2xmloutdata/aarch64-virt-headless.aarch64-latest.= xml b/tests/qemuxml2xmloutdata/aarch64-virt-headless.aarch64-latest.xml index 4f1e9cc18b..3a7961df10 100644 --- a/tests/qemuxml2xmloutdata/aarch64-virt-headless.aarch64-latest.xml +++ b/tests/qemuxml2xmloutdata/aarch64-virt-headless.aarch64-latest.xml @@ -12,7 +12,7 @@ hvm /usr/share/AAVMF/AAVMF_CODE.f= d - /var/lib/libvirt/qemu/nvram/guest_VARS.fd + /some/user/nvram/path/guest_VARS.fd diff --git a/tests/qemuxml2xmloutdata/bios-nvram-os-interleave.xml b/tests/= qemuxml2xmloutdata/bios-nvram-os-interleave.xml index 0a2f718faa..6a40866b0b 100644 --- a/tests/qemuxml2xmloutdata/bios-nvram-os-interleave.xml +++ b/tests/qemuxml2xmloutdata/bios-nvram-os-interleave.xml @@ -7,7 +7,7 @@ hvm /usr/share/OVMF/OVMF_CODE.fd<= /loader> - /usr/share/OVMF/OVMF_VARS.fd + /some/user/nvram/path/guest_VARS.fd diff --git a/tests/qemuxml2xmloutdata/bios-nvram.xml b/tests/qemuxml2xmlout= data/bios-nvram.xml index 17f15fd00b..7049f5e9c5 100644 --- a/tests/qemuxml2xmloutdata/bios-nvram.xml +++ b/tests/qemuxml2xmloutdata/bios-nvram.xml @@ -7,7 +7,7 @@ hvm /usr/share/OVMF/OVMF_CODE.fd<= /loader> - /usr/share/OVMF/OVMF_VARS.fd + /some/user/nvram/path/guest_VARS.fd diff --git a/tests/qemuxml2xmloutdata/hvf-aarch64-virt-headless.xml b/tests= /qemuxml2xmloutdata/hvf-aarch64-virt-headless.xml index b5193a02b4..16e8c23a79 100644 --- a/tests/qemuxml2xmloutdata/hvf-aarch64-virt-headless.xml +++ b/tests/qemuxml2xmloutdata/hvf-aarch64-virt-headless.xml @@ -7,7 +7,7 @@ hvm /usr/share/edk2/aarch64/QEMU_= EFI-silent-pflash.raw - /var/lib/libvirt/qemu/nvram/test_VARS.fd + /some/user/nvram/path/guest_VARS.fd diff --git a/tests/qemuxml2xmloutdata/os-firmware-bios.x86_64-latest.xml b/= tests/qemuxml2xmloutdata/os-firmware-bios.x86_64-latest.xml index df6f61421a..e6704fb7de 100644 --- a/tests/qemuxml2xmloutdata/os-firmware-bios.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/os-firmware-bios.x86_64-latest.xml @@ -7,7 +7,7 @@ hvm - /var/lib/libvirt/qemu/nvram/fedora_VARS.fd + /some/user/nvram/path/guest_VARS.fd diff --git a/tests/qemuxml2xmloutdata/os-firmware-efi-secboot.x86_64-latest= .xml b/tests/qemuxml2xmloutdata/os-firmware-efi-secboot.x86_64-latest.xml index c383546cc6..35ee0a61b0 100644 --- a/tests/qemuxml2xmloutdata/os-firmware-efi-secboot.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/os-firmware-efi-secboot.x86_64-latest.xml @@ -7,7 +7,7 @@ hvm - /var/lib/libvirt/qemu/nvram/fedora_VARS.fd + /some/user/nvram/path/guest_VARS.fd diff --git a/tests/qemuxml2xmloutdata/os-firmware-efi.x86_64-latest.xml b/t= ests/qemuxml2xmloutdata/os-firmware-efi.x86_64-latest.xml index 04d57860e7..ca323482f8 100644 --- a/tests/qemuxml2xmloutdata/os-firmware-efi.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/os-firmware-efi.x86_64-latest.xml @@ -7,7 +7,7 @@ hvm - /var/lib/libvirt/qemu/nvram/fedora_VARS.fd + /some/user/nvram/path/guest_VARS.fd --=20 2.34.1