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

Implement grub_file tool and use it to implement generating of config

Browse source 
in separate root.
This commit is contained in:
Vladimir Serbinenko 2013-12-17 14:39:48 +01:00
parent 296f76068d
commit ec824e0f2a
26 changed files with 1113 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

9
grub-core/loader/i386/xen_file.c
View file

@ -77,12 +77,17 @@ grub_xen_get_info (grub_elf_t elf, struct grub_xen_file_info * xi)
{
grub_memset (xi, 0, sizeof (*xi));
if (grub_elf_is_elf64 (elf))
if (grub_elf_is_elf64 (elf)
&& elf->ehdr.ehdr64.e_machine
== grub_cpu_to_le16_compile_time (EM_X86_64)
&& elf->ehdr.ehdr64.e_ident[EI_DATA] == ELFDATA2LSB)
{
xi->arch = GRUB_XEN_FILE_X86_64;
return grub_xen_get_info64 (elf, xi);
}
if (grub_elf_is_elf32 (elf))
if (grub_elf_is_elf32 (elf)
&& elf->ehdr.ehdr32.e_machine == grub_cpu_to_le16_compile_time (EM_386)
&& elf->ehdr.ehdr32.e_ident[EI_DATA] == ELFDATA2LSB)
{
xi->arch = GRUB_XEN_FILE_I386;
return grub_xen_get_info32 (elf, xi);