On Thu, Mar 02, 2023 at 07:20:38PM +0100, Oliver Steffen wrote: > There are 3 implementations of a GUID in Grub. Replace them with a > common one, placed in types.h. > > It uses the "packed" flavor of the GUID structs, the alignment attribute > is dropped, since it is not required. > > Signed-off-by: Oliver Steffen <ostef...@redhat.com> > --- > grub-core/commands/acpi.c | 4 +- > grub-core/commands/efi/efifwsetup.c | 4 +- > grub-core/commands/efi/loadbios.c | 14 +++--- > grub-core/commands/efi/lsefi.c | 4 +- > grub-core/commands/efi/lsefisystab.c | 4 +- > grub-core/commands/efi/lssal.c | 4 +- > grub-core/commands/efi/smbios.c | 12 +++--- > grub-core/commands/efi/tpm.c | 6 +-- > grub-core/disk/efi/efidisk.c | 4 +- > grub-core/efiemu/i386/pc/cfgtables.c | 6 +-- > grub-core/efiemu/main.c | 4 +- > grub-core/efiemu/runtime/efiemu.c | 14 +++--- > grub-core/kern/efi/acpi.c | 12 +++--- > grub-core/kern/efi/efi.c | 22 +++++----- > grub-core/kern/efi/fdt.c | 2 +- > grub-core/kern/efi/init.c | 2 +- > grub-core/kern/efi/sb.c | 4 +- > grub-core/loader/arm64/linux.c | 4 +- > grub-core/loader/efi/fdt.c | 2 +- > grub-core/loader/i386/xnu.c | 4 +- > grub-core/loader/ia64/efi/linux.c | 2 +- > grub-core/net/drivers/efi/efinet.c | 4 +- > grub-core/term/efi/console.c | 2 +- > grub-core/term/efi/serial.c | 2 +- > grub-core/video/efi_gop.c | 8 ++-- > grub-core/video/efi_uga.c | 2 +- > include/grub/efi/api.h | 64 ++++++++++------------------ > include/grub/efi/efi.h | 16 +++---- > include/grub/efiemu/efiemu.h | 10 ++--- > include/grub/efiemu/runtime.h | 2 +- > include/grub/types.h | 9 ++++ > 31 files changed, 122 insertions(+), 131 deletions(-) > > diff --git a/grub-core/commands/acpi.c b/grub-core/commands/acpi.c > index fda62f4ea..4f8af86f2 100644 > --- a/grub-core/commands/acpi.c > +++ b/grub-core/commands/acpi.c > @@ -759,8 +759,8 @@ grub_cmd_acpi (struct grub_extcmd_context *ctxt, int > argc, char **args) > > #ifdef GRUB_MACHINE_EFI > { > - struct grub_efi_guid acpi = GRUB_EFI_ACPI_TABLE_GUID; > - struct grub_efi_guid acpi20 = GRUB_EFI_ACPI_20_TABLE_GUID; > + struct grub_guid acpi = GRUB_EFI_ACPI_TABLE_GUID; > + struct grub_guid acpi20 = GRUB_EFI_ACPI_20_TABLE_GUID;
I would be more consistent and use grub_guid_t instead of "struct grub_guid" everywhere. Otherwise the patch LGTM... Daniel _______________________________________________ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel