xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Ian Campbell <ian.campbell@citrix.com>
To: xen-devel@lists.xensource.com
Cc: Ian Campbell <ian.campbell@citrix.com>
Subject: [PATCH 4 of 7] libxl: only a CDROM type disk can be empty
Date: Thu, 07 Apr 2011 10:52:30 +0100	[thread overview]
Message-ID: <cbf6ec01faef6502845d.1302169950@localhost.localdomain> (raw)
In-Reply-To: <patchbomb.1302169946@localhost.localdomain>

# HG changeset patch
# User Ian Campbell <ian.campbell@citrix.com>
# Date 1302167211 -3600
# Node ID cbf6ec01faef6502845d8201a717edc9fa6fae52
# Parent  f5418873be3d097cbb374009898ce9c74255e047
libxl: only a CDROM type disk can be empty.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>

diff -r f5418873be3d -r cbf6ec01faef tools/libxl/libxl.c
--- a/tools/libxl/libxl.c	Thu Apr 07 10:06:36 2011 +0100
+++ b/tools/libxl/libxl.c	Thu Apr 07 10:06:51 2011 +0100
@@ -908,8 +908,13 @@ static int validate_virtual_disk(libxl__
     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, ':');

  parent reply	other threads:[~2011-04-07  9:52 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-04-07  9:52 [PATCH 0 of 7] libxl: refactor tap disk handling Ian Campbell
2011-04-07  9:52 ` [PATCH 1 of 7] libxl: remove impossible check for backend != DISK_BACKEND_QDISK Ian Campbell
2011-04-07  9:52 ` [PATCH 2 of 7] libxl: make fallback from blktap2 to qdisk more explicit Ian Campbell
2011-04-07  9:52 ` [PATCH 3 of 7] libxl: convert an empty tap disk into a qdisk Ian Campbell
2011-04-07  9:52 ` Ian Campbell [this message]
2011-04-07  9:52 ` [PATCH 5 of 7] libxl: refactor DISK_BACKEND_PHY handling in libxl_device_disk_add Ian Campbell
2011-04-07  9:52 ` [PATCH 6 of 7] libxl: handle the tail end of a tap device using the phy backend handling code Ian Campbell
2011-04-07  9:52 ` [PATCH 7 of 7] libxl: Drop internal DEVICE_TAP backend type Ian Campbell
2011-04-08 15:46   ` Ian Jackson
2011-04-07 12:31 ` [PATCH 0 of 7] libxl: refactor tap disk handling Christoph Egger
2011-04-07 14:12   ` Ian Campbell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=cbf6ec01faef6502845d.1302169950@localhost.localdomain \
    --to=ian.campbell@citrix.com \
    --cc=xen-devel@lists.xensource.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).