From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1gP6Cn-0005Uo-E4 for mharc-grub-devel@gnu.org; Tue, 20 Nov 2018 08:36:41 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55307) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gP45U-0008Og-PO for grub-devel@gnu.org; Tue, 20 Nov 2018 06:21:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gP45P-0001e7-Sm for grub-devel@gnu.org; Tue, 20 Nov 2018 06:21:00 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:36301) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gP45P-0001am-Bv for grub-devel@gnu.org; Tue, 20 Nov 2018 06:20:55 -0500 Received: by mail-wr1-x443.google.com with SMTP id t3so1554121wrr.3 for ; Tue, 20 Nov 2018 03:20:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:content-transfer-encoding:in-reply-to :user-agent; bh=uXpeVW3ntGN06LLM+jwwXjAhEeN+XBYLlncpyZZI1Dk=; b=hFxZe5WmsN0enIg6duZGV7dhOmnp9fseclwAJmNsojm4Qff7z+ocOiUvIJ+y2XDeGJ /EsM6YgeHLR1GderXg4H3sPKJMhQQ4sq3UydWFuEzPixNPgTFjBrhmETjCxNiAoUnaST R+1maZPswGeRBcDzqo4Pi/rOodZsYFlpN9eVs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to:user-agent; bh=uXpeVW3ntGN06LLM+jwwXjAhEeN+XBYLlncpyZZI1Dk=; b=qEFNRXndZ3hiCa4G2G2lhIahMWzLcyb2jAGeswQhsyYv7hOObh0quodD2WVvCzIrJz DB7NRMy5zvN0l0vCnEAiWFLvmJXooLgNvNNxVhffepNrrN6/foZrXwwC9wE9ATTIsGDi bHFY/12l0QKrw8iRvrN8wseLdSoZJK9g+EHr5BxyRuwG2dWan4y6rtkccPn4vTU+YTo2 Jd1Xn9tcF6B4dg1FLrVVGln/0zSui6XmnOdvBo/H9tTT6w/6CZiT+jCrnL8AFzXNKpdj krSeArmHf/Atsqr/sNlQZ8U/ildiLZO/ecV4PvDHQocgUokEuRowxe8ufcVqaMP7GIks +n0w== X-Gm-Message-State: AA+aEWY5tD+6XhgSp2kgZFN+123uuLuCaRKjzQNY7G4rkr534n2AL/Mf BE5Q6THEO/VytOZRENQCSvDOzOTCROw= X-Google-Smtp-Source: AFSGD/VU3rE8d/2eZ1iuhm6Le0nk/fa2i8AHEtKWcOZfZfoFZp6Csf1fRsRxPWYzJxbNtMZvFvlTeA== X-Received: by 2002:adf:da41:: with SMTP id r1-v6mr110536wrl.129.1542712854060; Tue, 20 Nov 2018 03:20:54 -0800 (PST) Received: from dell ([2.31.167.205]) by smtp.gmail.com with ESMTPSA id l143-v6sm26614977wmb.23.2018.11.20.03.20.53 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Nov 2018 03:20:53 -0800 (PST) Date: Tue, 20 Nov 2018 11:20:51 +0000 From: Lee Jones To: Julien Grall Cc: Daniel Kiper , Fu Wei Fu , Leif Lindholm , The development of GNU GRUB Subject: Re: arm64/xen: Fix too few =?utf-8?Q?argum?= =?utf-8?B?ZW50cyB0byBmdW5jdGlvbiDigJhncnViX2ZpbGVfb3BlbuKAmQ==?= Message-ID: <20181120112051.GP3513@dell> References: <20181114192919.24655-1-leif.lindholm@linaro.org> <20181116140737.wuox7v63y6lt2ymt@tomti.i.net-space.pl> <20181120104840.GO3513@dell> <2e0da53b-1730-b83a-2748-38d0c03a7ea5@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <2e0da53b-1730-b83a-2748-38d0c03a7ea5@arm.com> User-Agent: Mutt/1.9.4 (2018-02-28) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 X-Mailman-Approved-At: Tue, 20 Nov 2018 08:36:40 -0500 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Nov 2018 11:21:01 -0000 On Tue, 20 Nov 2018, Julien Grall wrote: > Hi Lee, > > On 20/11/2018 10:48, Lee Jones wrote: > > From: Lee Jones > > > > arm64/xen: Fix too few arguments to function ‘grub_file_open’ > > Without this fix xen_boot.c omits: > > loader/arm64/xen_boot.c: In function ‘grub_cmd_xen_module’: > > loader/arm64/xen_boot.c:424:10: error: too few arguments to function ‘grub_file_open’ > > file = grub_file_open (argv[0]); > > ^~~~~~~~~~~~~~ > > In file included from ../include/grub/cache.h:23:0, > > from loader/arm64/xen_boot.c:19: > > ../include/grub/file.h:204:25: note: declared here > > grub_file_t EXPORT_FUNC(grub_file_open) (const char *name, enum grub_file_type type); > > ^ > > ../include/grub/symbol.h:68:25: note: in definition of macro ‘EXPORT_FUNC’ > > # define EXPORT_FUNC(x) x > > ^ > > loader/arm64/xen_boot.c: In function ‘grub_cmd_xen_hypervisor’: > > loader/arm64/xen_boot.c:456:10: error: too few arguments to function ‘grub_file_open’ > > file = grub_file_open (argv[0]); > > ^~~~~~~~~~~~~~ > > > > Signed-off-by: Lee Jones > > > > diff --git a/grub-core/loader/arm64/xen_boot.c b/grub-core/loader/arm64/xen_boot.c > > index 5820412e8..1f49e3278 100644 > > --- a/grub-core/loader/arm64/xen_boot.c > > +++ b/grub-core/loader/arm64/xen_boot.c > > @@ -421,7 +421,7 @@ grub_cmd_xen_module (grub_command_t cmd __attribute__((unused)), > > grub_dprintf ("xen_loader", "Init module and node info\n"); > > - file = grub_file_open (argv[0]); > > + file = grub_file_open (argv[0], GRUB_FILE_TYPE_NONE); > > if (!file) > > goto fail; > > @@ -453,7 +453,7 @@ grub_cmd_xen_hypervisor (grub_command_t cmd __attribute__ ((unused)), > > goto fail; > > } > > - file = grub_file_open (argv[0]); > > + file = grub_file_open (argv[0], GRUB_FILE_TYPE_NONE); > > I would prefer if we try to keep the type similar to x86 Xen. In that case > it would be GRUB_FILE_TYPE_LINUX_KERNEL. Thanks Julien. Will fix. -- Lee Jones [李琼斯] Linaro Services Technical Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog