mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

blockdev: fix cdrom read_only flag

Browse Source 
Since 0ebd24e0, cdrom doesn't have read-only on by default, which will
error out when using an read only image. Fix it by setting the default
value when parsing opts.

Reported-by: Edivaldo de Araujo Pereira <edivaldoapereira@yahoo.com.br>
Signed-off-by: Fam Zheng <famz@redhat.com>

Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Fam Zheng 2013-10-15 17:45:50 +08:00 committed by Stefan Hajnoczi
parent 794cbc26eb
commit a7fdbcf0e6
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
blockdev.c
View File

@ -625,7 +625,8 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type)
int cyls, heads, secs, translation; int cyls, heads, secs, translation;
int max_devs, bus_id, unit_id, index; int max_devs, bus_id, unit_id, index;
const char *devaddr; const char *devaddr;
bool read_only, copy_on_read; bool read_only = false;
bool copy_on_read;
Error *local_err = NULL; Error *local_err = NULL;
/* Change legacy command line options into QMP ones */ /* Change legacy command line options into QMP ones */
@ -701,7 +702,7 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type)
media = MEDIA_DISK; media = MEDIA_DISK;
} else if (!strcmp(value, "cdrom")) { } else if (!strcmp(value, "cdrom")) {
media = MEDIA_CDROM; media = MEDIA_CDROM;
qdict_put(bs_opts, "read-only", qstring_from_str("on")); read_only = true;
} else { } else {
error_report("'%s' invalid media", value); error_report("'%s' invalid media", value);
goto fail; goto fail;
@ -709,7 +710,7 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type)
} }
/* copy-on-read is disabled with a warning for read-only devices */ /* copy-on-read is disabled with a warning for read-only devices */
read_only = qemu_opt_get_bool(legacy_opts, "read-only", false); read_only |= qemu_opt_get_bool(legacy_opts, "read-only", false);
copy_on_read = qemu_opt_get_bool(legacy_opts, "copy-on-read", false); copy_on_read = qemu_opt_get_bool(legacy_opts, "copy-on-read", false);
if (read_only && copy_on_read) { if (read_only && copy_on_read) {