aboutsummaryrefslogtreecommitdiffstats
path: root/tools/libxl/libxlu_disk_l.h
diff options
context:
space:
mode:
authorIan Campbell <ian.campbell@citrix.com>2012-07-26 10:35:35 +0100
committerIan Campbell <ian.campbell@citrix.com>2012-07-26 10:35:35 +0100
commit79702808336453e6ec75777ea94f01027d439ebd (patch)
treeb6d7941b4a0cfaaf9cf546055d415eed96c9471c /tools/libxl/libxlu_disk_l.h
parent214825a938dc04280f42efec9c2341e547c47890 (diff)
downloadxen-79702808336453e6ec75777ea94f01027d439ebd.tar.gz
xen-79702808336453e6ec75777ea94f01027d439ebd.tar.bz2
xen-79702808336453e6ec75777ea94f01027d439ebd.zip
xl: support empty CDROM devices
The important change here is to xlu_disk_parse to correctly set format == EMPTY for CDROM devices which are empty. Test cases are added which check for correctness here. xend accepts ',hdc:cdrom,r'[0] as an empty CDROM drive however this is not consistent with the xl syntax in docs/misc/xl-disk-configuration.txt which requires ',,hdc:cdrom,r' (the additional positional paramter is the format). I'm not sure if/how this can be fixed. Note that xend does not accept ',,hdc:cdrom,r' There are several incidental cleanups included the the cdrom-{insert,eject} commands: - add a dry-run mode - use the non-deprecated disk specification syntax - check for and report errors from libxl_cdrom_insert [0] http://wiki.xen.org/wiki/CD_Rom_Support_in_Xen Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com> Committed-by: Ian Campbell <ian.campbell@citrix.com>
Diffstat (limited to 'tools/libxl/libxlu_disk_l.h')
-rw-r--r--tools/libxl/libxlu_disk_l.h10
1 files changed, 1 insertions, 9 deletions
diff --git a/tools/libxl/libxlu_disk_l.h b/tools/libxl/libxlu_disk_l.h
index a3fbd727e9..87bf96c6d6 100644
--- a/tools/libxl/libxlu_disk_l.h
+++ b/tools/libxl/libxlu_disk_l.h
@@ -340,16 +340,8 @@ extern int xlu__disk_yylex (yyscan_t yyscanner);
#undef YY_DECL
#endif
-#line 227 "libxlu_disk_l.l"
+#line 228 "libxlu_disk_l.l"
#line 346 "libxlu_disk_l.h"
#undef xlu__disk_yyIN_HEADER
#endif /* xlu__disk_yyHEADER_H */
-
-/*
- * Local variables:
- * mode: C
- * c-basic-offset: 4
- * indent-tabs-mode: nil
- * End:
- */