From 57871f919d89cc3f323dabcb76dd5344595e756e Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Thu, 12 Mar 2009 18:42:59 +0000 Subject: 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 --- tools/blktap/drivers/tapdisk.h | 9 --------- tools/blktap/lib/blktaplib.h | 10 ++++++++++ 2 files changed, 10 insertions(+), 9 deletions(-) (limited to 'tools/blktap') diff --git a/tools/blktap/drivers/tapdisk.h b/tools/blktap/drivers/tapdisk.h index 38f3c40fa6..f3e165ac33 100644 --- a/tools/blktap/drivers/tapdisk.h +++ b/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 = { diff --git a/tools/blktap/lib/blktaplib.h b/tools/blktap/lib/blktaplib.h index 5511bf2f08..d54ae3e57b 100644 --- a/tools/blktap/lib/blktaplib.h +++ b/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); -- cgit v1.2.3