From: Ian Campbell <ian.campbell@citrix.com>
Date: Fri, 8 Apr 2011 15:39:19 +0000 (+0100)
Subject: libxl: only a CDROM type disk can be empty.
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=44714d9fb796f13c8854aba9d6fdf1d32cb0432f;p=xen.git

libxl: only a CDROM type disk can be empty.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
---

diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
index 4f6cb8b157..80660dccb7 100644
--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
@@ -908,8 +908,13 @@ static int validate_virtual_disk(libxl__gc *gc, char *file_name,
     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, ':');