EA-1001: Disable block-log.

Based on guest blkif ring definitions. Won't build before we can link
against xen-tools again.

Signed-off-by: Daniel Stodden <daniel.stodden@citrix.com>

diff --git a/drivers/Makefile b/drivers/Makefile
index e6ab094dc2172c10185653749396cbd3becaca02..83c4680b3f6325b19ed525c36910c3e7960213ef 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -3,7 +3,7 @@ include $(BLKTAP_ROOT)/Rules.mk
 
 LIBVHDDIR  = $(BLKTAP_ROOT)/vhd/lib
 
-IBIN       = tapdisk2 td-util tapdisk-client tapdisk-stream tapdisk-diff
+IBIN       = tapdisk2 td-util tapdisk-stream tapdisk-diff
 LOCK_UTIL  = lock-util
 INST_DIR   = /usr/sbin
 
@@ -26,7 +26,7 @@ tapdisk2 td-util tapdisk-stream tapdisk-diff: LIBS += -L$(LIBVHDDIR) -lvhd -luui
 ifneq ($(USE_SYSTEM_LIBRARIES),y)
 LIBAIO_DIR = $(XEN_ROOT)/tools/libaio/src
 tapdisk2 tapdisk-stream tapdisk-diff: AIOLIBS := $(LIBAIO_DIR)/libaio.a
-tapdisk2 tapdisk-client tapdisk-stream tapdisk-diff: CFLAGS  += -I$(LIBAIO_DIR) -I$(XEN_LIBXC)
+tapdisk2 tapdisk-stream tapdisk-diff: CFLAGS  += -I$(LIBAIO_DIR) -I$(XEN_LIBXC)
 tapdisk2 tapdisk-client tapdisk-stream tapdisk-diff block-log: CFLAGS += -I$(XEN_ROOT)/tools/include
 else
 tapdisk2 tapdisk-stream tapdisk-diff: AIOLIBS := -laio
@@ -63,7 +63,6 @@ BLK-OBJS  += block-ram.o
 BLK-OBJS  += block-cache.o
 BLK-OBJS  += block-vhd.o
 BLK-OBJS  += block-vindex.o
-BLK-OBJS  += block-log.o
 BLK-OBJS  += block-lcache.o
 
 all: $(IBIN) lock-util

diff --git a/drivers/tapdisk-disktype.c b/drivers/tapdisk-disktype.c
index 9cb81e4ed37c036c074569f8e5af9e2fee9d3043..af8a5aaff49d16361b5219e12d9594527d02da5c 100644 (file)
--- a/drivers/tapdisk-disktype.c
+++ b/drivers/tapdisk-disktype.c
@@ -128,7 +128,9 @@ extern struct tap_disk tapdisk_qcow;
 #endif
 extern struct tap_disk tapdisk_block_cache;
 extern struct tap_disk tapdisk_vhd_index;
+#if 0
 extern struct tap_disk tapdisk_log;
+#endif
 extern struct tap_disk tapdisk_local_cache;
 
 const struct tap_disk *tapdisk_disk_drivers[] = {
@@ -145,7 +147,9 @@ const struct tap_disk *tapdisk_disk_drivers[] = {
 #endif
        [DISK_TYPE_BLOCK_CACHE] = &tapdisk_block_cache,
        [DISK_TYPE_VINDEX]      = &tapdisk_vhd_index,
+#if 0
        [DISK_TYPE_LOG]         = &tapdisk_log,
+#endif
        [DISK_TYPE_LOCAL_CACHE] = &tapdisk_local_cache,
        0,
 };

diff --git a/mk/blktap.spec.in b/mk/blktap.spec.in
index 21a8ace04768d253814be058f04930a5af911f92..74c3ea5748c5ffe69a6bbef75d51456d924102ad 100644 (file)
--- a/mk/blktap.spec.in
+++ b/mk/blktap.spec.in
@@ -49,7 +49,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/vhd-update
 %{_sbindir}/vhd-util
 %{_sbindir}/vhd-index
-%{_sbindir}/tapdisk-client
 %{_sbindir}/tapdisk-stream
 %{_sbindir}/tapdisk-diff
 %{_sbindir}/part-util