From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Wed, 11 Dec 2013 15:11:17 +0000 (+0100)
Subject: 	Propagate the EFI commits to x86-efi specific parts.
X-Git-Tag: grub-2.02-beta1~111
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44bbfa33b8376c0c3b87bc2bbed48df5827a518d;p=thirdparty%2Fgrub.git

	Propagate the EFI commits to x86-efi specific parts.
---

diff --git a/ChangeLog b/ChangeLog
index ad5daf02a..ccbc2dc8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-11  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Propagate the EFI commits to x86-efi specific parts.
+
 2013-12-11  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/commands/efi/lssal.c: Fix terminating condition.
diff --git a/grub-core/commands/efi/loadbios.c b/grub-core/commands/efi/loadbios.c
index 214adc3d2..132cadbc7 100644
--- a/grub-core/commands/efi/loadbios.c
+++ b/grub-core/commands/efi/loadbios.c
@@ -105,7 +105,7 @@ fake_bios_data (int use_rom)
   smbios = 0;
   for (i = 0; i < grub_efi_system_table->num_table_entries; i++)
     {
-      grub_efi_guid_t *guid =
+      grub_efi_packed_guid_t *guid =
 	&grub_efi_system_table->configuration_table[i].vendor_guid;
 
       if (! grub_memcmp (guid, &acpi2_guid, sizeof (grub_efi_guid_t)))
diff --git a/grub-core/loader/efi/appleloader.c b/grub-core/loader/efi/appleloader.c
index 56d553885..3777c7f0b 100644
--- a/grub-core/loader/efi/appleloader.c
+++ b/grub-core/loader/efi/appleloader.c
@@ -76,7 +76,7 @@ struct piwg_full_device_path
       .header = {							\
 	.type = GRUB_EFI_HARDWARE_DEVICE_PATH_TYPE,			\
 	.subtype = GRUB_EFI_MEMORY_MAPPED_DEVICE_PATH_SUBTYPE,		\
-	.length = {sizeof (struct grub_efi_memory_mapped_device_path), 0} \
+	.length = sizeof (struct grub_efi_memory_mapped_device_path)	\
       },								\
       .memory_type = GRUB_EFI_MEMORY_MAPPED_IO,				\
       .start_address = st,						\
@@ -87,7 +87,7 @@ struct piwg_full_device_path
 	.header = {							\
 	  .type = GRUB_EFI_MEDIA_DEVICE_PATH_TYPE,			\
 	  .subtype = GRUB_EFI_PIWG_DEVICE_PATH_SUBTYPE,			\
-	  .length = {sizeof (struct grub_efi_piwg_device_path), 0}	\
+	  .length = sizeof (struct grub_efi_piwg_device_path)		\
 	},								\
 	.guid = {0x2B0585EB, 0xD8B8, 0x49A9, {0x8B, 0x8C, 0xE2, 0x1B,	\
 					      0x01, 0xAE, 0xF2, 0xB7}}	\
@@ -96,7 +96,7 @@ struct piwg_full_device_path
 	  {								\
 	    .type = GRUB_EFI_END_DEVICE_PATH_TYPE,			\
 	    .subtype = GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE,		\
-	    .length = {sizeof (struct grub_efi_device_path), 0}		\
+	    .length = sizeof (struct grub_efi_device_path)		\
 	  }								\
   }
 
diff --git a/grub-core/loader/i386/xnu.c b/grub-core/loader/i386/xnu.c
index 1b22bed9e..e83e1e972 100644
--- a/grub-core/loader/i386/xnu.c
+++ b/grub-core/loader/i386/xnu.c
@@ -671,7 +671,7 @@ grub_cpu_xnu_fill_devicetree (grub_uint64_t *fsbfreq_out)
     {
       void *ptr;
       struct grub_xnu_devtree_key *curkey;
-      grub_efi_guid_t guid;
+      grub_efi_packed_guid_t guid;
       char guidbuf[64];
 
       /* Retrieve current key. */