diff options
Diffstat (limited to 'tools/blktap/drivers/tapdisk.h')
| -rw-r--r-- | tools/blktap/drivers/tapdisk.h | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/tools/blktap/drivers/tapdisk.h b/tools/blktap/drivers/tapdisk.h index 22450ff03b..38f3c40fa6 100644 --- a/tools/blktap/drivers/tapdisk.h +++ b/tools/blktap/drivers/tapdisk.h @@ -145,6 +145,8 @@ typedef struct disk_info { char handle[10]; /* xend handle, e.g. 'ram' */ int single_handler; /* is there a single controller for all */ /* instances of disk type? */ + int use_ioemu; /* backend provider: 0 = tapdisk; 1 = ioemu */ + #ifdef TAPDISK struct tap_disk *drv; #endif @@ -167,7 +169,6 @@ extern struct tap_disk tapdisk_qcow2; #define DISK_TYPE_RAM 3 #define DISK_TYPE_QCOW 4 #define DISK_TYPE_QCOW2 5 -#define DISK_TYPE_IOEMU 6 /*Define Individual Disk Parameters here */ @@ -176,6 +177,7 @@ static disk_info_t aio_disk = { "raw image (aio)", "aio", 0, + 0, #ifdef TAPDISK &tapdisk_aio, #endif @@ -186,6 +188,7 @@ static disk_info_t sync_disk = { "raw image (sync)", "sync", 0, + 0, #ifdef TAPDISK &tapdisk_sync, #endif @@ -196,6 +199,7 @@ static disk_info_t vmdk_disk = { "vmware image (vmdk)", "vmdk", 1, + 0, #ifdef TAPDISK &tapdisk_vmdk, #endif @@ -206,6 +210,7 @@ static disk_info_t ram_disk = { "ramdisk image (ram)", "ram", 1, + 0, #ifdef TAPDISK &tapdisk_ram, #endif @@ -216,6 +221,7 @@ static disk_info_t qcow_disk = { "qcow disk (qcow)", "qcow", 0, + 0, #ifdef TAPDISK &tapdisk_qcow, #endif @@ -226,21 +232,12 @@ static disk_info_t qcow2_disk = { "qcow2 disk (qcow2)", "qcow2", 0, + 0, #ifdef TAPDISK &tapdisk_qcow2, #endif }; -static disk_info_t ioemu_disk = { - DISK_TYPE_IOEMU, - "ioemu disk", - "ioemu", - 1, -#ifdef TAPDISK - NULL -#endif -}; - /*Main disk info array */ static disk_info_t *dtypes[] = { &aio_disk, @@ -249,7 +246,6 @@ static disk_info_t *dtypes[] = { &ram_disk, &qcow_disk, &qcow2_disk, - &ioemu_disk, }; typedef struct driver_list_entry { |