create-build-diff: support for .cold functions with no id suffix

create-build-diff expects .cold functions to be suffixed by an id, which
is not always the case. Drop the trailing '.' when searching for cold
functions.

Fixes: #1160
Signed-off-by: Artem Savkov <asavkov@redhat.com>
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Reviewed-by: Ross Lagerwall <ross.lagerwall@citrix.com>

diff --git a/common.c b/common.c
index b46fcf5cb6caff25a2357fb200a33ef9026c72bd..67b9fcdb0ada400d8a07e3a913a9c62eba36de8e 100644 (file)
--- a/common.c
+++ b/common.c
@@ -127,7 +127,7 @@ static int is_bundleable(struct symbol *sym)
        if (sym->type == STT_FUNC &&
            !strncmp(sym->sec->name, ".text.unlikely.",15) &&
            (!strcmp(sym->sec->name + 15, sym->name) ||
        if (sym->type == STT_FUNC &&
            !strncmp(sym->sec->name, ".text.unlikely.",15) &&
            (!strcmp(sym->sec->name + 15, sym->name) ||

-                        (strstr(sym->name, ".cold.") &&
+                        (strstr(sym->name, ".cold") &&

                          !strncmp(sym->sec->name + 15, sym->name, strlen(sym->sec->name) - 15))))
                return 1;
 
                          !strncmp(sym->sec->name + 15, sym->name, strlen(sym->sec->name) - 15))))
                return 1;
 

diff --git a/create-diff-object.c b/create-diff-object.c
index 8ed4a2e95e5e4d846ba7946ef03b33d6c98ca3e4..7e6138bd3ba5536942abce2538cf42967574740c 100644 (file)
--- a/create-diff-object.c
+++ b/create-diff-object.c
@@ -347,7 +347,7 @@ static void kpatch_detect_child_functions(struct kpatch_elf *kelf)
        list_for_each_entry(sym, &kelf->symbols, list) {
                char *coldstr;
 
        list_for_each_entry(sym, &kelf->symbols, list) {
                char *coldstr;
 

-               coldstr = strstr(sym->name, ".cold.");
+               coldstr = strstr(sym->name, ".cold");

                if (coldstr != NULL) {
                        char *pname;
 
                if (coldstr != NULL) {
                        char *pname;