libxc: portability fixes for NetBSD

Attached patch makes libxc build again on NetBSD after the recent rework.

[ Modified by iwj:

I changed the name of the new make variable from LIBDL to DLOPEN_LIBS.
The latter conforms to the naming scheme for similar variables found
in config/*.mk - PTHREAD_LIBS et al.

Also I moved the setting of the variable to -dl from Linux to StdGNU
(which makes it apply more widely) and also added it to SunOS.mk
(based on pure guesswork). ]

Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/config/NetBSD.mk b/config/NetBSD.mk
index 6245259761885964ea854af11592d25cb2036982..7aed0e7440e046cebf6bc3e40f9aeca9b7d3bee3 100644 (file)
--- a/config/NetBSD.mk
+++ b/config/NetBSD.mk
@@ -7,6 +7,8 @@ LIBLEAFDIR_x86_64 = lib
 LIBEXEC = $(PREFIX)/libexec
 PRIVATE_BINDIR = $(BINDIR)
 
+DLOPEN_LIBS =
+
 ifeq ($(PREFIX),/usr)
 XEN_LOCK_DIR = /var/lib
 else

diff --git a/config/StdGNU.mk b/config/StdGNU.mk
index 0b1e0382d6c5cac090162f609b3f6617b066e8ae..f27bdc59f524e82dcafcae0c794fd74721e10a73 100644 (file)
--- a/config/StdGNU.mk
+++ b/config/StdGNU.mk
@@ -60,6 +60,8 @@ SOCKET_LIBS =
 CURSES_LIBS = -lncurses
 PTHREAD_LIBS = -lpthread
 UTIL_LIBS = -lutil
+DLOPEN_LIBS = -ldl
+
 SONAME_LDFLAG = -soname
 SHLIB_LDFLAGS = -shared
 

diff --git a/config/SunOS.mk b/config/SunOS.mk
index 80a392bcae33d45ea67f7b310924c8c8689e3689..6fa0e817dda8a5c23a6ae1b0dc8272a29489d2a2 100644 (file)
--- a/config/SunOS.mk
+++ b/config/SunOS.mk
@@ -50,6 +50,8 @@ SOCKET_LIBS = -lsocket
 CURSES_LIBS = -lcurses
 PTHREAD_LIBS = -lpthread
 UTIL_LIBS =
+DLOPEN_LIBS = -ldl
+
 SONAME_LDFLAG = -h
 SHLIB_LDFLAGS = -R $(SunOS_LIBDIR) -shared
 

diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile
index a99f5c7e4c2089fd55ce9e518bdc3acdfc539d32..e042be7ea0d74579d8259df0de20d7101fbb625b 100644 (file)
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@ -158,7 +158,7 @@ libxenctrl.so.$(MAJOR): libxenctrl.so.$(MAJOR).$(MINOR)
        ln -sf $< $@
 
 libxenctrl.so.$(MAJOR).$(MINOR): $(CTRL_PIC_OBJS)
-       $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.so.$(MAJOR) -ldl $(SHLIB_LDFLAGS) -o $@ $^ $(PTHREAD_LIBS)
+       $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.so.$(MAJOR) $(DLOPEN_LIBS) $(SHLIB_LDFLAGS) -o $@ $^ $(PTHREAD_LIBS)
 
 # libxenguest
 

diff --git a/tools/libxc/xc_netbsd.c b/tools/libxc/xc_netbsd.c
index 117acedc676c7f9af60a9fe7eda5a827e91d3966..8c82e3664579e08c179321c078561c1bf5def721 100644 (file)
--- a/tools/libxc/xc_netbsd.c
+++ b/tools/libxc/xc_netbsd.c
@@ -51,7 +51,7 @@ static xc_osdep_handle netbsd_privcmd_open(xc_interface *xch)
         goto error;
     }
 
-    return (xc_osinteface_handle)fd;
+    return (xc_osdep_handle)fd;
 
  error:
     saved_errno = errno;
@@ -181,7 +181,7 @@ static struct xc_osdep_ops netbsd_privcmd_ops = {
     .close = &netbsd_privcmd_close,
 
     .u.privcmd = {
-        .hypercall = &netbsd_privcmd_hypercall;
+        .hypercall = &netbsd_privcmd_hypercall,
 
         .map_foreign_batch = &netbsd_privcmd_map_foreign_batch,
         .map_foreign_bulk = &xc_map_foreign_bulk_compat,