diff options
author | George Dunlap <george.dunlap@eu.citrix.com> | 2013-05-14 11:07:14 +0100 |
---|---|---|
committer | Ian Campbell <ian.campbell@citrix.com> | 2013-05-30 09:10:51 +0100 |
commit | 121dac93afd2f600485618d9b493892e2fca8fa8 (patch) | |
tree | da81e7c5fcb1910ee15c55accb47efefeb94e016 /tools/libxl | |
parent | 1ecd5e015d67837bb094e9e8921dca4e90578f8a (diff) | |
download | xen-121dac93afd2f600485618d9b493892e2fca8fa8.tar.gz xen-121dac93afd2f600485618d9b493892e2fca8fa8.tar.bz2 xen-121dac93afd2f600485618d9b493892e2fca8fa8.zip |
xl: Return an error if an empty file is passed to cd-insert
Two changes:
* Stat the file before calling libxl_cdrom_insert()
* Return an error if anything fails (including libxl_cdrom_insert)
This is in part to work around the fact that the RAW disk type
is used for things that aren't actually files; so we can't call
stat in libxl_device.c:libxl__device_disk_set_backend() because
it may be going over a remote protocol.
Signed-off-by: George Dunlap <george.dunlap@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Diffstat (limited to 'tools/libxl')
-rw-r--r-- | tools/libxl/xl_cmdimpl.c | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index e13a64e4ee..c5292f40f7 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -2505,25 +2505,45 @@ int main_memset(int argc, char **argv) return 0; } -static void cd_insert(uint32_t domid, const char *virtdev, char *phys) +static int cd_insert(uint32_t domid, const char *virtdev, char *phys) { libxl_device_disk disk; /* we don't free disk's contents */ char *buf = NULL; XLU_Config *config = 0; + struct stat b; + int rc = 0; if (asprintf(&buf, "vdev=%s,access=r,devtype=cdrom,target=%s", virtdev, phys ? phys : "") < 0) { fprintf(stderr, "out of memory\n"); - return; + rc = 1; + goto out; } parse_disk_config(&config, buf, &disk); - libxl_cdrom_insert(ctx, domid, &disk, NULL); + /* ATM the existence of the backing file is not checked for qdisk + * in libxl_cdrom_insert() because RAW is used for remote + * protocols as well as plain files. This will ideally be changed + * for 4.4, but this work-around fixes the problem of "cd-insert" + * returning success for non-existent files. */ + if (disk.format != LIBXL_DISK_FORMAT_EMPTY + && stat(disk.pdev_path, &b)) { + fprintf(stderr, "Cannot stat file: %s\n", + disk.pdev_path); + rc = 1; + goto out; + } + + if (libxl_cdrom_insert(ctx, domid, &disk, NULL)) + rc=1; +out: libxl_device_disk_dispose(&disk); free(buf); + + return rc; } int main_cd_eject(int argc, char **argv) @@ -2539,8 +2559,7 @@ int main_cd_eject(int argc, char **argv) domid = find_domain(argv[optind]); virtdev = argv[optind + 1]; - cd_insert(domid, virtdev, NULL); - return 0; + return cd_insert(domid, virtdev, NULL); } int main_cd_insert(int argc, char **argv) |