From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kevin Wolf Subject: [PATCH 2/4] blktap: Export disk type constants for ioemu Date: Thu, 12 Mar 2009 19:32:13 +0100 Message-ID: <49B9552D.2060105@suse.de> References: <49B9544C.4030006@suse.de> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------020506000702080302010900" Return-path: In-Reply-To: <49B9544C.4030006@suse.de> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: "xen-devel@lists.xensource.com" Cc: Jim Fehlig List-Id: xen-devel@lists.xenproject.org This is a multi-part message in MIME format. --------------020506000702080302010900 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit 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 --------------020506000702080302010900 Content-Type: text/x-patch; name="libblktap-export-disk-types.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="libblktap-export-disk-types.patch" 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 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); --------------020506000702080302010900 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --------------020506000702080302010900--