tools/misc: Fix linkage of libxenstore

* xen-mfndump doesn't use xenstore at all.  Don't link against it.

* xen-hptool can include the correct header rather than externing itself a
  single function.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
CC: Ian Campbell <Ian.Campbell@citrix.com>
CC: Ian Jackson <Ian.Jackson@eu.citrix.com>
CC: Dario Faggioli <dario.faggioli@citrix.com>
Reviewed-by: Dario Faggioli <dario.faggioli@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/tools/misc/Makefile b/tools/misc/Makefile
index 17aeda57d174a48db9782cfc3d6e9635923ed0f6..69b18176ce67295a030c4b98f1ffca9a1f196513 100644 (file)
--- a/tools/misc/Makefile
+++ b/tools/misc/Makefile
@@ -76,7 +76,7 @@ xen-hptool: xen-hptool.o
        $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) $(APPEND_LDFLAGS)
 
 xen-mfndump: xen-mfndump.o
-       $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) $(APPEND_LDFLAGS)
+       $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(APPEND_LDFLAGS)
 
 xenwatchdogd: xenwatchdogd.o
        $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS)

diff --git a/tools/misc/xen-hptool.c b/tools/misc/xen-hptool.c
index 8aac51c912ce30033f1c7c189eba82c295d96de5..d0e8e902839a450bdf6837c153d813eac2305f31 100644 (file)
--- a/tools/misc/xen-hptool.c
+++ b/tools/misc/xen-hptool.c
@@ -1,6 +1,7 @@
 #include <xenctrl.h>
 #include <xc_private.h>
 #include <xc_core.h>
+#include <xenstore.h>
 #include <unistd.h>
 
 #define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0]))
@@ -96,8 +97,6 @@ static int hp_mem_query_func(int argc, char *argv[])
     return ret;
 }
 
-extern int xs_suspend_evtchn_port(int domid);
-
 static int suspend_guest(xc_interface *xch, xc_evtchn *xce, int domid,
                          int *evtchn, int *lockfd)
 {