RepoMirrors/kpatch
1
0
Fork 0
mirror of https://github.com/dynup/kpatch synced 2025-02-20 11:57:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

create-diff-object: Rename elements getting correlated

Browse Source 
Change 935f199875 ('create-diff-object: simplify mangled function
correlation') simplified the way symbols are correlated and got rid of
symbol section renaming.

As a result a symbol/section can now have a CHANGED status, being
correlated to an element that doesn't have the exact same name. This
will cause lookups to the original object fail when creating the new
patch object.

So lets bring back the symbol/section renaming, but only once they
have actually been correlated.

Fixes: 935f199875 ('create-diff-object: simplify mangled function
correlation')
Signed-off-by: Julien Thierry <jthierry@redhat.com>
This commit is contained in:
Julien Thierry 2019-10-09 11:33:58 +01:00
parent 49a9adaf74
commit e49e3a59c2
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kpatch-build/create-diff-object.c
View File

@ -760,7 +760,7 @@ static void kpatch_compare_symbols(struct list_head *symlist)
}
}
#define CORRELATE_ELEMENT(_e1_, _e2_) \
#define CORRELATE_ELEMENT(_e1_, _e2_, kindstr) \
do { \
typeof(_e1_) e1 = (_e1_); \
typeof(_e2_) e2 = (_e2_); \
@ -768,16 +768,22 @@ do { \
e2->twin = e1; \
/* set initial status, might change */ \
e1->status = e2->status = SAME; \
if (strcmp(e1->name, e2->name)) { \
/* Rename mangled element */ \
log_debug("renaming %s %s to %s\n", \
kindstr, e2->name, e1->name); \
e2->name = strdup(e1->name); \
} \
} while (0)
static void __kpatch_correlate_section(struct section *sec1, struct section *sec2)
{
CORRELATE_ELEMENT(sec1, sec2);
CORRELATE_ELEMENT(sec1, sec2, "section");
}
static void kpatch_correlate_symbol(struct symbol *sym1, struct symbol *sym2)
{
CORRELATE_ELEMENT(sym1, sym2);
CORRELATE_ELEMENT(sym1, sym2, "symbol");
}
static void kpatch_correlate_section(struct section *sec1, struct section *sec2)