Fix compilation on i386-pc

diff --git a/efiemu/main.c b/efiemu/main.c
index 8a8a508fac72a63e2847bc16fc1d952100b8a7c2..7ebbae9460977d54cbd90fe52d7a2b1e67b75100 100644 (file)
--- a/efiemu/main.c
+++ b/efiemu/main.c
@@ -182,22 +182,6 @@ grub_cmd_efiemu_prepare (grub_command_t cmd __attribute__ ((unused)),
 
 \f
 
-
-int
-grub_efiemu_exit_boot_services (grub_efi_uintn_t map_key
-                               __attribute__ ((unused)))
-{
-  /* Nothing to do here yet */
-  return 1;
-}
-
-int
-grub_efiemu_finish_boot_services (void)
-{
-  /* Nothing to do here yet */
-  return 1;
-}
-
 /* Load the runtime from the file FILENAME.  */
 static grub_err_t
 grub_efiemu_load_file (const char *filename)

diff --git a/include/grub/autoefi.h b/include/grub/autoefi.h
index 5ae4b3a21a06367d5bc609d9121d8a56db3085fd..740be3249907b3a348f4416432d7221b22d69c48 100644 (file)
--- a/include/grub/autoefi.h
+++ b/include/grub/autoefi.h
@@ -50,6 +50,7 @@ static inline grub_err_t grub_autoefi_prepare (void)
 # define SYSTEM_TABLE_PTR(x) ((void *)(grub_efi_system_table->x))
 # define SIZEOF_OF_UINTN sizeof (grub_efi_uintn_t)
 # define SYSTEM_TABLE(x) (grub_efi_system_table->x)
+# define grub_autoefi_finish_boot_services grub_efi_finish_boot_services
 # define EFI_PRESENT 1
 #else
 # include <grub/efiemu/efiemu.h>
@@ -72,6 +73,7 @@ static inline grub_err_t grub_autoefi_prepare (void)
 # define SYSTEM_TABLE GRUB_EFIEMU_SYSTEM_TABLE
 # define grub_efi_allocate_pages(x,y) (x)
 # define grub_efi_free_pages(x,y) GRUB_EFI_SUCCESS
+# define grub_autoefi_finish_boot_services grub_efiemu_finish_boot_services
 # define EFI_PRESENT 1
 #endif
 

diff --git a/include/grub/efiemu/efiemu.h b/include/grub/efiemu/efiemu.h
index 3980d32cdda526e0893a1d4112dccdc470e3be79..1cddbca7c0c11e86c7012821c694eb6db1ee23a4 100644 (file)
--- a/include/grub/efiemu/efiemu.h
+++ b/include/grub/efiemu/efiemu.h
@@ -217,13 +217,12 @@ int grub_efiemu_get_memory_map (grub_efi_uintn_t *memory_map_size,
                                grub_efi_uintn_t *map_key,
                                grub_efi_uintn_t *descriptor_size,
                                grub_efi_uint32_t *descriptor_version);
+#define grub_efiemu_finish_boot_services grub_efiemu_get_memory_map
 grub_err_t
 grub_efiemu_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t,
                                                        grub_uint64_t,
                                                        grub_uint32_t));
 int grub_efiemu_sizeof_uintn_t (void);
-int grub_efiemu_exit_boot_services (grub_efi_uintn_t map_key);
-int grub_efiemu_finish_boot_services (void);
 grub_err_t
 grub_efiemu_get_lower_upper_memory (grub_uint64_t *lower, grub_uint64_t *upper);
 #define GRUB_EFIEMU_MEMORY_AVAILABLE   1

diff --git a/loader/i386/xnu.c b/loader/i386/xnu.c
index dcec3554ffa8e94b986053a93f39ff0a1d9b419e..2aec590fb8deefd6be6027fdd0041d242311880e 100644 (file)
--- a/loader/i386/xnu.c
+++ b/loader/i386/xnu.c
@@ -1038,9 +1038,9 @@ grub_xnu_boot (void)
   bootparams->devtree = devtree_target;
   bootparams->devtreelen = devtreelen;
 
-  err = grub_efi_finish_boot_services (&memory_map_size, memory_map,
-                                      &map_key, &descriptor_size,
-                                      &descriptor_version);
+  err = grub_autoefi_finish_boot_services (&memory_map_size, memory_map,
+                                          &map_key, &descriptor_size,
+                                          &descriptor_version);
   if (err)
     return err;