From: Ian Jackson <Ian.Jackson@eu.citrix.com>
Date: Fri, 11 Mar 2011 18:35:15 +0000 (+0000)
Subject: libxl: do not try to use blktap with qdisk
X-Git-Tag: 4.1.0-rc7~9
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=d455a63109a8c34b67d566d98a63926c0cb1b8e1;p=people%2Fvhanquez%2Fxen.git

libxl: do not try to use blktap with qdisk

libxl_device_disk_add tries to use blktap when available even for qdisk
devices, this patch fixes it.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>

(cherry-picked from xen-unstable
 changeset a8fee4ad3ad0650e7a5cc0fb253c6a0ada1ac583)
---

diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
index 6df2f78be..73f155c70 100644
--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
@@ -966,7 +966,6 @@ int libxl_device_disk_add(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *dis
             device.backend_kind = DEVICE_VBD;
             break;
         case DISK_BACKEND_TAP:
-        case DISK_BACKEND_QDISK: 
             if (libxl__blktap_enabled(&gc) && disk->format != DISK_FORMAT_EMPTY) {
                 const char *dev = libxl__blktap_devpath(&gc,
                                                disk->pdev_path, disk->format);
@@ -988,6 +987,7 @@ int libxl_device_disk_add(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *dis
 
                 break;
             }
+        case DISK_BACKEND_QDISK: 
             flexarray_append(back, "params");
             flexarray_append(back, libxl__sprintf(&gc, "%s:%s",
                           libxl__device_disk_string_of_format(disk->format), disk->pdev_path));