vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

verifiers: ARM Xen fallout cleanup

Browse source 
ARM Xen fallout cleanup after commit ca0a4f689 (verifiers: File type for
fine-grained signature-verification controlling).

Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
Reviewed-by: Ross Philipson <ross.philipson@oracle.com>
This commit is contained in:
Daniel Kiper 2018-12-06 13:43:05 +01:00
parent e5b846333f
commit 95db97d041
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
grub-core/loader/arm64/xen_boot.c
View file

@ -429,9 +429,9 @@ grub_cmd_xen_module (grub_command_t cmd __attribute__((unused)),
grub_dprintf ("xen_loader", "Init module and node info\n"); grub_dprintf ("xen_loader", "Init module and node info\n");
if (nounzip) file = grub_file_open (argv[0], GRUB_FILE_TYPE_XEN_MODULE
grub_file_filter_disable_compression (); | (nounzip ? GRUB_FILE_TYPE_NO_DECOMPRESS
file = grub_file_open (argv[0]); : GRUB_FILE_TYPE_NONE));
if (!file) if (!file)
goto fail; goto fail;
@ -463,7 +463,7 @@ grub_cmd_xen_hypervisor (grub_command_t cmd __attribute__ ((unused)),
goto fail; goto fail;
} }
file = grub_file_open (argv[0]); file = grub_file_open (argv[0], GRUB_FILE_TYPE_XEN_HYPERVISOR);
if (!file) if (!file)
goto fail; goto fail;

5
include/grub/file.h
View file

@ -42,6 +42,11 @@ enum grub_file_type
/* Multiboot module. */ /* Multiboot module. */
GRUB_FILE_TYPE_MULTIBOOT_MODULE, GRUB_FILE_TYPE_MULTIBOOT_MODULE,
/* Xen hypervisor - used on ARM only. */
GRUB_FILE_TYPE_XEN_HYPERVISOR,
/* Xen module - used on ARM only. */
GRUB_FILE_TYPE_XEN_MODULE,
GRUB_FILE_TYPE_BSD_KERNEL, GRUB_FILE_TYPE_BSD_KERNEL,
GRUB_FILE_TYPE_FREEBSD_ENV, GRUB_FILE_TYPE_FREEBSD_ENV,
GRUB_FILE_TYPE_FREEBSD_MODULE, GRUB_FILE_TYPE_FREEBSD_MODULE,