[PATCH for-4.7] Revert "libxl: No emulated disk driver for xvdX disk"

[Wei Liu <wei.liu2@citrix.com>]

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>
---
Please review carefully about this patch. There are one commit that is
of interest: ef6cb76026628e26e3d1ae53c50ccde1c3c78b1b

I believe the reverting the snippet in question won't cause security
issue as described in XSA-142, because the code to create IDE disk still
checks if the disk is read-only.
---
 tools/libxl/libxl_dm.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c
index 155a653..6ff05c3 100644
--- 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");
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel