ia64/xen-unstable

changeset 19352:f603aeef0808

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>
author Keir Fraser <keir.fraser@citrix.com>
date Thu Mar 12 18:42:59 2009 +0000 (2009-03-12)
parents d4ad5dd4f411
children d8741d4dd05a
files tools/blktap/drivers/tapdisk.h tools/blktap/lib/blktaplib.h
line diff
     1.1 --- a/tools/blktap/drivers/tapdisk.h	Thu Mar 12 18:42:31 2009 +0000
     1.2 +++ b/tools/blktap/drivers/tapdisk.h	Thu Mar 12 18:42:59 2009 +0000
     1.3 @@ -161,15 +161,6 @@ extern struct tap_disk tapdisk_ram;
     1.4  extern struct tap_disk tapdisk_qcow;
     1.5  extern struct tap_disk tapdisk_qcow2;
     1.6  
     1.7 -#define MAX_DISK_TYPES     20
     1.8 -
     1.9 -#define DISK_TYPE_AIO      0
    1.10 -#define DISK_TYPE_SYNC     1
    1.11 -#define DISK_TYPE_VMDK     2
    1.12 -#define DISK_TYPE_RAM      3
    1.13 -#define DISK_TYPE_QCOW     4
    1.14 -#define DISK_TYPE_QCOW2    5
    1.15 -
    1.16  
    1.17  /*Define Individual Disk Parameters here */
    1.18  static disk_info_t aio_disk = {
     2.1 --- a/tools/blktap/lib/blktaplib.h	Thu Mar 12 18:42:31 2009 +0000
     2.2 +++ b/tools/blktap/lib/blktaplib.h	Thu Mar 12 18:42:59 2009 +0000
     2.3 @@ -210,6 +210,16 @@ typedef struct msg_pid {
     2.4  #define CTLMSG_PID         9
     2.5  #define CTLMSG_PID_RSP     10
     2.6  
     2.7 +/* disk driver types */
     2.8 +#define MAX_DISK_TYPES     20
     2.9 +
    2.10 +#define DISK_TYPE_AIO      0
    2.11 +#define DISK_TYPE_SYNC     1
    2.12 +#define DISK_TYPE_VMDK     2
    2.13 +#define DISK_TYPE_RAM      3
    2.14 +#define DISK_TYPE_QCOW     4
    2.15 +#define DISK_TYPE_QCOW2    5
    2.16 +
    2.17  /* xenstore/xenbus: */
    2.18  #define DOMNAME "Domain-0"
    2.19  int setup_probe_watch(struct xs_handle *h);