From nobody Mon Feb 9 19:04:40 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=1691686257; cv=none; d=zohomail.com; s=zohoarc; b=aRz3xUq7xtxgFvXn528EjqdfkIXtj64krcufjzzwmgi/Qzle0LEH8IEZUA02yAzsM4xKDoxl6/ErCZmVOjoqZRtHsGwRmAs/vEIRlhwfFgi2+3O7bgDh8+ttlXy+mUtUaXYZAMAJ04JOBaxrVi9wmR0oZfCFArEq5exPG/4iMXI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1691686257; 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=AEeOUivHxwBspi7kvH4NzEQqi09YNWMlQLxO2JhcOWY=; b=kdYF9e93v4DC0Evmzm5W9hkl/9vu4z9oTZFJ8RJ9CBQq4AgxzujIIutKR+6VDwRbCxV1kUzuZtolQjPL4+N+MbL5qhh1aItN7U+9rH4+ZKqprgyK8W9W03EC54tSFSze+2drAya3SKr39qGMA6dH5jAcnhodUIGEK2no2Ha/AjQ= 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 1691686257123597.1033139754653; Thu, 10 Aug 2023 09:50:57 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-554-JncgHRNSPLq8KHNm6OTjAg-1; Thu, 10 Aug 2023 12:50:53 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DA53485CCE2; Thu, 10 Aug 2023 16:50:50 +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 D390740C6F4E; Thu, 10 Aug 2023 16:50:48 +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 E22D81946A4B; Thu, 10 Aug 2023 16:50:44 +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 5FECB1946588 for ; Thu, 10 Aug 2023 16:50:42 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 424B3140E96F; Thu, 10 Aug 2023 16:50:42 +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 C1239140E96E for ; Thu, 10 Aug 2023 16:50:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1691686256; 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=AEeOUivHxwBspi7kvH4NzEQqi09YNWMlQLxO2JhcOWY=; b=UVVlGDc23qqfU9mHzKuEOt5yWVYr2jyTZGsHt3nSPydVORcVJYgF72VEYNYuykiK090QrY UBnahp2t2lSIRApxO1p7dGT1jBCzOB3DZMGuXAu838hYFRt2HNOqYdYss/WVXPg0BGMo1n i0pNa63VApjWymDV9X78dCMIAUfbGmc= X-MC-Unique: JncgHRNSPLq8KHNm6OTjAg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 02/21] tests: Switch to firmware autoselection for hvf Date: Thu, 10 Aug 2023 18:50:19 +0200 Message-ID: <20230810165038.169700-3-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.2 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: 1691686258243100002 Content-Type: text/plain; charset="utf-8"; x-default="true" Firmware selection is not relevant to these tests, so adopt the most convenient approach. Signed-off-by: Andrea Bolognani --- .../hvf-aarch64-virt-headless.aarch64-latest.args | 6 +++--- tests/qemuxml2argvdata/hvf-aarch64-virt-headless.xml | 6 ++---- .../hvf-x86_64-q35-headless.x86_64-latest.args | 7 ++++++- tests/qemuxml2argvdata/hvf-x86_64-q35-headless.xml | 4 ++-- .../hvf-aarch64-virt-headless.aarch64-latest.xml | 12 ++++++++---- .../hvf-x86_64-q35-headless.x86_64-latest.xml | 11 +++++++++-- 6 files changed, 30 insertions(+), 16 deletions(-) diff --git a/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.aarch64-lates= t.args b/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.aarch64-latest.ar= gs index 8fae9ebfa6..7559b9885f 100644 --- a/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.aarch64-latest.args +++ b/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.aarch64-latest.args @@ -10,11 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/= .config \ -name guest=3Dtest,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-test/master-key.aes"}' \ --blockdev '{"driver":"file","filename":"/usr/share/edk2/aarch64/QEMU_EFI-s= ilent-pflash.raw","node-name":"libvirt-pflash0-storage","auto-read-only":tr= ue,"discard":"unmap"}' \ +-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":"/var/lib/libvirt/qemu/nvram/test_V= ARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discar= d":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflas= h1-format \ +-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 hvf \ -m size=3D4194304k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":4294= 967296}' \ diff --git a/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.xml b/tests/q= emuxml2argvdata/hvf-aarch64-virt-headless.xml index 01997b9731..3ae6f93647 100644 --- a/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.xml +++ b/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.xml @@ -4,10 +4,8 @@ 4194304 4194304 2 - - hvm - /usr/share/edk2/aarch64/QEMU_= EFI-silent-pflash.raw - /some/user/nvram/path/guest_VARS.fd + + hvm diff --git a/tests/qemuxml2argvdata/hvf-x86_64-q35-headless.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/hvf-x86_64-q35-headless.x86_64-latest.args index 92fbcffd57..abea7bf158 100644 --- a/tests/qemuxml2argvdata/hvf-x86_64-q35-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hvf-x86_64-q35-headless.x86_64-latest.args @@ -10,9 +10,14 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.= config \ -name guest=3Dtest,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-test/master-key.aes"}' \ --machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ +-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/test_V= ARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discar= d":"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,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-forma= t \ -accel hvf \ -cpu qemu64 \ +-global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ -m size=3D4194304k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":4294967296}= ' \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxml2argvdata/hvf-x86_64-q35-headless.xml b/tests/qem= uxml2argvdata/hvf-x86_64-q35-headless.xml index cad560e9ca..93980d434c 100644 --- a/tests/qemuxml2argvdata/hvf-x86_64-q35-headless.xml +++ b/tests/qemuxml2argvdata/hvf-x86_64-q35-headless.xml @@ -4,8 +4,8 @@ 4194304 4194304 2 - - hvm + + hvm diff --git a/tests/qemuxml2xmloutdata/hvf-aarch64-virt-headless.aarch64-lat= est.xml b/tests/qemuxml2xmloutdata/hvf-aarch64-virt-headless.aarch64-latest= .xml index 16e8c23a79..69c1d5deb3 100644 --- a/tests/qemuxml2xmloutdata/hvf-aarch64-virt-headless.aarch64-latest.xml +++ b/tests/qemuxml2xmloutdata/hvf-aarch64-virt-headless.aarch64-latest.xml @@ -4,10 +4,14 @@ 4194304 4194304 2 - - hvm - /usr/share/edk2/aarch64/QEMU_= EFI-silent-pflash.raw - /some/user/nvram/path/guest_VARS.fd + + hvm + + + + + /usr/share/AAVMF/AAVMF_CODE.f= d + /var/lib/libvirt/qe= mu/nvram/test_VARS.fd diff --git a/tests/qemuxml2xmloutdata/hvf-x86_64-q35-headless.x86_64-latest= .xml b/tests/qemuxml2xmloutdata/hvf-x86_64-q35-headless.x86_64-latest.xml index 384241ac3d..032fd43471 100644 --- a/tests/qemuxml2xmloutdata/hvf-x86_64-q35-headless.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/hvf-x86_64-q35-headless.x86_64-latest.xml @@ -4,13 +4,20 @@ 4194304 4194304 2 - - hvm + + hvm + + + + + /usr/share/OVM= F/OVMF_CODE.secboot.fd + /var/lib/libv= irt/qemu/nvram/test_VARS.fd + qemu64 --=20 2.41.0