From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.61]) by mx.groups.io with SMTP id smtpd.web12.1876.1589357951848088752 for ; Wed, 13 May 2020 01:19:12 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=YHFaRBn+; spf=pass (domain: redhat.com, ip: 205.139.110.61, mailfrom: philmd@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589357951; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Sbb7jPSdjVOhn+sEuSlRoSVLKu3LS4dZcTtqkG+3xrM=; b=YHFaRBn+laM6A0VNHejQJFvVjfRQBdaUE6E+JqxtSZXDISUC3P6LZ+blRhTOM1M/PN4zHa xhsx0ENmGDiAgAoVFhaK+QMtJ0r0uIDNbEVZHnX6CSL82YTojk9mWmWywWlGgOVNdAAUew DQVP2Z3w+aXKWvzaKQG3GCX1s9NbW9s= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-216-fjIrwv-VOEWXSN4QG4P49Q-1; Wed, 13 May 2020 04:19:07 -0400 X-MC-Unique: fjIrwv-VOEWXSN4QG4P49Q-1 Received: by mail-wr1-f69.google.com with SMTP id x8so8278859wrl.16 for ; Wed, 13 May 2020 01:19:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=Sbb7jPSdjVOhn+sEuSlRoSVLKu3LS4dZcTtqkG+3xrM=; b=ZDmQ73iX1v5uUu3cfTkzZh/vetTdlpBIOFMAe7bWq16+HtxYLxypJanlIcCdmGnFli +vyqYYLU9AJh5Sqa7tGMddPzqCPnhw/URAZys/GwWUlVbb1zv4D8SPaEdAxGdbhipdCl 1XUawpbho3NfEx4v0QWFKl8Ww7ISRpv82AnknP01LbDXz9rBchAWXLH7vW6k5eyj+bAJ nA5ZtnhrVXeShNpcoQLVvqC+GSJZldZQiE1nBae3jj/vz4dvusimws9QH3ZNPLIBUfg9 YYfM0XKDEjZfG2smS5IAgENO/jXzPRgd32Av3+j80IVeAV3ks1gtZ/ASTbahfxCVuDMe AzeQ== X-Gm-Message-State: AOAM530vEdbFUGpLlvTfbRfFVacDShRNB6LiS7ER7tkJgDScM6JWTiuF zwiCCBr7DcJ1kfxmYI8XzgWbqscr6Qfsv5oGiJUPYvblgFBS2CcUGmHhNN2NfMmA+X9tUvdHfcQ WMLK3qzbE3QHHqA== X-Received: by 2002:a1c:a793:: with SMTP id q141mr2678011wme.70.1589357946175; Wed, 13 May 2020 01:19:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyOChKeIOT+wOl9+fWRwvPXleIy+atnNziBcc3/jqGj/sn8vDonn0q9WC2KUW+69wZmU90AWA== X-Received: by 2002:a1c:a793:: with SMTP id q141mr2677969wme.70.1589357945576; Wed, 13 May 2020 01:19:05 -0700 (PDT) Return-Path: Received: from [192.168.1.39] (17.red-88-21-202.staticip.rima-tde.net. [88.21.202.17]) by smtp.gmail.com with ESMTPSA id d6sm13732209wra.63.2020.05.13.01.19.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 13 May 2020 01:19:05 -0700 (PDT) Subject: Re: [PATCH] OvmfPkg: Skip initrd command on Xcode toolchain To: Roman Bolshakov , devel@edk2.groups.io Cc: Cameron Esfahani , LAHAYE Olivier , Ard Biesheuvel , Liming Gao , Andrew Fish , Laszlo Ersek References: <20200512205832.17032-1-r.bolshakov@yadro.com> From: =?UTF-8?B?UGhpbGlwcGUgTWF0aGlldS1EYXVkw6k=?= Message-ID: Date: Wed, 13 May 2020 10:19:03 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: <20200512205832.17032-1-r.bolshakov@yadro.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit On 5/12/20 10:58 PM, Roman Bolshakov wrote: > OVMF booting stops with the assert if built with Xcode on macOS: > > Loading driver at 0x0001FAB8000 EntryPoint=0x0001FABF249 LinuxInitrdDynamicShellCommand.efi > InstallProtocolInterface: BC62157E-3E33-4FEC-9920-2D3B36D750DF 1F218398 > ProtectUefiImageCommon - 0x1F218140 > - 0x000000001FAB8000 - 0x0000000000008A60 > > ASSERT_EFI_ERROR (Status = Unsupported) > ASSERT LinuxInitrdDynamicShellCommand.c(378): !EFI_ERROR (Status) > > The assert comes from InitializeHiiPackage() after an attempt to > retrieve HII package list from ImageHandle. > > Xcode still doesn't support HII resource section and > LinuxInitrdDynamicShellCommand depends on it. Likewise 277a3958d93a > ("OvmfPkg: Don't include TftpDynamicCommand in XCODE5 tool chain"), > disable initrd command if built with Xcode toolchain > > Fixes: 2632178bc683 ("OvmfPkg: add 'initrd' shell command to expose Linux initrd via device path") > Cc: Ard Biesheuvel > Cc: Liming Gao > Cc: Andrew Fish > Cc: Laszlo Ersek > Signed-off-by: Roman Bolshakov > --- > OvmfPkg/OvmfPkgIa32.fdf | 2 +- > OvmfPkg/OvmfPkgX64.fdf | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf > index fd81b6fa8b..e2b759aa8d 100644 > --- a/OvmfPkg/OvmfPkgIa32.fdf > +++ b/OvmfPkg/OvmfPkgIa32.fdf > @@ -290,8 +290,8 @@ INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf > > !if $(TOOL_CHAIN_TAG) != "XCODE5" > INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf > -!endif > INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf > +!endif > INF ShellPkg/Application/Shell/Shell.inf > > INF MdeModulePkg/Logo/LogoDxe.inf > diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf > index f71134a659..bfca1eff9e 100644 > --- a/OvmfPkg/OvmfPkgX64.fdf > +++ b/OvmfPkg/OvmfPkgX64.fdf > @@ -291,8 +291,8 @@ INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf > > !if $(TOOL_CHAIN_TAG) != "XCODE5" > INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf > -!endif > INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf It looks reasonable. Acked-by: Philippe Mathieu-Daude > +!endif > INF ShellPkg/Application/Shell/Shell.inf > > INF MdeModulePkg/Logo/LogoDxe.inf >