vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Efiemu stylistic fixes and gettext.

Browse source 
* grub-core/efiemu/i386/loadcore32.c
	(grub_arch_efiemu_relocate_symbols32): Avoid set in if.
	* grub-core/efiemu/i386/loadcore64.c
	(grub_arch_efiemu_relocate_symbols64): Likewise.
	* grub-core/efiemu/i386/pc/cfgtables.c
	(grub_machine_efiemu_init_tables): Likewise.
	* grub-core/efiemu/loadcore.c (grub_efiemu_resolve_symbols): Likewise.
	(grub_efiemu_loadcore_initXX): Add a filename argument.
	All users updated.
	Improved error message.
	* grub-core/efiemu/loadcore_common.c (grub_efiemu_loadcore_init):
	Add a filename argument.
	All users updated.
	* grub-core/efiemu/symbols.c (grub_efiemu_set_virtual_address_map):
	Reclassify double relocation as GRUB_ERR_BUG.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-12 18:43:39 +01:00
parent 306fc0741f
commit 0331e102c9
9 changed files with 102 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

9
grub-core/efiemu/loadcore_common.c
View file

@ -111,7 +111,8 @@ grub_efiemu_loadcore_unload(void)
/* Load runtime file and do some initial preparations */
grub_err_t
grub_efiemu_loadcore_init (grub_file_t file)
grub_efiemu_loadcore_init (grub_file_t file,
const char *filename)
{
grub_err_t err;
@ -140,7 +141,8 @@ grub_efiemu_loadcore_init (grub_file_t file)
switch (grub_efiemu_mode)
{
case GRUB_EFIEMU32:
err = grub_efiemu_loadcore_init32 (efiemu_core, efiemu_core_size,
err = grub_efiemu_loadcore_init32 (efiemu_core, filename,
efiemu_core_size,
&efiemu_segments);
if (err)
{
@ -152,7 +154,8 @@ grub_efiemu_loadcore_init (grub_file_t file)
break;
case GRUB_EFIEMU64:
err = grub_efiemu_loadcore_init64 (efiemu_core, efiemu_core_size,
err = grub_efiemu_loadcore_init64 (efiemu_core, filename,
efiemu_core_size,
&efiemu_segments);
if (err)
{