aboutsummaryrefslogtreecommitdiffstats
path: root/tools/blktap2
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2010-06-09 06:58:55 +0100
committerKeir Fraser <keir.fraser@citrix.com>2010-06-09 06:58:55 +0100
commit264e0d32b1c11913f64cb222d8ad4ccbf3e8cebd (patch)
treef32c4526fbf63ee5061d76ff801b64c9cb06f266 /tools/blktap2
parent636bf1021583e28f4a25751a7d13316754e8d227 (diff)
downloadxen-264e0d32b1c11913f64cb222d8ad4ccbf3e8cebd.tar.gz
xen-264e0d32b1c11913f64cb222d8ad4ccbf3e8cebd.tar.bz2
xen-264e0d32b1c11913f64cb222d8ad4ccbf3e8cebd.zip
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>
Diffstat (limited to 'tools/blktap2')
-rw-r--r--tools/blktap2/control/Makefile5
-rw-r--r--tools/blktap2/include/blktaplib.h1
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/blktap2/control/Makefile b/tools/blktap2/control/Makefile
index 68b4285ba8..95cfc1bce4 100644
--- 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 afd1037352..c2860b7c3b 100644
--- 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>