[PATCH 2/4] blktap: Export disk type constants for ioemu

[Kevin Wolf <kwolf@suse.de>]

[-- Attachment #1: Type: text/plain, Size: 276 bytes --]

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@suse.de>

[-- Attachment #2: libblktap-export-disk-types.patch --]
[-- Type: text/x-patch, Size: 1652 bytes --]

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@suse.de>

Index: xen-unstable.hg/tools/blktap/drivers/tapdisk.h
===================================================================
--- xen-unstable.hg.orig/tools/blktap/drivers/tapdisk.h
+++ xen-unstable.hg/tools/blktap/drivers/tapdisk.h
@@ -161,15 +161,6 @@ extern struct tap_disk tapdisk_ram;
 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 = {
Index: xen-unstable.hg/tools/blktap/lib/blktaplib.h
===================================================================
--- xen-unstable.hg.orig/tools/blktap/lib/blktaplib.h
+++ xen-unstable.hg/tools/blktap/lib/blktaplib.h
@@ -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);

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

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