98536ec
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
98536ec
From: Peter Jones <pjones@redhat.com>
98536ec
Date: Tue, 11 Sep 2018 15:58:29 -0400
98536ec
Subject: [PATCH] Add more dprintf, and nerf dprintf in script.c
98536ec
98536ec
Signed-off-by: Peter Jones <pjones@redhat.com>
98536ec
---
98536ec
 grub-core/disk/diskfilter.c  | 3 +++
98536ec
 grub-core/disk/efi/efidisk.c | 1 +
98536ec
 grub-core/kern/device.c      | 1 +
98536ec
 grub-core/script/script.c    | 5 +++++
98536ec
 4 files changed, 10 insertions(+)
98536ec
98536ec
diff --git a/grub-core/disk/diskfilter.c b/grub-core/disk/diskfilter.c
98536ec
index 6f901c0adf7..66f6b992604 100644
98536ec
--- a/grub-core/disk/diskfilter.c
98536ec
+++ b/grub-core/disk/diskfilter.c
98536ec
@@ -188,6 +188,8 @@ scan_disk (const char *name, int accept_diskfilter)
98536ec
   grub_disk_t disk;
98536ec
   static int scan_depth = 0;
98536ec
 
98536ec
+  grub_dprintf ("diskfilter", "scanning %s\n", name);
98536ec
+
98536ec
   if (!accept_diskfilter && is_valid_diskfilter_name (name))
98536ec
     return 0;
98536ec
 
98536ec
@@ -1211,6 +1213,7 @@ insert_array (grub_disk_t disk, const struct grub_diskfilter_pv_id *id,
98536ec
 	   the same.  */
98536ec
 	if (pv->disk && grub_disk_get_size (disk) >= pv->part_size)
98536ec
 	  return GRUB_ERR_NONE;
98536ec
+	grub_dprintf ("diskfilter", "checking %s\n", disk->name);
98536ec
 	pv->disk = grub_disk_open (disk->name);
98536ec
 	if (!pv->disk)
98536ec
 	  return grub_errno;
98536ec
diff --git a/grub-core/disk/efi/efidisk.c b/grub-core/disk/efi/efidisk.c
98536ec
index 5d2400f66f2..4bc51877f04 100644
98536ec
--- a/grub-core/disk/efi/efidisk.c
98536ec
+++ b/grub-core/disk/efi/efidisk.c
98536ec
@@ -846,6 +846,7 @@ grub_efidisk_get_device_name (grub_efi_handle_t *handle)
98536ec
 	  return 0;
98536ec
 	}
98536ec
 
98536ec
+      grub_dprintf ("efidisk", "getting disk for %s\n", device_name);
98536ec
       parent = grub_disk_open (device_name);
98536ec
       grub_free (dup_dp);
98536ec
 
98536ec
diff --git a/grub-core/kern/device.c b/grub-core/kern/device.c
98536ec
index 73b8ecc0c09..f58b58c89d5 100644
98536ec
--- a/grub-core/kern/device.c
98536ec
+++ b/grub-core/kern/device.c
98536ec
@@ -34,6 +34,7 @@ grub_device_open (const char *name)
98536ec
 {
98536ec
   grub_device_t dev = 0;
98536ec
 
98536ec
+  grub_dprintf ("device", "opening device %s\n", name);
98536ec
   if (! name)
98536ec
     {
98536ec
       name = grub_env_get ("root");
98536ec
diff --git a/grub-core/script/script.c b/grub-core/script/script.c
98536ec
index ec4d4337c66..844e8343ca7 100644
98536ec
--- a/grub-core/script/script.c
98536ec
+++ b/grub-core/script/script.c
98536ec
@@ -22,6 +22,11 @@
98536ec
 #include <grub/parser.h>
98536ec
 #include <grub/mm.h>
98536ec
 
98536ec
+#ifdef grub_dprintf
98536ec
+#undef grub_dprintf
98536ec
+#endif
98536ec
+#define grub_dprintf(no, fmt, ...)
98536ec
+
98536ec
 /* It is not possible to deallocate the memory when a syntax error was
98536ec
    found.  Because of that it is required to keep track of all memory
98536ec
    allocations.  The memory is freed in case of an error, or assigned