From nobody Mon Feb 9 22:18:44 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=1691686261; cv=none; d=zohomail.com; s=zohoarc; b=cTgiLdraA+MTbUV1hoUGru7Pl4UH6RdUuL4mR6CpxoEwsQH9cQ31HnZR+QbIbY//kSFRSbeuO7Wc3sc/vUVtenjGrRKWvrZiTMX9azjHsh13p9MYCz49lcHxJBSFOxDk/87nMkt4iCSvFRaNxSdi62bJhnTivM6ZpA2nDSA32tE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1691686261; 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=GRr05d1fjfSCJgIvLBShkx08heHNcCQFQ0KK/pEKy/o=; b=hmlRe+UJP7EybmMkLe/ik5rFfU2DiSf3+0KYu0X7zuH2jajnG33Oauq1h0nzGf5jDtiqNT1MCxAqtf3lH94aNvcgUUbY24gZ4hbiB6zl+h4joF2uirazf2SJHkoa86REt5bi3KOBcbE3ReEKpRrJv4qGkpQmY9Ja6sWvkHRogi8= 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 1691686261627853.4536743686315; Thu, 10 Aug 2023 09:51:01 -0700 (PDT) Received: from mimecast-mx02.redhat.com (66.187.233.73 [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-564-_As1bVFlMIyuNlHpefoAkw-1; Thu, 10 Aug 2023 12:50:56 -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 53A6A3813F39; Thu, 10 Aug 2023 16:50:53 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3B9AC140E96F; Thu, 10 Aug 2023 16:50:53 +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 612D11946A42; Thu, 10 Aug 2023 16:50:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id E5D8319465A2 for ; Thu, 10 Aug 2023 16:50:43 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C9FF1140E96F; Thu, 10 Aug 2023 16:50:43 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.45.224.46]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 55371140E96E for ; Thu, 10 Aug 2023 16:50:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1691686260; 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=GRr05d1fjfSCJgIvLBShkx08heHNcCQFQ0KK/pEKy/o=; b=e4h9IFpMrzsvtmpwjWgBlHBa1uTUjJDQZFtUFT0vPNxTYKBsWL2LDnET0w1nKfFDykgAgf eGf6mGAaHgsaNn9iOzF9XAfl88A8JFEq4FygqVDVEKLsW8QHVYosml1zKs9eUgXBDdEq5P LKL95m7ElpkIzKPJWy5xz4rdsDVt93s= X-MC-Unique: _As1bVFlMIyuNlHpefoAkw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 04/21] tests: Consistently use /path/to/guest_VARS.fd Date: Thu, 10 Aug 2023 18:50:21 +0200 Message-ID: <20230810165038.169700-5-abologna@redhat.com> In-Reply-To: <20230810165038.169700-1-abologna@redhat.com> References: <20230810165038.169700-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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 3.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1691686263057100001 Content-Type: text/plain; charset="utf-8"; x-default="true" That's what we already use in almost all cases. Signed-off-by: Andrea Bolognani --- .../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 +- .../qemuxml2xmloutdata/aarch64-virt-graphics.aarch64-latest.xml | 2 +- .../qemuxml2xmloutdata/aarch64-virt-headless.aarch64-latest.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.ar= gs b/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args index 1b7b0a70ff..eaa558747f 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/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/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":"/some/user/nvram/path/guest_VARS.f= d","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"u= nmap"}' \ +-blockdev '{"driver":"file","filename":"/path/to/guest_VARS.fd","node-name= ":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ -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 \ -accel tcg \ diff --git a/tests/qemuxml2argvdata/aarch64-virt-graphics.xml b/tests/qemux= ml2argvdata/aarch64-virt-graphics.xml index 2b1704ad7b..3c7da08381 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 - /some/user/nvram/path/guest_VARS.fd + /path/to/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 23b514da9a..9d13abb531 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/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/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":"/some/user/nvram/path/guest_VARS.f= d","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"u= nmap"}' \ +-blockdev '{"driver":"file","filename":"/path/to/guest_VARS.fd","node-name= ":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ -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 \ -accel tcg \ diff --git a/tests/qemuxml2argvdata/aarch64-virt-headless.xml b/tests/qemux= ml2argvdata/aarch64-virt-headless.xml index 1d1fc071d7..4cb309037b 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 - /some/user/nvram/path/guest_VARS.fd + /path/to/guest_VARS.fd diff --git a/tests/qemuxml2xmloutdata/aarch64-virt-graphics.aarch64-latest.= xml b/tests/qemuxml2xmloutdata/aarch64-virt-graphics.aarch64-latest.xml index f0a4003655..1150aceb02 100644 --- a/tests/qemuxml2xmloutdata/aarch64-virt-graphics.aarch64-latest.xml +++ b/tests/qemuxml2xmloutdata/aarch64-virt-graphics.aarch64-latest.xml @@ -16,7 +16,7 @@ /usr/share/AAVMF/AAVMF_CODE.f= d - /some/user/nvram/pa= th/guest_VARS.fd + /path/to/guest_VARS= .fd diff --git a/tests/qemuxml2xmloutdata/aarch64-virt-headless.aarch64-latest.= xml b/tests/qemuxml2xmloutdata/aarch64-virt-headless.aarch64-latest.xml index ab4126318a..68df856a28 100644 --- a/tests/qemuxml2xmloutdata/aarch64-virt-headless.aarch64-latest.xml +++ b/tests/qemuxml2xmloutdata/aarch64-virt-headless.aarch64-latest.xml @@ -16,7 +16,7 @@ /usr/share/AAVMF/AAVMF_CODE.f= d - /some/user/nvram/pa= th/guest_VARS.fd + /path/to/guest_VARS= .fd --=20 2.41.0