CA-34846: Remove disktypes.h from tapdisk.h

Leads to name clashes: the tapdisk_log driver vs. tapdisk-log.

diff --git a/drivers/block-vhd.c b/drivers/block-vhd.c
index 77eb5758d1c06ccfaedca6a1f20f98c0bb1ad183..ba984f2d12a26b0375e3c519a86809a7818c6228 100644 (file)
--- a/drivers/block-vhd.c
+++ b/drivers/block-vhd.c
@@ -42,6 +42,7 @@
 #include "tapdisk.h"
 #include "tapdisk-driver.h"
 #include "tapdisk-interface.h"
+#include "disktypes.h"
 
 unsigned int SPB;
 

diff --git a/drivers/tapdisk-diff.c b/drivers/tapdisk-diff.c
index 9593376b9bd400a241f9d470495b498944b94532..1be7aa9146dcdc07cc756822755b040c37f0b113 100644 (file)
--- a/drivers/tapdisk-diff.c
+++ b/drivers/tapdisk-diff.c
@@ -17,6 +17,7 @@
 #include "tapdisk-vbd.h"
 #include "tapdisk-server.h"
 #include "libvhd.h"
+#include "disktypes.h"
 
 #define POLL_READ                        0
 #define POLL_WRITE                       1

diff --git a/drivers/tapdisk-server.c b/drivers/tapdisk-server.c
index 5199846687742eaa8857171007680b02076753f1..f34cc00db852e6225eb8f45d39b71e020e3d952f 100644 (file)
--- a/drivers/tapdisk-server.c
+++ b/drivers/tapdisk-server.c
@@ -37,6 +37,7 @@
 #include "tapdisk-server.h"
 #include "tapdisk-driver.h"
 #include "tapdisk-interface.h"
+#include "disktypes.h"
 
 #define DBG(_level, _f, _a...)       tlog_write(_level, _f, ##_a)
 #define ERR(_err, _f, _a...)         tlog_error(_err, _f, ##_a)

diff --git a/drivers/tapdisk-vbd.c b/drivers/tapdisk-vbd.c
index ab2b7db0858f35ee5395c0e08c64e919484cd2b1..5b1e8e3138fb6dcfe8c0412f2c32662fde034b88 100644 (file)
--- a/drivers/tapdisk-vbd.c
+++ b/drivers/tapdisk-vbd.c
@@ -20,6 +20,7 @@
 #include "tapdisk-interface.h"
 
 #include "blktap2.h"
+#include "disktypes.h"
 
 #define DBG(_level, _f, _a...) tlog_write(_level, _f, ##_a)
 #define ERR(_err, _f, _a...) tlog_error(_err, _f, ##_a)

diff --git a/drivers/tapdisk.h b/drivers/tapdisk.h
index 08f070055e4f8889e8de22919c72632fe42f3985..bfcb6e66bc6ef560f502523ac9d0918a3981e79b 100644 (file)
--- a/drivers/tapdisk.h
+++ b/drivers/tapdisk.h
@@ -61,7 +61,6 @@
 
 #include "list.h"
 #include "blktaplib.h"
-#include "disktypes.h"
 #include "tapdisk-log.h"
 #include "tapdisk-utils.h"