mirror of
https://git.proxmox.com/git/grub2
synced 2025-07-21 19:54:11 +00:00
563b1da6e6
When building with GCC 8, there are several errors regarding packed-not-aligned. ./include/grub/gpt_partition.h:79:1: error: alignment 1 of ‘struct grub_gpt_partentry’ is less than 8 [-Werror=packed-not-aligned] This patch fixes the build error by cleaning up the ambiguity of placing aligned structure in a packed one. In "struct grub_btrfs_time" and "struct grub_gpt_part_type", the aligned attribute seems to be superfluous, and also has to be packed, to ensure the structure is bit-to-bit mapped to the format laid on disk. I think we could blame to copy and paste error here for the mistake. In "struct efi_variable", we have to use grub_efi_packed_guid_t, as the name suggests. :) Signed-off-by: Michael Chang <mchang@suse.com> Tested-by: Michael Chang <mchang@suse.com> Tested-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
38 lines
1.1 KiB
C
38 lines
1.1 KiB
C
/*
|
|
* GRUB -- GRand Unified Bootloader
|
|
* Copyright (C) 2009 Free Software Foundation, Inc.
|
|
*
|
|
* GRUB is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* GRUB is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef GRUB_EFI_EMU_RUNTIME_HEADER
|
|
#define GRUB_EFI_EMU_RUNTIME_HEADER 1
|
|
|
|
struct grub_efiemu_ptv_rel
|
|
{
|
|
grub_uint64_t addr;
|
|
grub_efi_memory_type_t plustype;
|
|
grub_efi_memory_type_t minustype;
|
|
grub_uint32_t size;
|
|
} GRUB_PACKED;
|
|
|
|
struct efi_variable
|
|
{
|
|
grub_efi_packed_guid_t guid;
|
|
grub_uint32_t namelen;
|
|
grub_uint32_t size;
|
|
grub_efi_uint32_t attributes;
|
|
} GRUB_PACKED;
|
|
#endif /* ! GRUB_EFI_EMU_RUNTIME_HEADER */
|