From: Artem Savkov <asavkov@redhat.com>
Date: Tue, 12 Jun 2018 14:10:10 +0000 (+0200)
Subject: create-diff-object: propagate child symbol changes
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=21da3a259d13ab31026e2695366b6bc3c50b7039;p=livepatch-build-tools.git

create-diff-object: propagate child symbol changes

Propagate child symbol changes to it's parent.

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/create-diff-object.c b/create-diff-object.c
index bca2199..60ce73c 100644
--- a/create-diff-object.c
+++ b/create-diff-object.c
@@ -821,8 +821,14 @@ static void kpatch_compare_sections(struct list_head *seclist)
 			if (sec->base->sym && sec->base->sym->status != CHANGED)
 				sec->base->sym->status = sec->status;
 		} else {
-			if (sec->sym && sec->sym->status != CHANGED)
-				sec->sym->status = sec->status;
+			struct symbol *sym = sec->sym;
+
+			if (sym && sym->status != CHANGED)
+				sym->status = sec->status;
+
+			if (sym && sym->child && sym->status == SAME &&
+			    sym->child->sec->status == CHANGED)
+				sym->status = CHANGED;
 		}
 	}
 }