makedumpfile: make get_elf64_phdr()/get_elf32_phdr() public
Subsystems (2)
PATCH 1/2 makedumpfile: make get_elf64_phdr()/get_elf32_phdr() public
Move the following two functions from internal function to external function for later use.
get_elf64_phdr(int fd, char *filename, int index, Elf64_Phdr *phdr) get_elf32_phdr(int fd, char *filename, int index, Elf32_Phdr *phdr)
--- elf_info.c | 71 +++++++++++++++++++++++++++++------------------------------ elf_info.h | 2 + 2 files changed, 37 insertions(+), 36 deletions(-)
elf_info.c +0 -36
@@ -95,42 +95,6 @@ static unsigned long size_xen_crash_info;* Internal functions. */ static int -get_elf64_phdr (int fd,char *filename,int index,Elf64_Phdr *phdr) -{ -off_t offset; - - offset =sizeof (Elf64_Ehdr) +sizeof (Elf64_Phdr) * index; - -if (lseek (fd, offset,SEEK_SET ) <0 ) { -ERRMSG ("Can't seek %s. %s\n" , filename,strerror (errno)); -return FALSE; - } -if (read (fd, phdr,sizeof (Elf64_Phdr)) !=sizeof (Elf64_Phdr)) { -ERRMSG ("Can't read %s. %s\n" , filename,strerror (errno)); -return FALSE; - } -return TRUE; -} - -static int -get_elf32_phdr (int fd,char *filename,int index,Elf32_Phdr *phdr) -{ -off_t offset; - - offset =sizeof (Elf32_Ehdr) +sizeof (Elf32_Phdr) * index; - -if (lseek (fd, offset,SEEK_SET ) <0 ) { -ERRMSG ("Can't seek %s. %s\n" , filename,strerror (errno)); -return FALSE; - } -if (read (fd, phdr,sizeof (Elf32_Phdr)) !=sizeof (Elf32_Phdr)) { -ERRMSG ("Can't read %s. %s\n" , filename,strerror (errno)); -return FALSE; - } -return TRUE; -} - -static int check_elf_format(int fd, char *filename, int *phnum, unsigned int
*num_load)
{
int i;
@@ -399,6 +363,41 @@ get_pt_note_info(void)
/*
* External functions.
*/
+int
+get_elf64_phdr(int fd, char *filename, int index, Elf64_Phdr *phdr) +{
+ off_t offset;
+
+ offset = sizeof(Elf64_Ehdr) + sizeof(Elf64_Phdr) * index;
+
+ if (lseek(fd, offset, SEEK_SET) < 0) {
+ ERRMSG("Can't seek %s. %s\n", filename, strerror(errno));
+ return FALSE;
+ }
+ if (read(fd, phdr, sizeof(Elf64_Phdr)) != sizeof(Elf64_Phdr)) {
+ ERRMSG("Can't read %s. %s\n", filename, strerror(errno));
+ return FALSE;
+ }
+ return TRUE;
+}
+
+int
+get_elf32_phdr(int fd, char *filename, int index, Elf32_Phdr *phdr) +{
+ off_t offset;
+
+ offset = sizeof(Elf32_Ehdr) + sizeof(Elf32_Phdr) * index;
+
+ if (lseek(fd, offset, SEEK_SET) < 0) {
+ ERRMSG("Can't seek %s. %s\n", filename, strerror(errno));
+ return FALSE;
+ }
+ if (read(fd, phdr, sizeof(Elf32_Phdr)) != sizeof(Elf32_Phdr)) {
+ ERRMSG("Can't read %s. %s\n", filename, strerror(errno));
+ return FALSE;
+ }
+ return TRUE;
+}
/*
* Convert Physical Address to File Offset.
elf_info.h +2 -0
@@ -27,6 +27,8 @@#define MAX_SIZE_NHDR MAX(sizeof(Elf64_Nhdr), sizeof(Elf32_Nhdr)) +int get_elf64_phdr (int fd,char *filename,int index,Elf64_Phdr *phdr); +int get_elf32_phdr (int fd,char *filename,int index,Elf32_Phdr *phdr);off_t paddr_to_offset (unsigned long long paddr);off_t paddr_to_offset2 (unsigned long long paddr,off_t hint);
Signature · 7 lines
1.7.1 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec