7e98da058f
This change reorganizes and cleanups our patches to reduce the patch number from 314 patches to 187. That's achieved by dropping patches that are later reverted and squashing fixes for earlier patches that introduced features. There are no code changes and the diff with upstream is the same before and after the cleanup. Having fewer patches makes easier to manage the patchset and also will ease to rebase them on top of the latest grub-2.04 release. Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
47 lines
1.7 KiB
Diff
47 lines
1.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Thu, 1 Jun 2017 10:07:50 -0400
|
|
Subject: [PATCH] Add PRIxGRUB_EFI_STATUS and use it.
|
|
|
|
This avoids syntax checkers getting confused about if it's llx or lx.
|
|
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
---
|
|
grub-core/loader/efi/chainloader.c | 3 ++-
|
|
include/grub/efi/api.h | 8 ++++++++
|
|
2 files changed, 10 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
|
|
index 106eb10a362..3630b0cbf2d 100644
|
|
--- a/grub-core/loader/efi/chainloader.c
|
|
+++ b/grub-core/loader/efi/chainloader.c
|
|
@@ -783,7 +783,8 @@ handle_image (void *data, grub_efi_uint32_t datasize)
|
|
efi_status = efi_call_2 (entry_point, grub_efi_image_handle,
|
|
grub_efi_system_table);
|
|
|
|
- grub_dprintf ("chain", "entry_point returned %ld\n", efi_status);
|
|
+ grub_dprintf ("chain", "entry_point returned 0x%"PRIxGRUB_EFI_STATUS"\n",
|
|
+ efi_status);
|
|
grub_memcpy (li, &li_bak, sizeof (grub_efi_loaded_image_t));
|
|
efi_status = grub_efi_free_pool (buffer);
|
|
|
|
diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
|
|
index 28b6adf7648..e5b521bd9be 100644
|
|
--- a/include/grub/efi/api.h
|
|
+++ b/include/grub/efi/api.h
|
|
@@ -527,6 +527,14 @@ typedef grub_uint8_t grub_efi_char8_t;
|
|
typedef grub_uint16_t grub_efi_char16_t;
|
|
|
|
typedef grub_efi_intn_t grub_efi_status_t;
|
|
+/* Make grub_efi_status_t reasonably printable. */
|
|
+#if GRUB_CPU_SIZEOF_VOID_P == 8
|
|
+#define PRIxGRUB_EFI_STATUS "lx"
|
|
+#define PRIdGRUB_EFI_STATUS "ld"
|
|
+#else
|
|
+#define PRIxGRUB_EFI_STATUS "llx"
|
|
+#define PRIdGRUB_EFI_STATUS "lld"
|
|
+#endif
|
|
|
|
#define GRUB_EFI_ERROR_CODE(value) \
|
|
((((grub_efi_status_t) 1) << (sizeof (grub_efi_status_t) * 8 - 1)) | (value))
|