From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by mx.groups.io with SMTP id smtpd.web09.436.1665179409419540906 for ; Fri, 07 Oct 2022 14:50:09 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Y+aedJF1; spf=pass (domain: kernel.org, ip: 145.40.68.75, mailfrom: ardb@kernel.org) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id E0288B823A5 for ; Fri, 7 Oct 2022 21:50:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A273AC43470 for ; Fri, 7 Oct 2022 21:50:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1665179406; bh=uFgorL0G8eTfdXH7DPB4ryCbMPO/76IqtB3QqX/75VA=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=Y+aedJF1AR/xsxzxJ/9AzuBuuaNua4AhvhbyFfAFeTrt4nFDZdK8wKJZEuAiCOsX/ aeiOdHr33cnh4O8H6n+TEjxBZojVoIftD+3zpm6gCzo/KXxioW8PcN/ryjwRyYnoCl gFXzHeAZKF9NTk6efIsx1fGoHWMX4uFcK0YltyWdLWJT2Un9AQsTLdG/x6a/nYxOTq xEJiMesgSU78KREkbefufELAhiRkQx3ZH7mgHgENZitMa7hOYQAfk5VRSztArHDbR6 ULCditYQuZ4aMn9pdg4FdBUzCx2n8PnfEXYc+W22F7W03JMBIrTx+3hWrgRKeYS/9c UQQWwu0vab8Dw== Received: by mail-lj1-f179.google.com with SMTP id q17so7130660lji.11 for ; Fri, 07 Oct 2022 14:50:06 -0700 (PDT) X-Gm-Message-State: ACrzQf1ohdsj4iQPSLv9fZOEsYFIHLxxTGuZAGvKHTTMHBUXlEn58e+2 r8YrZ9Sx5IRXikZtnQeze2PdsZYrKLXNZfQG/vM= X-Google-Smtp-Source: AMsMyM7c1wai+sbOUwmuyveBPNbbrqQ1S5GjAj5hajD7g5YjFcBjsyvVRHjNsw664dH5hMOkZK77f7z6MrCfzUr1W8w= X-Received: by 2002:a05:651c:b13:b0:26c:679f:ea66 with SMTP id b19-20020a05651c0b1300b0026c679fea66mr2608329ljr.516.1665179404695; Fri, 07 Oct 2022 14:50:04 -0700 (PDT) MIME-Version: 1.0 References: <20221004112157.302570-1-kraxel@redhat.com> In-Reply-To: <20221004112157.302570-1-kraxel@redhat.com> From: "Ard Biesheuvel" Date: Fri, 7 Oct 2022 23:49:53 +0200 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH 1/1] OvmfPkg: rename QemuBootOrderNNNN to VMMBootOrderNNNN To: Gerd Hoffmann Cc: devel@edk2.groups.io, Ard Biesheuvel , Oliver Steffen , Jordan Justen , Jiewen Yao , Pawel Polawski Content-Type: text/plain; charset="UTF-8" Merged #3449 into master. On Tue, 4 Oct 2022 at 13:22, Gerd Hoffmann wrote: > > While the actual implementation (using qemu fw_cfg) is qemu-specific, > the idea to store the boot order as configured by the VMM in EFI > variables is not. So lets give the variables a more neutral name while > we still can (i.e. no stable tag yet with the new feature). > > While being at it also fix the NNNN format (use %x instead of %d for > consistency with BootNNNN). > > Signed-off-by: Gerd Hoffmann > --- > OvmfPkg/OvmfPkg.dec | 2 +- > OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.inf | 2 +- > OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c | 6 +++--- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/OvmfPkg/OvmfPkg.dec b/OvmfPkg/OvmfPkg.dec > index 6d689ecc5d55..f13dd4a61f01 100644 > --- a/OvmfPkg/OvmfPkg.dec > +++ b/OvmfPkg/OvmfPkg.dec > @@ -146,7 +146,7 @@ [Guids] > gConfidentialComputingSecretGuid = {0xadf956ad, 0xe98c, 0x484c, {0xae, 0x11, 0xb5, 0x1c, 0x7d, 0x33, 0x64, 0x47}} > gConfidentialComputingSevSnpBlobGuid = {0x067b1f5f, 0xcf26, 0x44c5, {0x85, 0x54, 0x93, 0xd7, 0x77, 0x91, 0x2d, 0x42}} > gUefiOvmfPkgPlatformInfoGuid = {0xdec9b486, 0x1f16, 0x47c7, {0x8f, 0x68, 0xdf, 0x1a, 0x41, 0x88, 0x8b, 0xa5}} > - gQemuBootOrderGuid = {0x668f4529, 0x63d0, 0x4bb5, {0xb6, 0x5d, 0x6f, 0xbb, 0x9d, 0x36, 0xa4, 0x4a}} > + gVMMBootOrderGuid = {0x668f4529, 0x63d0, 0x4bb5, {0xb6, 0x5d, 0x6f, 0xbb, 0x9d, 0x36, 0xa4, 0x4a}} > > [Ppis] > # PPI whose presence in the PPI database signals that the TPM base address > diff --git a/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.inf b/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.inf > index 211344fb0b89..6e320e3e8514 100644 > --- a/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.inf > +++ b/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.inf > @@ -49,7 +49,7 @@ [LibraryClasses] > [Guids] > gEfiGlobalVariableGuid > gVirtioMmioTransportGuid > - gQemuBootOrderGuid > + gVMMBootOrderGuid > > [FeaturePcd] > gUefiOvmfPkgTokenSpaceGuid.PcdQemuBootOrderPciTranslation > diff --git a/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c b/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c > index 18646daa67e3..cea4b7a099e3 100644 > --- a/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c > +++ b/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c > @@ -1709,7 +1709,7 @@ ConnectDevicesFromQemu ( > Attempt to retrieve the "bootorder" fw_cfg file from QEMU. Translate > the OpenFirmware device paths therein to UEFI device path fragments. > > - On Success store the device path in QemuBootOrderNNNN variables. > + On Success store the device path in VMMBootOrderNNNN variables. > **/ > VOID > EFIAPI > @@ -1794,13 +1794,13 @@ StoreQemuBootOrder ( > UnicodeSPrint ( > VariableName, > sizeof (VariableName), > - L"QemuBootOrder%04d", > + L"VMMBootOrder%04x", > VariableIndex++ > ); > DEBUG ((DEBUG_INFO, "%a: %s = %s\n", __FUNCTION__, VariableName, Translated)); > gRT->SetVariable ( > VariableName, > - &gQemuBootOrderGuid, > + &gVMMBootOrderGuid, > EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS, > GetDevicePathSize (DevicePath), > DevicePath > -- > 2.37.3 >