From nobody Thu Oct 2 13:00:50 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551980283131788.4224441481322; Thu, 7 Mar 2019 09:38:03 -0800 (PST) Received: from localhost ([127.0.0.1]:56155 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1wxy-000094-Bq for importer@patchew.org; Thu, 07 Mar 2019 12:37:58 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37436) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1wkm-0005R0-IQ for qemu-devel@nongnu.org; Thu, 07 Mar 2019 12:24:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1wkl-0003Ou-OA for qemu-devel@nongnu.org; Thu, 07 Mar 2019 12:24:20 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33150) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h1wkj-0003Mp-HA; Thu, 07 Mar 2019 12:24:17 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C1A9430642AA; Thu, 7 Mar 2019 17:24:16 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-92.ams2.redhat.com [10.36.116.92]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5BFC75D719; Thu, 7 Mar 2019 17:24:15 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 7DC4F1132BD8; Thu, 7 Mar 2019 18:24:01 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 18:24:01 +0100 Message-Id: <20190307172401.29451-13-armbru@redhat.com> In-Reply-To: <20190307172401.29451-1-armbru@redhat.com> References: <20190307172401.29451-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Thu, 07 Mar 2019 17:24:16 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 12/12] docs/interop/firmware.json: Prefer -machine to if=pflash X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, pkrempa@redhat.com, qemu-block@nongnu.org, mst@redhat.com, philmd@redhat.com, mreitz@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, lersek@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The previous commit added a way to configure firmware with -blockdev rather than -drive if=3Dpflash. Document it as the preferred way. Signed-off-by: Markus Armbruster --- docs/interop/firmware.json | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/docs/interop/firmware.json b/docs/interop/firmware.json index 28f9bc1591..db3cb38b6a 100644 --- a/docs/interop/firmware.json +++ b/docs/interop/firmware.json @@ -212,9 +212,13 @@ # # @executable: Identifies the firmware executable. The firmware # executable may be shared by multiple virtual machine -# definitions. The corresponding QEMU command line option -# is "-drive -# if=3Dpflash,unit=3D0,readonly=3Don,file=3D@executable.@file= name,format=3D@executable.@format". +# definitions. The preferred corresponding QEMU command +# line option is +# -drive if=3Dnone,id=3Dpflash0,readonly=3Don,file=3D@exe= cutable.@filename,format=3D@executable.@format +# -machine pflash0=3Dpflash0 +# or equivalent -blockdev. +# With QEMU versions older than 4.0, you have to use +# -drive if=3Dpflash,unit=3D0,readonly=3Don,file=3D@execu= table.@filename,format=3D@executable.@format # # @nvram-template: Identifies the NVRAM template compatible with # @executable. Management software instantiates an @@ -225,9 +229,14 @@ # individual copies of it are. An NVRAM file is # typically used for persistently storing the # non-volatile UEFI variables of a virtual machine -# definition. The corresponding QEMU command line -# option is "-drive -# if=3Dpflash,unit=3D1,readonly=3Doff,file=3DFILENAME_OF_= PRIVATE_NVRAM_FILE,format=3D@nvram-template.@format". +# definition. The preferred corresponding QEMU +# command line option is +# -drive if=3Dnone,id=3Dpflash1,readonly=3Doff,file= =3DFILENAME_OF_PRIVATE_NVRAM_FILE,format=3D@nvram-template.@format +# -machine pflash1=3Dpflash1 +# or equivalent -blockdev. +# With QEMU versions older than 4.0, you have to use +# -drive if=3Dpflash,unit=3D1,readonly=3Doff,file=3DF= ILENAME_OF_PRIVATE_NVRAM_FILE,format=3D@nvram-template.@format +# =20 # # Since: 3.0 ## --=20 2.17.2