[Xen-changelog] [xen-unstable] libxl: only a CDROM type disk can be empty.

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1302277159 -3600
# Node ID 4b0fa61585849a32fda98a88a659b3bfbe38a769
# Parent  d9d8e0ceaf46a43bf149d50295c51ad40a58ce7e
libxl: only a CDROM type disk can be empty.

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---


diff -r d9d8e0ceaf46 -r 4b0fa6158584 tools/libxl/libxl.c
--- a/tools/libxl/libxl.c       Fri Apr 08 16:38:59 2011 +0100
+++ b/tools/libxl/libxl.c       Fri Apr 08 16:39:19 2011 +0100
@@ -908,8 +908,13 @@
     struct stat stat_buf;
     char *delimiter;
 
-    if (disk->format == DISK_FORMAT_EMPTY)
-        return 0;
+    if (disk->format == DISK_FORMAT_EMPTY) {
+        if (disk->is_cdrom)
+            return 0;
+        LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Empty disk %s is not a CDROM 
device\n",
+                   disk->vdev);
+        return ERROR_INVAL;
+    }
 
     if (disk->format == DISK_FORMAT_RAW) {
         delimiter = strchr(file_name, ':');

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog