Code Review
/
deb_dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
New upstream version 17.11.1
[deb_dpdk.git]
/
buildtools
/
pmdinfogen
/
pmdinfogen.c
diff --git
a/buildtools/pmdinfogen/pmdinfogen.c
b/buildtools/pmdinfogen/pmdinfogen.c
index
5bf08ce
..
b07dbcf
100644
(file)
--- a/
buildtools/pmdinfogen/pmdinfogen.c
+++ b/
buildtools/pmdinfogen/pmdinfogen.c
@@
-158,7
+158,8
@@
static int parse_elf(struct elf_info *info, const char *filename)
* There are more than 64k sections,
* read count from .sh_size.
*/
* There are more than 64k sections,
* read count from .sh_size.
*/
- info->num_sections = TO_NATIVE(endian, 32, sechdrs[0].sh_size);
+ info->num_sections =
+ TO_NATIVE(endian, ADDR_SIZE, sechdrs[0].sh_size);
} else {
info->num_sections = hdr->e_shnum;
}
} else {
info->num_sections = hdr->e_shnum;
}
@@
-181,7
+182,7
@@
static int parse_elf(struct elf_info *info, const char *filename)
sechdrs[i].sh_offset =
TO_NATIVE(endian, ADDR_SIZE, sechdrs[i].sh_offset);
sechdrs[i].sh_size =
sechdrs[i].sh_offset =
TO_NATIVE(endian, ADDR_SIZE, sechdrs[i].sh_offset);
sechdrs[i].sh_size =
- TO_NATIVE(endian,
32
, sechdrs[i].sh_size);
+ TO_NATIVE(endian,
ADDR_SIZE
, sechdrs[i].sh_size);
sechdrs[i].sh_link =
TO_NATIVE(endian, 32, sechdrs[i].sh_link);
sechdrs[i].sh_info =
sechdrs[i].sh_link =
TO_NATIVE(endian, 32, sechdrs[i].sh_link);
sechdrs[i].sh_info =
@@
-270,6
+271,7
@@
struct opt_tag {
static const struct opt_tag opt_tags[] = {
{"_param_string_export", "params"},
static const struct opt_tag opt_tags[] = {
{"_param_string_export", "params"},
+ {"_kmod_dep_export", "kmod"},
};
static int complete_pmd_entry(struct elf_info *info, struct pmd_driver *drv)
};
static int complete_pmd_entry(struct elf_info *info, struct pmd_driver *drv)
@@
-326,6
+328,10
@@
static int locate_pmd_entries(struct elf_info *info)
do {
new = calloc(sizeof(struct pmd_driver), 1);
do {
new = calloc(sizeof(struct pmd_driver), 1);
+ if (new == NULL) {
+ fprintf(stderr, "Failed to calloc memory\n");
+ return -1;
+ }
new->name_sym = find_sym_in_symtab(info, "this_pmd_name", last);
last = new->name_sym;
if (!new->name_sym)
new->name_sym = find_sym_in_symtab(info, "this_pmd_name", last);
last = new->name_sym;
if (!new->name_sym)
@@
-396,7
+402,7
@@
static void output_pmd_info_string(struct elf_info *info, char *outfile)
int main(int argc, char **argv)
{
int main(int argc, char **argv)
{
- struct elf_info info;
+ struct elf_info info
= {0}
;
int rc = 1;
if (argc < 3) {
int rc = 1;
if (argc < 3) {
@@
-407,7
+413,8
@@
int main(int argc, char **argv)
}
parse_elf(&info, argv[1]);
}
parse_elf(&info, argv[1]);
- locate_pmd_entries(&info);
+ if (locate_pmd_entries(&info) < 0)
+ exit(1);
if (info.drivers) {
output_pmd_info_string(&info, argv[2]);
if (info.drivers) {
output_pmd_info_string(&info, argv[2]);