Fix logging from common.c

diff --git a/common.h b/common.h
index b8369a55c3f27d3803bd120420aa8d2ae0551e39..d78275c861a9e92cbd2d2977000a8c4d9e927cca 100644 (file)
--- a/common.h
+++ b/common.h
@@ -3,7 +3,7 @@
 
 #include <error.h>
 
-static char *childobj;
+extern char *childobj;
 
 #define ERROR(format, ...) \
        error(1, 0, "ERROR: %s: %s: %d: " format, childobj, __FUNCTION__, __LINE__, ##__VA_ARGS__)
@@ -38,7 +38,7 @@ enum loglevel {
        NORMAL
 };
 
-static enum loglevel loglevel = NORMAL;
+extern enum loglevel loglevel;
 
 /*******************
  * Data structures

diff --git a/create-diff-object.c b/create-diff-object.c
index b3f7f9eeccd36f26a1f2447a3547cb4edf95628c..9a813ebfe12df1dc4ad5c9406cd7161e46eacb09 100644 (file)
--- a/create-diff-object.c
+++ b/create-diff-object.c
@@ -52,6 +52,9 @@
 #include "asm/insn.h"
 #include "common.h"
 
+char *childobj;
+enum loglevel loglevel = NORMAL;
+
 static void xsplice_compare_elf_headers(Elf *elf1, Elf *elf2)
 {
        GElf_Ehdr eh1, eh2;

diff --git a/prelink.c b/prelink.c
index 44cd6fcb3122ac9a3b9ac5427cfe90df8c74ec84..f922871538c39c4504a62b566449766f25bd680e 100644 (file)
--- a/prelink.c
+++ b/prelink.c
@@ -36,6 +36,9 @@
 #include "asm/insn.h"
 #include "common.h"
 
+char *childobj;
+enum loglevel loglevel = NORMAL;
+
 /* Resolve symbols using xen-syms */
 void xsplice_resolve_symbols(struct xsplice_elf *kelf,
                             struct lookup_table *table)