On 06/17/21 14:16, Dov Murik wrote: > This reverts commit efc52d67e1573ce174d301b52fa1577d552c8441. > > Manually fixed conflicts in: > OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c > > Note that besides re-exposing the kernel command line as a file in the > synthetic filesystem, we also revert back to AllocatePool instead of > AllocatePages. > > Cc: Laszlo Ersek <ler...@redhat.com> > Cc: Ard Biesheuvel <ardb+tianoc...@kernel.org> > Cc: Jordan Justen <jordan.l.jus...@intel.com> > Cc: James Bottomley <j...@linux.ibm.com> > Cc: Tobin Feldman-Fitzthum <to...@linux.ibm.com> > Signed-off-by: Dov Murik <dovmu...@linux.ibm.com> > --- > OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-)
(1) The bugzilla ticket should be referenced in the commit message, above your signoff: Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3457 With that update: Reviewed-by: Laszlo Ersek <ler...@redhat.com> Thanks, Laszlo > > diff --git a/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c > b/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c > index b09ff6a3590d..c7ddd86f5c75 100644 > --- a/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c > +++ b/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c > @@ -33,6 +33,7 @@ > typedef enum { > KernelBlobTypeKernel, > KernelBlobTypeInitrd, > + KernelBlobTypeCommandLine, > KernelBlobTypeMax > } KERNEL_BLOB_TYPE; > > @@ -59,6 +60,11 @@ STATIC KERNEL_BLOB mKernelBlob[KernelBlobTypeMax] = { > { > { QemuFwCfgItemInitrdSize, QemuFwCfgItemInitrdData, }, > } > + }, { > + L"cmdline", > + { > + { QemuFwCfgItemCommandLineSize, QemuFwCfgItemCommandLineData, }, > + } > } > }; > > @@ -948,7 +954,7 @@ FetchBlob ( > // > // Read blob. > // > - Blob->Data = AllocatePages (EFI_SIZE_TO_PAGES ((UINTN)Blob->Size)); > + Blob->Data = AllocatePool (Blob->Size); > if (Blob->Data == NULL) { > DEBUG ((DEBUG_ERROR, "%a: failed to allocate %Ld bytes for \"%s\"\n", > __FUNCTION__, (INT64)Blob->Size, Blob->Name)); > @@ -1083,8 +1089,7 @@ FreeBlobs: > while (BlobType > 0) { > CurrentBlob = &mKernelBlob[--BlobType]; > if (CurrentBlob->Data != NULL) { > - FreePages (CurrentBlob->Data, > - EFI_SIZE_TO_PAGES ((UINTN)CurrentBlob->Size)); > + FreePool (CurrentBlob->Data); > CurrentBlob->Size = 0; > CurrentBlob->Data = NULL; > } > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#77064): https://edk2.groups.io/g/devel/message/77064 Mute This Topic: https://groups.io/mt/83602580/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
