Skip to contentSkip to conversation

kexec-tools: Make xc_dlhandle static

PATCH Applied Eric DeVolder 3 participants 4 messages Jan 24, 2018 – Jan 25, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v4 1/1 kexec-tools: Make xc_dlhandle static

This patch is a follow-on to commit 894bea93 "kexec-tools: Perform run-time linking of libxenctrl.so". This patch addresses feedback from Daniel Kiper.

This patch implements Daniel's suggestion to make the xc_dlhandle variable static, insert missing 'extern' qualifier for the new __xc() wrappers, and correct some style issues.

---
v1: 23jan2018
- Implemented feedback from Daniel Kiper

v2: 23jan2018
- Implemented feedback from Daniel Kiper
- Broke patch into two

v3: 24jan2018
- Implemented feedback from Daniel Kiper
- Added 'extern' to the new declarations in kexec-xen.h

v4: 24jan2018
- Implemented feedback from Daniel Kiper
- Corrected style issues

---
 kexec/kexec-xen.c | 11 ++++++++++-
 kexec/kexec-xen.h | 18 ++++++++----------
 2 files changed, 18 insertions(+), 11 deletions(-)
kexec/kexec-xen.c +10 -1
index 75f8758..1887390 100644
@@ -15,8 +15,17 @@
 #include "crashdump.h"
 
 #ifdef CONFIG_LIBXENCTRL_DL
-void *xc_dlhandle;
+#include <dlfcn.h>
+
+/* The handle from dlopen(), needed by dlsym(), dlclose() */
+static void *xc_dlhandle;
 xc_hypercall_buffer_t XC__HYPERCALL_BUFFER_NAME(HYPERCALL_BUFFER_NULL);
+
+void *__xc_dlsym(const char *symbol)
+{
+	return dlsym(xc_dlhandle, symbol);
+}
+
 xc_interface *__xc_interface_open(xentoollog_logger *logger,
 				  xentoollog_logger *dombuild_logger,
 				  unsigned open_flags)
kexec/kexec-xen.h +8 -10
index ffb8743..ae67393 100644
@@ -5,29 +5,27 @@
 #include <xenctrl.h>
 
 #ifdef CONFIG_LIBXENCTRL_DL
-#include <dlfcn.h>
-
-/* The handle from dlopen(), needed by dlsym(), dlclose() */
-extern void *xc_dlhandle;
+/* Lookup symbols in libxenctrl.so */
+extern void *__xc_dlsym(const char *symbol);
 
 /* Wrappers around xc_interface_open/close() to insert dlopen/dlclose() */
-xc_interface *__xc_interface_open(xentoollog_logger *logger,
-				  xentoollog_logger *dombuild_logger,
-				  unsigned open_flags);
-int __xc_interface_close(xc_interface *xch);
+extern xc_interface *__xc_interface_open(xentoollog_logger *logger,
+					 xentoollog_logger *dombuild_logger,
+					 unsigned open_flags);
+extern int __xc_interface_close(xc_interface *xch);
 
 /* GCC expression statements for evaluating dlsym() */
 #define __xc_call(dtype, name, args...) \
 ( \
 	{ dtype value; \
 	typedef dtype (*func_t)(xc_interface *, ...); \
-	func_t func = dlsym(xc_dlhandle, #name); \
+	func_t func = __xc_dlsym(#name); \
 	value = func(args); \
 	value; } \
 )
 #define __xc_data(dtype, name) \
 ( \
-	{ dtype *value = (dtype *)dlsym(xc_dlhandle, #name); value; } \
+	{ dtype *value = (dtype *)__xc_dlsym(#name); value; } \
 )
 
 /* The wrappers around utilized xenctrl.h functions */
Signature · 7 lines
2.7.4


_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
Reviewed-by on v4 1/1
#1 lore raw
Quoted 10 lines · Eric DeVolder

This patch is a follow-on to commit 894bea93 "kexec-tools: Perform run-time linking of libxenctrl.so". This patch addresses feedback from Daniel Kiper.

This patch implements Daniel's suggestion to make the xc_dlhandle variable static, insert missing 'extern' qualifier for the new __xc() wrappers, and correct some style issues.

Daniel

_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec

Applied
#2 lore raw
Quoted 5 lines · Daniel Kiper
Quoted 4 lines · Eric DeVolder

This patch is a follow-on to commit 894bea93 "kexec-tools: Perform run-time linking of libxenctrl.so". This patch addresses feedback from Daniel Kiper.

Quoted 8 lines
Quoted 6 lines

This patch implements Daniel's suggestion to make the xc_dlhandle variable static, insert missing 'extern' qualifier for the new __xc() wrappers, and correct some style issues.

Thanks, applied.

_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec

#3 lore raw
Quoted 11 lines · Simon Horman
Quoted 10 lines · Daniel Kiper
Quoted 9 lines · Eric DeVolder

This patch is a follow-on to commit 894bea93 "kexec-tools: Perform run-time linking of libxenctrl.so". This patch addresses feedback from Daniel Kiper.

This patch implements Daniel's suggestion to make the xc_dlhandle variable static, insert missing 'extern' qualifier for the new __xc() wrappers, and correct some style issues.

Quoted 5 lines
Quoted 3 lines
Quoted 1 line

Thanks, applied.

Simon, thank you.

Eric, thank you for doing the work.

Daniel

_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec