aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Jackson <Ian.Jackson@eu.citrix.com>2011-03-11 18:35:15 +0000
committerIan Jackson <Ian.Jackson@eu.citrix.com>2011-03-11 18:35:15 +0000
commitb83b661c0eba095a6696dda9db15b5306b8d2325 (patch)
treee9eefc550991d5071fb51f263756754eeb774b92
parente91080a5a78c1f51fe887e2151c04d6a5c5d584d (diff)
downloadxen-b83b661c0eba095a6696dda9db15b5306b8d2325.tar.gz
xen-b83b661c0eba095a6696dda9db15b5306b8d2325.tar.bz2
xen-b83b661c0eba095a6696dda9db15b5306b8d2325.zip
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)
-rw-r--r--tools/libxl/libxl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
index 6df2f78be7..73f155c700 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));