From mboxrd@z Thu Jan 1 00:00:00 1970 From: Konrad Rzeszutek Wilk Subject: Re: [PATCH v2 11/23] efi: split out efi_init() Date: Mon, 10 Aug 2015 15:25:05 -0400 Message-ID: <20150810192505.GH13576__38781.8340248943$1439234812$gmane$org@l.oracle.com> References: <1437402558-7313-1-git-send-email-daniel.kiper@oracle.com> <1437402558-7313-12-git-send-email-daniel.kiper@oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZOshQ-0005RJ-BY for xen-devel@lists.xenproject.org; Mon, 10 Aug 2015 19:25:32 +0000 Content-Disposition: inline In-Reply-To: <1437402558-7313-12-git-send-email-daniel.kiper@oracle.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Daniel Kiper Cc: jgross@suse.com, grub-devel@gnu.org, keir@xen.org, ian.campbell@citrix.com, stefano.stabellini@eu.citrix.com, andrew.cooper3@citrix.com, gang.wei@intel.com, roy.franz@linaro.org, ning.sun@intel.com, david.vrabel@citrix.com, jbeulich@suse.com, phcoder@gmail.com, xen-devel@lists.xenproject.org, wei.liu2@citrix.com, richard.l.maliszewski@intel.com, qiaowei.ren@intel.com, fu.wei@linaro.org List-Id: xen-devel@lists.xenproject.org On Mon, Jul 20, 2015 at 04:29:06PM +0200, Daniel Kiper wrote: > ..which initializes basic EFI variables. We want to re-use this > code to support multiboot2 protocol on EFI platforms. > > Signed-off-by: Daniel Kiper Reviewed-by: Konrad Rzeszutek Wilk > --- > v2 - suggestions/fixes: > - improve commit message > (suggested by Jan Beulich). > --- > xen/common/efi/boot.c | 28 +++++++++++++++++----------- > 1 file changed, 17 insertions(+), 11 deletions(-) > > diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c > index 1f188fe..6f327cd 100644 > --- a/xen/common/efi/boot.c > +++ b/xen/common/efi/boot.c > @@ -595,6 +595,22 @@ static char *__init get_value(const struct file *cfg, const char *section, > return NULL; > } > > +static void __init efi_init(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) > +{ > + efi_ih = ImageHandle; > + efi_bs = SystemTable->BootServices; > + efi_bs_revision = efi_bs->Hdr.Revision; > + efi_rs = SystemTable->RuntimeServices; > + efi_ct = SystemTable->ConfigurationTable; > + efi_num_ct = SystemTable->NumberOfTableEntries; > + efi_version = SystemTable->Hdr.Revision; > + efi_fw_vendor = SystemTable->FirmwareVendor; > + efi_fw_revision = SystemTable->FirmwareRevision; > + > + StdOut = SystemTable->ConOut; > + StdErr = SystemTable->StdErr ?: StdOut; > +} > + > static void __init setup_efi_pci(void) > { > EFI_STATUS status; > @@ -721,18 +737,8 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) > set_bit(EFI_PLATFORM, &efi.flags); > #endif > > - efi_ih = ImageHandle; > - efi_bs = SystemTable->BootServices; > - efi_bs_revision = efi_bs->Hdr.Revision; > - efi_rs = SystemTable->RuntimeServices; > - efi_ct = SystemTable->ConfigurationTable; > - efi_num_ct = SystemTable->NumberOfTableEntries; > - efi_version = SystemTable->Hdr.Revision; > - efi_fw_vendor = SystemTable->FirmwareVendor; > - efi_fw_revision = SystemTable->FirmwareRevision; > + efi_init(ImageHandle, SystemTable); > > - StdOut = SystemTable->ConOut; > - StdErr = SystemTable->StdErr ?: StdOut; > use_cfg_file = efi_arch_use_config_file(SystemTable); > > status = efi_bs->HandleProtocol(ImageHandle, &loaded_image_guid, > -- > 1.7.10.4 > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel