From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by mx.groups.io with SMTP id smtpd.web12.2334.1583443617080046888 for ; Thu, 05 Mar 2020 13:26:57 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=vWe961m1; spf=pass (domain: linaro.org, ip: 209.85.128.67, mailfrom: ard.biesheuvel@linaro.org) Received: by mail-wm1-f67.google.com with SMTP id u9so145214wml.3 for ; Thu, 05 Mar 2020 13:26:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=zflXcF6BkTolzEO1V29wx2LppPPmNDObkUcmNhxAxv0=; b=vWe961m1byMw1+NP2AOTa1WFDArLlgRlmt8MDiJtJqXWH86R5pDbOV7sQklGZ2ZOmC o/V5jQv9tK6Bxr0X0ci0u8nTbrPIWMWDDnxqlzT0JtYXYRowYceuon/NPDUSN/LTJfOS IY8g7KKkW7mYB6XazhgapUZ5ZWUZ6YGpZPl2YD9/Vgdc6Mh7pbiLfo2V2O+LORrOoIMe M2K0vN6KI/MbRD8iHRnp9DHtmsHLVyUcf0Kw3isTF6Hu2rtzRyKWE1zaxsDKs2Z1XsoR u3/M+DDqoSeKTXnRUqYy+LnAkw4RRa/VLspgPzPBKRE6SL7VxH6Kvv79Hp1NVAqaSaz4 5DKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=zflXcF6BkTolzEO1V29wx2LppPPmNDObkUcmNhxAxv0=; b=UcJuCbXQjnmJXs+NkvhxtebUErVKtVkTK5kbs/+IIihpMf5wel/lldp0uRHSquHxkF z5JzDjPgxVy8DDL3Eb8lxf2sZDdoY7UtSNn7Y1zrQOKd0l2aMRvB9ECOVZ2CwG7U8rOV q/FkjsRta2yxh5sWkQ+YQYPOYukTIvTu+aUlc6fq3HBflK7rGRQ14Yurhqol33UeF8It Yr+j5j9AKVkvzYMHe/EYUnIFDng0pSlCZBBxLsdBp8D6wgBQgoQsyPT4Hsv9bSpxo++4 mcdLPs6LU8ILzLF4GSe0Ng6dlBTcyU2K9YGvU423G5P9/f8W1nXCQdXd2cERaiy71EnS C7Gg== X-Gm-Message-State: ANhLgQ33ceER8Dq6mOZAsBU2WczRyKyODbn1TILiwpQ6Y2tcgk41BO6J UInD/3aEUTWBg7Zw0QSaDeKvhO5UHbl/6A== X-Google-Smtp-Source: ADFU+vuZj9eEQYNOGlLM9PeWDHRpOvhDeFbBD4qbdB3EIRxMQT10gaCZSJ7tjowDUAFuVEOedhM29g== X-Received: by 2002:a7b:cb93:: with SMTP id m19mr750070wmi.133.1583443615458; Thu, 05 Mar 2020 13:26:55 -0800 (PST) Return-Path: Received: from e123331-lin.home ([2a01:cb1d:112:6f00:816e:ff0d:fb69:f613]) by smtp.gmail.com with ESMTPSA id g129sm12538606wmg.12.2020.03.05.13.26.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Mar 2020 13:26:54 -0800 (PST) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: lersek@redhat.com, Ard Biesheuvel Subject: [PATCH] OvmfPkg/OvmfXen: fix build by providing QemuLoadImageLib resolution Date: Thu, 5 Mar 2020 22:26:52 +0100 Message-Id: <20200305212652.27649-1-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 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 -- 2.17.1