motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-03 07:43:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

contrib/elf2dmp: use GLib in PDB processing

Browse source 
Replace POSIX mmap with GLib g_mapped_file_new in PDB processing stage
to make elf2dmp cross-platform. There are no direct POSIX in elf2dmp
after this patch.

Signed-off-by: Viktor Prutyanov <viktor.prutyanov@phystech.edu>
Message-Id: <20181220012441.13694-4-viktor.prutyanov@phystech.edu>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Viktor Prutyanov 2018-12-20 04:24:38 +03:00 • committed by Paolo Bonzini
parent bd4d0da7db
commit 4ea1a21d84
2 changed files with 9 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

29
contrib/elf2dmp/pdb.c
View file

@ -277,28 +277,18 @@ static void pdb_reader_exit(struct pdb_reader *r)
int pdb_init_from_file(const char *name, struct pdb_reader *reader) int pdb_init_from_file(const char *name, struct pdb_reader *reader)
{ {
GError *gerr = NULL;
int err = 0; int err = 0;
int fd;
void *map; void *map;
struct stat st;
fd = open(name, O_RDONLY, 0); reader->gmf = g_mapped_file_new(name, TRUE, &gerr);
if (fd == -1) { if (gerr) {
eprintf("Failed to open PDB file \'%s\'\n", name); eprintf("Failed to map PDB file \'%s\'\n", name);
return 1; return 1;
} }
reader->fd = fd;
fstat(fd, &st);
reader->file_size = st.st_size;
map = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
if (map == MAP_FAILED) {
eprintf("Failed to map PDB file\n");
err = 1;
goto out_fd;
}
reader->file_size = g_mapped_file_get_length(reader->gmf);
map = g_mapped_file_get_contents(reader->gmf);
if (pdb_reader_init(reader, map)) { if (pdb_reader_init(reader, map)) {
err = 1; err = 1;
goto out_unmap; goto out_unmap;
@ -307,16 +297,13 @@ int pdb_init_from_file(const char *name, struct pdb_reader *reader)
return 0; return 0;
out_unmap: out_unmap:
munmap(map, st.st_size); g_mapped_file_unref(reader->gmf);
out_fd:
close(fd);
return err; return err;
} }
void pdb_exit(struct pdb_reader *reader) void pdb_exit(struct pdb_reader *reader)
{ {
munmap(reader->ds.header, reader->file_size); g_mapped_file_unref(reader->gmf);
close(reader->fd);
pdb_reader_exit(reader); pdb_reader_exit(reader);
} }

2
contrib/elf2dmp/pdb.h
View file

@ -216,7 +216,7 @@ typedef struct pdb_seg {
#define IMAGE_FILE_MACHINE_AMD64 0x8664 #define IMAGE_FILE_MACHINE_AMD64 0x8664
struct pdb_reader { struct pdb_reader {
int fd; GMappedFile *gmf;
size_t file_size; size_t file_size;
struct { struct {
PDB_DS_HEADER *header; PDB_DS_HEADER *header;