From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by mx.groups.io with SMTP id smtpd.web11.9146.1583479395418510372 for ; Thu, 05 Mar 2020 23:23:15 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=wZoTpLti; spf=pass (domain: linaro.org, ip: 209.85.221.68, mailfrom: ard.biesheuvel@linaro.org) Received: by mail-wr1-f68.google.com with SMTP id t11so1071342wrw.5 for ; Thu, 05 Mar 2020 23:23:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=+7GHA0gM2/yqcQh6nNOgs8HP7XFuxTM8nf+HypW+3B4=; b=wZoTpLtik/GBA6dbxwfA8/3PpWQdUtVRer+ivCcmuB+fn+vohOvzjrWMnwnYIzJgCr nIXk6Tkp3aqA1L7a+Kc37CP1TqOBBJPQHFTDuR676WdWdOD4Ft7jhLTvwbB+FdgVaDJH 10JsPq28AStFz735bZh+xmiiMlBZKYNlC2Th/j1L1mlk0yRaNSXuegH7nrqY3iuoVdlT Q0EYu4x1O+yryFQzVlv+5zsWXUWpGPgyAncIhpo7loaFn7JbRbdma2CMTGiP9QMTpIsO 3gJYsrYIvnmHUBQ9NxrC0RIFGXhoYnfBKXTIRwuzfGFUo7jH1yRx5nNG6Hk9I1vK3mxy KO1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=+7GHA0gM2/yqcQh6nNOgs8HP7XFuxTM8nf+HypW+3B4=; b=lDLZlgMuLn6d2PkZUAOMjPmqbgP6Wawc5vAiai7HZu5foPcAXo92QKfnBI9Qf4OkSr bZefwPObBQESxvMCbkqm2K3sPmcy+oLLNbMZOqHkgUwlRUUNNTU7R7nswRqI9uF/hhLQ DTqsJL5bEtJioZmvIwGliXp53Jr1G7+ay76Idy4nFG9ZdbG5K+q7Mwdlp9iKNsFSzJNc 9zwR+ynczfBdq+9CoAqkdCI9aHvJ+ZouS8h5FoZ4yng0qajQUlfvqtgG8YZrLf3ELP4e 0KXGPQ5boJrWG8vUZQF5ksJ9KnsG++Lysr9lSQwh7yXBgSJQpaGNwWBC8FDo6yjOuj6B cRFQ== X-Gm-Message-State: ANhLgQ21BaEXVkHH4BWISmfvvvipQk+i6wInMIxqjqzVfrR6I+5TOWIA peZrlqouR7IZVXd/ayMl2sAx75V7vI19eH0/VFjn/g== X-Google-Smtp-Source: ADFU+vtMdNoBLvi1Qka5Fg1K+/gAfAW3lqrQAE23CaInMgomp8xUQ65/dfxTFt+tUU0mbDEDuzNA+rqdbhH+QyqCNqg= X-Received: by 2002:adf:e742:: with SMTP id c2mr2487430wrn.262.1583479393965; Thu, 05 Mar 2020 23:23:13 -0800 (PST) MIME-Version: 1.0 References: <20200305212652.27649-1-ard.biesheuvel@linaro.org> <6fb9c2b1-893c-f23e-f968-374815196c8a@redhat.com> In-Reply-To: <6fb9c2b1-893c-f23e-f968-374815196c8a@redhat.com> From: "Ard Biesheuvel" Date: Fri, 6 Mar 2020 08:23:03 +0100 Message-ID: Subject: Re: [PATCH] OvmfPkg/OvmfXen: fix build by providing QemuLoadImageLib resolution To: Laszlo Ersek Cc: edk2-devel-groups-io Content-Type: text/plain; charset="UTF-8" On Fri, 6 Mar 2020 at 00:45, Laszlo Ersek 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 > > --- > > 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 > Pushed as 1f3b1eb30822..80681884319d