1. Patchew
  2. EDK2
  3. View series

[edk2-devel] [PATCH] OvmfPkg/OvmfXen: fix build by providing QemuLoadImageLib resolution

Ard Biesheuvel posted 1 patch 4 years, 1 month ago
Failed in applying to current master (apply log)
OvmfPkg/OvmfXen.dsc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[edk2-devel] [PATCH] OvmfPkg/OvmfXen: fix build by providing QemuLoadImageLib resolution
Posted by Ard Biesheuvel 4 years, 1 month ago 
Commit 859b55443a4253ba ("OvmfPkg/PlatformBootManagerLib: switch to
QemuLoadImageLib") replaced a dependency on LoadLinuxLib with one on
QemuLoadImageLib in the PlatformBootManagerLib implementation that is
shared between all OVMF builds, without taking into account that even
the Xen targeted builds incorporate this code, which is only used to
load kernels passed via the QEMU command line.

Since this is dead code on Xen, we can satisfy the dependency using
the generic version of QemuLoadImageLib, which does not rely on
LoadLinuxLib, which we can therefore drop from OvmfXen.dsc.

Fixes: 859b55443a4253bad8bb618d04a51b2ded67f24b
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 OvmfPkg/OvmfXen.dsc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OvmfPkg/OvmfXen.dsc b/OvmfPkg/OvmfXen.dsc
index d476694b18d5..85fe39f7896c 100644
--- a/OvmfPkg/OvmfXen.dsc
+++ b/OvmfPkg/OvmfXen.dsc
@@ -151,7 +151,7 @@ [LibraryClasses]
   UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
   SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.inf
   QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxeLib.inf
-  LoadLinuxLib|OvmfPkg/Library/LoadLinuxLib/LoadLinuxLib.inf
+  QemuLoadImageLib|OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLib.inf
   MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/BaseMemEncryptSevLib.inf
   LockBoxLib|OvmfPkg/Library/LockBoxLib/LockBoxBaseLib.inf
   CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf
-- 
2.17.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#55553): https://edk2.groups.io/g/devel/message/55553
Mute This Topic: https://groups.io/mt/71759233/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] OvmfPkg/OvmfXen: fix build by providing QemuLoadImageLib resolution
Posted by Laszlo Ersek 4 years, 1 month ago 
On 03/05/20 22:26, Ard Biesheuvel wrote:
> Commit 859b55443a4253ba ("OvmfPkg/PlatformBootManagerLib: switch to
> QemuLoadImageLib") replaced a dependency on LoadLinuxLib with one on
> QemuLoadImageLib in the PlatformBootManagerLib implementation that is
> shared between all OVMF builds, without taking into account that even
> the Xen targeted builds incorporate this code, which is only used to
> load kernels passed via the QEMU command line.
> 
> Since this is dead code on Xen, we can satisfy the dependency using
> the generic version of QemuLoadImageLib, which does not rely on
> LoadLinuxLib, which we can therefore drop from OvmfXen.dsc.
> 
> Fixes: 859b55443a4253bad8bb618d04a51b2ded67f24b
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> ---
>  OvmfPkg/OvmfXen.dsc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/OvmfPkg/OvmfXen.dsc b/OvmfPkg/OvmfXen.dsc
> index d476694b18d5..85fe39f7896c 100644
> --- a/OvmfPkg/OvmfXen.dsc
> +++ b/OvmfPkg/OvmfXen.dsc
> @@ -151,7 +151,7 @@ [LibraryClasses]
>    UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
>    SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.inf
>    QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxeLib.inf
> -  LoadLinuxLib|OvmfPkg/Library/LoadLinuxLib/LoadLinuxLib.inf
> +  QemuLoadImageLib|OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLib.inf
>    MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/BaseMemEncryptSevLib.inf
>    LockBoxLib|OvmfPkg/Library/LockBoxLib/LockBoxBaseLib.inf
>    CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf
> 

Reviewed-by: Laszlo Ersek <lersek@redhat.com>

Thanks for the quick fix!
Laszlo


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#55561): https://edk2.groups.io/g/devel/message/55561
Mute This Topic: https://groups.io/mt/71759233/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] OvmfPkg/OvmfXen: fix build by providing QemuLoadImageLib resolution
Posted by Ard Biesheuvel 4 years, 1 month ago 
On Fri, 6 Mar 2020 at 00:45, Laszlo Ersek <lersek@redhat.com> wrote:
>
> On 03/05/20 22:26, Ard Biesheuvel wrote:
> > Commit 859b55443a4253ba ("OvmfPkg/PlatformBootManagerLib: switch to
> > QemuLoadImageLib") replaced a dependency on LoadLinuxLib with one on
> > QemuLoadImageLib in the PlatformBootManagerLib implementation that is
> > shared between all OVMF builds, without taking into account that even
> > the Xen targeted builds incorporate this code, which is only used to
> > load kernels passed via the QEMU command line.
> >
> > Since this is dead code on Xen, we can satisfy the dependency using
> > the generic version of QemuLoadImageLib, which does not rely on
> > LoadLinuxLib, which we can therefore drop from OvmfXen.dsc.
> >
> > Fixes: 859b55443a4253bad8bb618d04a51b2ded67f24b
> > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > ---
> >  OvmfPkg/OvmfXen.dsc | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/OvmfPkg/OvmfXen.dsc b/OvmfPkg/OvmfXen.dsc
> > index d476694b18d5..85fe39f7896c 100644
> > --- a/OvmfPkg/OvmfXen.dsc
> > +++ b/OvmfPkg/OvmfXen.dsc
> > @@ -151,7 +151,7 @@ [LibraryClasses]
> >    UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
> >    SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.inf
> >    QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxeLib.inf
> > -  LoadLinuxLib|OvmfPkg/Library/LoadLinuxLib/LoadLinuxLib.inf
> > +  QemuLoadImageLib|OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLib.inf
> >    MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/BaseMemEncryptSevLib.inf
> >    LockBoxLib|OvmfPkg/Library/LockBoxLib/LockBoxBaseLib.inf
> >    CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf
> >
>
> Reviewed-by: Laszlo Ersek <lersek@redhat.com>
>


Pushed as  1f3b1eb30822..80681884319d

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#55587): https://edk2.groups.io/g/devel/message/55587
Mute This Topic: https://groups.io/mt/71759233/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.