Revert "libxl: No emulated disk driver for xvdX disk"

This reverts c0c099d157cc5bc942afef766cf141628a6380a1.

That commit causes regression on the semantics of our diskspec.
See [0] for more information.

[0] http://lists.xen.org/archives/html/xen-devel/2016-05/msg02876.html

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c
index 155a65307ffc8e996c81c83cb2aa7d1e7d49177a..6ff05c315fce371a42a5e5fd4e7abb6b78d94edf 100644 (file)
--- a/tools/libxl/libxl_dm.c
+++ b/tools/libxl/libxl_dm.c
@@ -1422,12 +1422,6 @@ static int libxl__build_device_model_args_new(libxl__gc *gc,
                                                         format,
                                                         &disks[i],
                                                         colo_mode);
-                } else if (strncmp(disks[i].vdev, "xvd", 3) == 0) {
-                    /*
-                     * Do not add any emulated disk when PV disk are
-                     * explicitly asked for.
-                     */
-                    continue;
                 } else if (disk < 6 && b_info->u.hvm.hdtype == LIBXL_HDTYPE_AHCI) {
                     if (!disks[i].readwrite) {
                         LOG(ERROR, "qemu-xen doesn't support read-only AHCI disk drivers");