grub_machine_fini definition inconsistencies

grub_machine_fini definition inconsistencies

[Glenn Washburn]

I'm now getting compilation errors for platform efi.

/home/crass/development/bootloader/grub2-src/grub.git/grub-core/lib/efi/halt.c:
In function
‘grub_halt’: /home/crass/development/bootloader/grub2-src/grub.git/grub-core/lib/efi/halt.c:30:3:
error: too few arguments to function ‘grub_machine_fini’ In file
included
from /home/crass/development/bootloader/grub2-src/grub.git/grub-core/lib/efi/halt.c:24:0: /home/crass/development/bootloader/grub2-src/grub.git/include/grub/kernel.h:117:6:
note: declared here

grub_machine_fini is defined to take one int argument in
include/grub/kernel.h, however grub-core/lib/efi/halt.c is calling
grub_machine_fini with no arguments.  Grep has shown several such
invocations.

Re: grub_machine_fini definition inconsistencies

[Vladimir 'φ-coder/phcoder' Serbinenko]

[-- Attachment #1: Type: text/plain, Size: 989 bytes --]

On 10.11.2013 07:56, Glenn Washburn wrote:
> I'm now getting compilation errors for platform efi.
> 
> /home/crass/development/bootloader/grub2-src/grub.git/grub-core/lib/efi/halt.c:
> In function
> ‘grub_halt’: /home/crass/development/bootloader/grub2-src/grub.git/grub-core/lib/efi/halt.c:30:3:
> error: too few arguments to function ‘grub_machine_fini’ In file
> included
> from /home/crass/development/bootloader/grub2-src/grub.git/grub-core/lib/efi/halt.c:24:0: /home/crass/development/bootloader/grub2-src/grub.git/include/grub/kernel.h:117:6:
> note: declared here
> 
> grub_machine_fini is defined to take one int argument in
> include/grub/kernel.h, however grub-core/lib/efi/halt.c is calling
> grub_machine_fini with no arguments.  Grep has shown several such
> invocations.
> 
Fixed, thanks
> _______________________________________________
> Grub-devel mailing list
> Grub-devel@gnu.org
> https://lists.gnu.org/mailman/listinfo/grub-devel
> 



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 291 bytes --]

Re: grub_machine_fini definition inconsistencies

[Glenn Washburn]

[-- Attachment #1: Type: text/plain, Size: 1602 bytes --]

On Sun, 10 Nov 2013 13:33:48 +0100
Vladimir 'φ-coder/phcoder' Serbinenko <phcoder@gmail.com> wrote:

> On 10.11.2013 07:56, Glenn Washburn wrote:
> > I'm now getting compilation errors for platform efi.
> > 
> > /home/crass/development/bootloader/grub2-src/grub.git/grub-core/lib/efi/halt.c:
> > In function
> > ‘grub_halt’: /home/crass/development/bootloader/grub2-src/grub.git/grub-core/lib/efi/halt.c:30:3:
> > error: too few arguments to function ‘grub_machine_fini’ In file
> > included
> > from /home/crass/development/bootloader/grub2-src/grub.git/grub-core/lib/efi/halt.c:24:0: /home/crass/development/bootloader/grub2-src/grub.git/include/grub/kernel.h:117:6:
> > note: declared here
> > 
> > grub_machine_fini is defined to take one int argument in
> > include/grub/kernel.h, however grub-core/lib/efi/halt.c is calling
> > grub_machine_fini with no arguments.  Grep has shown several such
> > invocations.
> > 
> Fixed, thanks

It looks like halt.c needs an #include <grub/loader.h> to get
GRUB_LOADER_FLAG_NORETURN.  I suspect this might be needed for other
files changed with the previous fix.

/home/crass/development/bootloader/grub2-src/grub.git/grub-core/lib/efi/halt.c: 
In function ‘grub_halt’:
/home/crass/development/bootloader/grub2-src/grub.git/grub-core/lib/efi/halt.c:3
0:22: error: ‘GRUB_LOADER_FLAG_NORETURN’ undeclared (first use in this
function) /home/crass/development/bootloader/grub2-src/grub.git/grub-core/lib/efi/halt.c:3
0:22: note: each undeclared identifier is reported only once for each
function i t appears in


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 490 bytes --]