blktap2: <sys/time.h> is needed for 'struct timeval'

Also clean up a Makefile to use $(SBINDIR).

Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>

diff --git a/tools/blktap2/control/Makefile b/tools/blktap2/control/Makefile
index 68b4285ba8e5e95e5ad695099e839e18d23fbed8..95cfc1bce43073bfa8da39d695c741f279811f85 100644 (file)
--- a/tools/blktap2/control/Makefile
+++ b/tools/blktap2/control/Makefile
@@ -2,7 +2,6 @@ XEN_ROOT := ../../../
 include $(XEN_ROOT)/tools/Rules.mk
 
 IBIN               = tap-ctl
-INST_DIR           = /usr/sbin
 
 CFLAGS            += -Werror
 CFLAGS            += -Wno-unused
@@ -45,8 +44,8 @@ libblktapctl.a: $(CTL_OBJS)
        ar r $@ $^
 
 install: all
-       $(INSTALL_DIR) -p $(DESTDIR)$(INST_DIR)
-       $(INSTALL_PROG) $(IBIN) $(DESTDIR)$(INST_DIR)
+       $(INSTALL_DIR) -p $(DESTDIR)$(SBINDIR)
+       $(INSTALL_PROG) $(IBIN) $(DESTDIR)$(SBINDIR)
 
 clean:
        rm -f $(OBJS) $(DEPS) $(IBIN) $(LIBS)

diff --git a/tools/blktap2/include/blktaplib.h b/tools/blktap2/include/blktaplib.h
index afd1037352628bcda844a80c814c1a63a938e586..c2860b7c3bce664cf7d6fd2ec4d2460f24113b16 100644 (file)
--- a/tools/blktap2/include/blktaplib.h
+++ b/tools/blktap2/include/blktaplib.h
@@ -33,6 +33,7 @@
 #define __BLKTAPLIB_H__
 
 #include <syslog.h>
+#include <sys/time.h>
 #include <xenctrl.h>
 #include <xen/io/blkif.h>