From 2db7ad59fc51ac948a0574bea00bfe389b624e8b Mon Sep 17 00:00:00 2001 From: Naphtali Sprei Date: Tue, 23 Mar 2010 12:17:16 +0200 Subject: [PATCH] read-only: allow read-only CDROM with any interface Signed-off-by: Naphtali Sprei Signed-off-by: Aurelien Jarno --- vl.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/vl.c b/vl.c index 6768cf1251..2306acee2a 100644 --- a/vl.c +++ b/vl.c @@ -1185,19 +1185,16 @@ DriveInfo *drive_init(QemuOpts *opts, void *opaque, bdrv_flags &= ~BDRV_O_NATIVE_AIO; } - if (ro == 1) { + if (media == MEDIA_CDROM) { + /* CDROM is fine for any interface, don't check. */ + ro = 1; + } else if (ro == 1) { if (type != IF_SCSI && type != IF_VIRTIO && type != IF_FLOPPY) { fprintf(stderr, "qemu: readonly flag not supported for drive with this interface\n"); return NULL; } } - /* - * cdrom is read-only. Set it now, after above interface checking - * since readonly attribute not explicitly required, so no error. - */ - if (media == MEDIA_CDROM) { - ro = 1; - } + bdrv_flags |= ro ? 0 : BDRV_O_RDWR; if (bdrv_open2(dinfo->bdrv, file, bdrv_flags, drv) < 0) {