diff options
author | Ian Campbell <ian.campbell@citrix.com> | 2012-07-26 10:35:35 +0100 |
---|---|---|
committer | Ian Campbell <ian.campbell@citrix.com> | 2012-07-26 10:35:35 +0100 |
commit | 79702808336453e6ec75777ea94f01027d439ebd (patch) | |
tree | b6d7941b4a0cfaaf9cf546055d415eed96c9471c /tools/libxl/xl_cmdtable.c | |
parent | 214825a938dc04280f42efec9c2341e547c47890 (diff) | |
download | xen-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/xl_cmdtable.c')
-rw-r--r-- | tools/libxl/xl_cmdtable.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/libxl/xl_cmdtable.c b/tools/libxl/xl_cmdtable.c index f0a88c2b51..85ea768909 100644 --- a/tools/libxl/xl_cmdtable.c +++ b/tools/libxl/xl_cmdtable.c @@ -174,12 +174,12 @@ struct cmd_spec cmd_table[] = { "- for internal use only", }, { "cd-insert", - &main_cd_insert, 0, 1, + &main_cd_insert, 1, 1, "Insert a cdrom into a guest's cd drive", "<Domain> <VirtualDevice> <type:path>", }, { "cd-eject", - &main_cd_eject, 0, 1, + &main_cd_eject, 1, 1, "Eject a cdrom from a guest's cd drive", "<Domain> <VirtualDevice>", }, |