From nobody Tue Feb 10 03:45:33 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1656000934; cv=none; d=zohomail.com; s=zohoarc; b=T9yupOhG0ujYMNINgljYH6IQQbQcf21/mvFfmISPOAqb89+MasjT/CH2YKVzZhgWWvi/9Z7AX4sq7i8qBB25JjHoSVio0kYpNyjPO8IAiUd3PaVHljvwTcp2T8npKxXqcypYTke99W66xFH6EthnTPgJlK6ChtyATaNi+Fi2CmA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1656000934; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=1U5oxt4XgBDCJvaIEJNLsg2j9aR/oAwdk/9dsbQ/SY8=; b=S959Ndki68FMkJo9y0do+Aps+3K+ULwYrs+oV5LuJo8nYgPv8GhglnLthjGbi8H5MmwDWE01a3j3lQ0PFWAzljtmqGCEa19E70CAjmx76fu3cGjz+1v4R8NgpaXNl525lKAWIALwn0yq0hjQXCRV+YXzCLNqnHgJUzCnpkzAlfo= 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 1656000934419222.09899162446743; Thu, 23 Jun 2022 09:15:34 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-416-asxCs0LNPLSB-PtKtqLGyg-1; Thu, 23 Jun 2022 12:15:28 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DE6471C0F6AE; Thu, 23 Jun 2022 16:14:49 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id C7A0F1415111; Thu, 23 Jun 2022 16:14:49 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 900BC194B959; Thu, 23 Jun 2022 16:14:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 98BCB194B968 for ; Thu, 23 Jun 2022 16:14:47 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 8E55A1121319; Thu, 23 Jun 2022 16:14:47 +0000 (UTC) Received: from harajuku.homenet.telecomitalia.it (unknown [10.40.194.79]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1D0491121315 for ; Thu, 23 Jun 2022 16:14:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656000933; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=1U5oxt4XgBDCJvaIEJNLsg2j9aR/oAwdk/9dsbQ/SY8=; b=LiZOMwbfdEvqdSKw5JB68+jM283evi7XX6dswm1fb1wsMzxvY65JI7v0KvUJuh90QcsfVZ z+yrxKFv3m9VAXmPlxqmMQ5qQLbTXAEw7SgNroZvorKPG5ITqa+T8ie+A7vo/uo0XglzeS w8qiMYabTJkrVf7rJ01/BOokIQJpQb0= X-MC-Unique: asxCs0LNPLSB-PtKtqLGyg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 06/28] tests: Don't set NVRAM path manually Date: Thu, 23 Jun 2022 18:14:18 +0200 Message-Id: <20220623161440.61653-7-abologna@redhat.com> In-Reply-To: <20220623161440.61653-1-abologna@redhat.com> References: <20220623161440.61653-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 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: 1656000935827100001 This does the opposite of commit 392292cd99ee275f986e9e21f325a9fee8e8bbfe Author: Daniel P. Berrang=C3=A9 Date: Wed Feb 23 12:45:51 2022 +0000 tests: don't use auto-generated NVRAM path in tests in order to minimize input files. We're going to add a test case specifically covering the use of custom NVRAM paths with firmware autoselection in an upcoming commit. Signed-off-by: Andrea Bolognani --- tests/qemuxml2argvdata/firmware-auto-bios.xml | 1 - .../firmware-auto-efi-loader-secure.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.xml | 1 - tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/firmware-auto-efi.xml | 1 - tests/qemuxml2xmloutdata/firmware-auto-bios.x86_64-latest.xml | 1 - .../firmware-auto-efi-loader-secure.x86_64-latest.xml | 1 - tests/qemuxml2xmloutdata/firmware-auto-efi.x86_64-latest.xml | 1 - 8 files changed, 2 insertions(+), 8 deletions(-) diff --git a/tests/qemuxml2argvdata/firmware-auto-bios.xml b/tests/qemuxml2= argvdata/firmware-auto-bios.xml index 0abbddb22e..1318f68243 100644 --- a/tests/qemuxml2argvdata/firmware-auto-bios.xml +++ b/tests/qemuxml2argvdata/firmware-auto-bios.xml @@ -6,7 +6,6 @@ hvm - /some/user/nvram/path/guest_VARS.fd diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64-= latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64= -latest.args index 37564db12c..7479b05af4 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64-latest.= args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.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":"/some/user/nvram/path/guest_VARS.f= d","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"u= nmap"}' \ +-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 '{"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/firmware-auto-efi-loader-secure.xml b/t= ests/qemuxml2argvdata/firmware-auto-efi-loader-secure.xml index 1b94c25f32..34fa6d090e 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.xml +++ b/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.xml @@ -6,7 +6,6 @@ hvm - /some/user/nvram/path/guest_VARS.fd diff --git a/tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args b/= tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args index 51aa5c0303..885c83445d 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-auto-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":"/some/user/nvram/path/guest_VARS.f= d","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"u= nmap"}' \ +-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 '{"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/firmware-auto-efi.xml b/tests/qemuxml2a= rgvdata/firmware-auto-efi.xml index b92277ddbe..33bd7b0ac1 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi.xml +++ b/tests/qemuxml2argvdata/firmware-auto-efi.xml @@ -6,7 +6,6 @@ hvm - /some/user/nvram/path/guest_VARS.fd diff --git a/tests/qemuxml2xmloutdata/firmware-auto-bios.x86_64-latest.xml = b/tests/qemuxml2xmloutdata/firmware-auto-bios.x86_64-latest.xml index c43f3b1147..b744234cf1 100644 --- a/tests/qemuxml2xmloutdata/firmware-auto-bios.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/firmware-auto-bios.x86_64-latest.xml @@ -7,7 +7,6 @@ hvm - /some/user/nvram/path/guest_VARS.fd diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-loader-secure.x86_6= 4-latest.xml b/tests/qemuxml2xmloutdata/firmware-auto-efi-loader-secure.x86= _64-latest.xml index 709fd42aa6..26e30d7f64 100644 --- a/tests/qemuxml2xmloutdata/firmware-auto-efi-loader-secure.x86_64-lates= t.xml +++ b/tests/qemuxml2xmloutdata/firmware-auto-efi-loader-secure.x86_64-lates= t.xml @@ -7,7 +7,6 @@ hvm - /some/user/nvram/path/guest_VARS.fd diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi.x86_64-latest.xml b= /tests/qemuxml2xmloutdata/firmware-auto-efi.x86_64-latest.xml index b152b3ef87..35d49b7c62 100644 --- a/tests/qemuxml2xmloutdata/firmware-auto-efi.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/firmware-auto-efi.x86_64-latest.xml @@ -7,7 +7,6 @@ hvm - /some/user/nvram/path/guest_VARS.fd --=20 2.35.3