From nobody Sat May 4 21:47:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 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=1555594806; cv=none; d=zoho.com; s=zohoarc; b=Ch935ASPE8Kf9+IYeotMiZ9pMEA/RZg6kyNUTjrvmxjRPUAeSiV1wmFjMMmoOHJi/VAcz8DInpqt/tqv7kUS0O8mdopdNl5Mop1n/T/GfX0lTl9vogM7MUwpK2vnnIwLcqpCgvab29NhShSd2Fx5ByAeScYV+ii4LmpJwanRfGI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555594806; 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:ARC-Authentication-Results; bh=yKeqSXYMMwakORdx8BCJyBaLuDD81BdpJr4puW9AwrY=; b=Q1x7y3CCAcm2Y6xEk0DvzHQ4y6g/Ft4yaYxCooa73mwXFzJQEaHV/+LBuvbUGKm7c5QEb7qPwe/hK0EAUXpVYG4BUZEPpOhUio/ilrr8ko29HZE1Tzv+Nmc44Rf2E06OpBQ5n7vuO1pWAjXm1jBl4PeKRAsxcC9u9g/IURBGP1E= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1555594806849237.34193150261171; Thu, 18 Apr 2019 06:40:06 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8DD0EC067C0A; Thu, 18 Apr 2019 13:39:59 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BB7BA5C206; Thu, 18 Apr 2019 13:39:56 +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 7C1743FB13; Thu, 18 Apr 2019 13:39:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x3IDdml0005608 for ; Thu, 18 Apr 2019 09:39:48 -0400 Received: by smtp.corp.redhat.com (Postfix) id 985516014E; Thu, 18 Apr 2019 13:39:48 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-59.ams2.redhat.com [10.36.112.59]) by smtp.corp.redhat.com (Postfix) with ESMTP id D808B600C1; Thu, 18 Apr 2019 13:39:47 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Thu, 18 Apr 2019 14:39:40 +0100 Message-Id: <20190418133942.8551-2-berrange@redhat.com> In-Reply-To: <20190418133942.8551-1-berrange@redhat.com> References: <20190418133942.8551-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/3] m4: allow default firmware list to be empty 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 18 Apr 2019 13:40:05 +0000 (UTC) Currently behaviour of --with-loader-nvram is as follows * No arg given -> use built-in default * --with-loader-nvram=3DSTRING -> use STRING instead of built-in default * --with-loader-nvram=3D -> use built-in default * --without-loader-nvram -> use built-in default IOW, there is no way to disable the built-in default. We thus change the behaviour to * No arg given -> use built-in default * --with-loader-nvram=3DSTRING -> use STRING instead of built-in default * --with-loader-nvram=3D -> disable built-in default * --without-loader-nvram -> disable built-in default Signed-off-by: Daniel P. Berrang=C3=A9 --- m4/virt-loader-nvram.m4 | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/m4/virt-loader-nvram.m4 b/m4/virt-loader-nvram.m4 index 0eb77fa923..9089a16f82 100644 --- a/m4/virt-loader-nvram.m4 +++ b/m4/virt-loader-nvram.m4 @@ -21,15 +21,19 @@ AC_DEFUN([LIBVIRT_ARG_LOADER_NVRAM], [ LIBVIRT_ARG_WITH([LOADER_NVRAM], [Pass list of pairs of : paths. Both pairs and list items are separated by a colon.], - ['']) + ['builtin']) ]) =20 AC_DEFUN([LIBVIRT_CHECK_LOADER_NVRAM], [ - if test "x$with_loader_nvram" !=3D "xno" && \ - test "x$with_loader_nvram" !=3D "x" ; then - l=3D$(echo $with_loader_nvram | tr ':' '\n' | wc -l) - if test $(expr $l % 2) -ne 0 ; then - AC_MSG_ERROR([Malformed --with-loader-nvram argument]) + if test "x$with_loader_nvram" !=3D "xbuiltin" ; then + if test "x$with_loader_nvram" =3D "xno" ; then + with_loader_nvram=3D + fi + if test "x$with_loader_nvram" !=3D "x" ; then + l=3D$(echo $with_loader_nvram | tr ':' '\n' | wc -l) + if test $(expr $l % 2) -ne 0 ; then + AC_MSG_ERROR([Malformed --with-loader-nvram argument string '$with= _loader_nvram']) + fi fi AC_DEFINE_UNQUOTED([DEFAULT_LOADER_NVRAM], ["$with_loader_nvram"], [List of loader:nvram pairs]) --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 4 21:47:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 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=1555594806; cv=none; d=zoho.com; s=zohoarc; b=gFL7nF2wT/ELRgKv0/lzcee1fgHperSf2z55DiUDGi0LWkHabmvUw6pbe69Xbxgmn7uCZ5rJhOpzwueAsG07pf1Y1K1sWfQV/y6+KTbasL8R4EFDi3abjwEmECccHkVN7o+/jP3DPJGAeEB5sXwX96ZCOAwch5KgopRv9VyXtsE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555594806; 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:ARC-Authentication-Results; bh=+dC2oRoCDfikKJrUGS6BGnrSDs5hpDGBLUawsBtJWE4=; b=THhccmYPLJVLlSTBpYC9wapDujTv4TwByjyqAfw0IPxEnaRgHmz8piDoRBKhaxHHo2XR58ZU2vHGqlB8l1VHjnFqhDtvIJju4fNPfdH9fSlTmCyTbozUFO8jInwFu4rmTWebkIz8Z/hd/vaS+1UvYybJBmrsy8p5AYwaVxM+5Ds= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1555594806859812.211595991955; Thu, 18 Apr 2019 06:40:06 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 60EEADBD8F; Thu, 18 Apr 2019 13:39:57 +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 F257E60143; Thu, 18 Apr 2019 13:39:56 +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 CF918181AC45; Thu, 18 Apr 2019 13:39:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x3IDdn0g005654 for ; Thu, 18 Apr 2019 09:39:49 -0400 Received: by smtp.corp.redhat.com (Postfix) id B6B3060143; Thu, 18 Apr 2019 13:39:49 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-59.ams2.redhat.com [10.36.112.59]) by smtp.corp.redhat.com (Postfix) with ESMTP id F1869600C1; Thu, 18 Apr 2019 13:39:48 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Thu, 18 Apr 2019 14:39:41 +0100 Message-Id: <20190418133942.8551-3-berrange@redhat.com> In-Reply-To: <20190418133942.8551-1-berrange@redhat.com> References: <20190418133942.8551-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/3] rpm: disable default firmware list on RHEL and Fedora >= 31 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 18 Apr 2019 13:40:05 +0000 (UTC) RHEL 7 & 8 and Fedora >=3D 31 are expected to ship firmware metdata files alongside any firmware binaries used for QEMU. As such we should disable the built-in paths for the nvram config variable in libvirt. At best they are duplicating information libvirt can already get from the metadata files; at worst they are simply wrong. Signed-off-by: Daniel P. Berrang=C3=A9 --- libvirt.spec.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 18f0a0e217..a15160f211 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1130,7 +1130,7 @@ exit 1 =20 %define arg_selinux_mount --with-selinux-mount=3D"/sys/fs/selinux" =20 -%if 0%{?fedora} +%if 0%{?fedora} && 0%{?fedora} < 31 # Nightly edk2.git-ovmf-x64 LOADERS=3D"/usr/share/edk2.git/ovmf-x64/OVMF_CODE-pure-efi.fd:/usr/sha= re/edk2.git/ovmf-x64/OVMF_VARS-pure-efi.fd" # Nightly edk2.git-ovmf-ia32 @@ -1149,6 +1149,10 @@ exit 1 # Fedora edk2-arm LOADERS=3D"$LOADERS:/usr/share/edk2/arm/QEMU_EFI-pflash.raw:/usr/share= /edk2/arm/vars-template-pflash.raw" %define arg_loader_nvram --with-loader-nvram=3D"$LOADERS" +%else + # These distros use QEMU firmware metadata files, so + # disable libvirts built-in default nvram list + %define arg_loader_nvram --without-loader-nvram %endif =20 # place macros above and build commands below this comment --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 4 21:47:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 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=1555594820; cv=none; d=zoho.com; s=zohoarc; b=etOYWueGdyMFVpxfxlxInQpRL8F95MQytfziU1z1L53Psv6Yc1MrSjeUiRiyJqRpkipprE6sPNC1sWdOQzqdFwrPInKxKUi51Gx3rUFpzrJ0RNWUjZNwS3XTa6lGBOFye4YSSvPha2NgaRuEYJcSgHAecyZq8cUlBBMf0REtvtE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555594820; 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:ARC-Authentication-Results; bh=pQRAmUUqWaq7qvqU7xVUHg/Z+qExJaVVOyuv+j4n61Q=; b=YFMWQbmy8+aoPPH2SjjjlctuNJzOutsf9eKcrD9Gm2DtPJBVbtOaP1bnHPnggvXiJX6sV+CAXbEQdFzaeJmA32STdXamnBMBxfMwfIF8CD5BB+LmCZHzfoL7ZSY47ragt0MscOZgDPmxy0+jf1h9rHiAu5NQGIQYX+MsLRouhJ8= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1555594820322410.95935859995575; Thu, 18 Apr 2019 06:40:20 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 799CC81F25; Thu, 18 Apr 2019 13:40:18 +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 4DF7360851; Thu, 18 Apr 2019 13:40:18 +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 0323D181AC47; Thu, 18 Apr 2019 13:40:18 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x3IDdpAO005674 for ; Thu, 18 Apr 2019 09:39:51 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1E9FA60143; Thu, 18 Apr 2019 13:39:51 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-59.ams2.redhat.com [10.36.112.59]) by smtp.corp.redhat.com (Postfix) with ESMTP id 27059600C1; Thu, 18 Apr 2019 13:39:49 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Thu, 18 Apr 2019 14:39:42 +0100 Message-Id: <20190418133942.8551-4-berrange@redhat.com> In-Reply-To: <20190418133942.8551-1-berrange@redhat.com> References: <20190418133942.8551-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 3/3] qemu: stop including real paths in nvram config option 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 18 Apr 2019 13:40:18 +0000 (UTC) The qemu.conf docs list paths to firmware images, but these only reflect the libvirt built-in default paths. Distros will typically override this information at built time with --with-loader-nvram. Thus the paths in the config are misleading to users. While we could subsistute in the real built-in paths are build time, since we are switching to use the firmware metadata files, this instead just uses dummy paths for illustrating the syntax. Signed-off-by: Daniel P. Berrang=C3=A9 --- src/qemu/qemu.conf | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index 334b4cd4ee..d157a5b058 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -750,13 +750,12 @@ # Later, when libvirt creates per domain variable store, this list is # searched for the master image. The UEFI firmware can be called # differently for different guest architectures. For instance, it's OVMF -# for x86_64 and i686, but it's AAVMF for aarch64. The libvirt default -# follows this scheme. +# for x86_64 and i686, but it's AAVMF for aarch64. #nvram =3D [ -# "/usr/share/OVMF/OVMF_CODE.fd:/usr/share/OVMF/OVMF_VARS.fd", -# "/usr/share/OVMF/OVMF_CODE.secboot.fd:/usr/share/OVMF/OVMF_VARS.fd", -# "/usr/share/AAVMF/AAVMF_CODE.fd:/usr/share/AAVMF/AAVMF_VARS.fd", -# "/usr/share/AAVMF/AAVMF32_CODE.fd:/usr/share/AAVMF/AAVMF32_VARS.fd" +# "/some/path/to/OVMF_CODE.fd:/some/path/to/OVMF_VARS.fd", +# "/some/path/to/OVMF_CODE.secboot.fd:/some/path/to/OVMF_VARS.fd", +# "/some/path/to/AAVMF_CODE.fd:/some/path/to/AAVMF_VARS.fd", +# "/some/path/to/AAVMF32_CODE.fd:/some/path/to/AAVMF32_VARS.fd" #] =20 # The backend to use for handling stdout/stderr output from --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list