[Xen-changelog] [xen-unstable] blktap: Export disk type constants for ioemu

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1236883379 0
# Node ID f603aeef08086aa735d58d788000781e4736d6b5
# Parent  d4ad5dd4f411f30d4e67622fde93111225c3526e
blktap: Export disk type constants for ioemu

Currently all disk types that are supported are defined in a header
file private to blktapctrl and tapdisk. When restoring ioemu as a
backend for blktap these constants are needed by ioemu, so move them
to a more public header file.

Signed-off-by: Kevin Wolf <kwolf@xxxxxxx>
---
 tools/blktap/drivers/tapdisk.h |    9 ---------
 tools/blktap/lib/blktaplib.h   |   10 ++++++++++
 2 files changed, 10 insertions(+), 9 deletions(-)

diff -r d4ad5dd4f411 -r f603aeef0808 tools/blktap/drivers/tapdisk.h
--- a/tools/blktap/drivers/tapdisk.h    Thu Mar 12 18:42:31 2009 +0000
+++ b/tools/blktap/drivers/tapdisk.h    Thu Mar 12 18:42:59 2009 +0000
@@ -161,15 +161,6 @@ extern struct tap_disk tapdisk_qcow;
 extern struct tap_disk tapdisk_qcow;
 extern struct tap_disk tapdisk_qcow2;
 
-#define MAX_DISK_TYPES     20
-
-#define DISK_TYPE_AIO      0
-#define DISK_TYPE_SYNC     1
-#define DISK_TYPE_VMDK     2
-#define DISK_TYPE_RAM      3
-#define DISK_TYPE_QCOW     4
-#define DISK_TYPE_QCOW2    5
-
 
 /*Define Individual Disk Parameters here */
 static disk_info_t aio_disk = {
diff -r d4ad5dd4f411 -r f603aeef0808 tools/blktap/lib/blktaplib.h
--- a/tools/blktap/lib/blktaplib.h      Thu Mar 12 18:42:31 2009 +0000
+++ b/tools/blktap/lib/blktaplib.h      Thu Mar 12 18:42:59 2009 +0000
@@ -210,6 +210,16 @@ typedef struct msg_pid {
 #define CTLMSG_PID         9
 #define CTLMSG_PID_RSP     10
 
+/* disk driver types */
+#define MAX_DISK_TYPES     20
+
+#define DISK_TYPE_AIO      0
+#define DISK_TYPE_SYNC     1
+#define DISK_TYPE_VMDK     2
+#define DISK_TYPE_RAM      3
+#define DISK_TYPE_QCOW     4
+#define DISK_TYPE_QCOW2    5
+
 /* xenstore/xenbus: */
 #define DOMNAME "Domain-0"
 int setup_probe_watch(struct xs_handle *h);

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog