From 65ce0931d0a8ef08395b2174f2e16914b2528b7e Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 13 May 2010 14:42:22 +0200
Subject: [PATCH] Fix inconsistent grub_efiemu_finish_boot_services return type

---
 efiemu/mm.c                  | 19 +++++++++++++++++++
 include/grub/efiemu/efiemu.h | 10 +++++++++-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/efiemu/mm.c b/efiemu/mm.c
index 4b293606f..de7d309be 100644
--- a/efiemu/mm.c
+++ b/efiemu/mm.c
@@ -323,6 +323,25 @@ grub_efiemu_get_memory_map (grub_efi_uintn_t *memory_map_size,
   return 1;
 }
 
+grub_err_t
+grub_efiemu_finish_boot_services (grub_efi_uintn_t *memory_map_size,
+				  grub_efi_memory_descriptor_t *memory_map,
+				  grub_efi_uintn_t *map_key,
+				  grub_efi_uintn_t *descriptor_size,
+				  grub_efi_uint32_t *descriptor_version)
+{
+  int val = grub_efiemu_get_memory_map (memory_map_size,
+					memory_map, map_key,
+					descriptor_size,
+					descriptor_version);
+  if (val == 1)
+    return GRUB_ERR_NONE;
+  if (val == -1)
+    return grub_errno;
+  return grub_error (GRUB_ERR_IO, "memory map buffer is too small");
+}
+
+
 /* Free everything */
 grub_err_t
 grub_efiemu_mm_unload (void)
diff --git a/include/grub/efiemu/efiemu.h b/include/grub/efiemu/efiemu.h
index fb1b69751..56d4ea8ee 100644
--- a/include/grub/efiemu/efiemu.h
+++ b/include/grub/efiemu/efiemu.h
@@ -217,7 +217,15 @@ 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_finish_boot_services (grub_efi_uintn_t *memory_map_size,
+				  grub_efi_memory_descriptor_t *memory_map,
+				  grub_efi_uintn_t *map_key,
+				  grub_efi_uintn_t *descriptor_size,
+				  grub_efi_uint32_t *descriptor_version);
+
 grub_err_t
 grub_efiemu_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t,
 							grub_uint64_t,