* [PATCH] OvmfPkg/OvmfXen: fix build by providing QemuLoadImageLib resolution
@ 2020-03-05 21:26 Ard Biesheuvel
2020-03-05 23:45 ` Laszlo Ersek
0 siblings, 1 reply; 3+ messages in thread
From: Ard Biesheuvel @ 2020-03-05 21:26 UTC (permalink / raw)
To: devel; +Cc: lersek, Ard Biesheuvel
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] OvmfPkg/OvmfXen: fix build by providing QemuLoadImageLib resolution
2020-03-05 21:26 [PATCH] OvmfPkg/OvmfXen: fix build by providing QemuLoadImageLib resolution Ard Biesheuvel
@ 2020-03-05 23:45 ` Laszlo Ersek
2020-03-06 7:23 ` Ard Biesheuvel
0 siblings, 1 reply; 3+ messages in thread
From: Laszlo Ersek @ 2020-03-05 23:45 UTC (permalink / raw)
To: Ard Biesheuvel, devel
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] OvmfPkg/OvmfXen: fix build by providing QemuLoadImageLib resolution
2020-03-05 23:45 ` Laszlo Ersek
@ 2020-03-06 7:23 ` Ard Biesheuvel
0 siblings, 0 replies; 3+ messages in thread
From: Ard Biesheuvel @ 2020-03-06 7:23 UTC (permalink / raw)
To: Laszlo Ersek; +Cc: edk2-devel-groups-io
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-03-06 7:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-05 21:26 [PATCH] OvmfPkg/OvmfXen: fix build by providing QemuLoadImageLib resolution Ard Biesheuvel
2020-03-05 23:45 ` Laszlo Ersek
2020-03-06 7:23 ` Ard Biesheuvel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox