From cfcacf01ed042f6354c5d4249bdc6d883d04b330 Mon Sep 17 00:00:00 2001

From: Peter Jones <pjones@redhat.com>

Date: Tue, 27 Feb 2018 13:55:35 -0500

Subject: [PATCH 199/216] align struct efi_variable better...

---

 include/grub/efiemu/runtime.h | 2 +-

 include/grub/types.h          | 1 +

 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/grub/efiemu/runtime.h b/include/grub/efiemu/runtime.h

index 9b6b729f4cc..856774a7c34 100644

--- a/include/grub/efiemu/runtime.h

+++ b/include/grub/efiemu/runtime.h

@@ -33,5 +33,5 @@ struct efi_variable

   grub_uint32_t namelen;

   grub_uint32_t size;

   grub_efi_uint32_t attributes;

-} GRUB_PACKED;

+} GRUB_PACKED GRUB_ALIGNED(8);

 #endif /* ! GRUB_EFI_EMU_RUNTIME_HEADER */

diff --git a/include/grub/types.h b/include/grub/types.h

index b93e4820194..f6a9723971d 100644

--- a/include/grub/types.h

+++ b/include/grub/types.h

@@ -29,6 +29,7 @@

 #else

 #define GRUB_PACKED __attribute__ ((packed))

 #endif

+#define GRUB_ALIGNED(x) __attribute__((aligned (x)))

 #ifdef GRUB_BUILD

 # define GRUB_CPU_SIZEOF_VOID_P	BUILD_SIZEOF_VOID_P

-- 

2.15.0