From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43675) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VUeJf-0000v0-F0 for qemu-devel@nongnu.org; Fri, 11 Oct 2013 11:07:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VUeJZ-0005zJ-6u for qemu-devel@nongnu.org; Fri, 11 Oct 2013 11:07:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50101) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VUeJY-0005z9-VG for qemu-devel@nongnu.org; Fri, 11 Oct 2013 11:07:41 -0400 From: Kevin Wolf Date: Fri, 11 Oct 2013 17:05:46 +0200 Message-Id: <1381503951-27985-57-git-send-email-kwolf@redhat.com> In-Reply-To: <1381503951-27985-1-git-send-email-kwolf@redhat.com> References: <1381503951-27985-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 56/61] blockdev: Remove 'media' parameter from blockdev_init() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org The remaining users shouldn't be there with blockdev-add and are easy to move to drive_init(). Bonus bug fix: As a side effect, CD-ROM drives can now use block drivers on the read-only whitelist without explicitly specifying read-only=on, even if a format is explicitly specified. Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz Reviewed-by: Eric Blake --- blockdev.c | 40 +++++++++++++++------------------------- 1 file changed, 15 insertions(+), 25 deletions(-) diff --git a/blockdev.c b/blockdev.c index 401ee25..e1ad319 100644 --- a/blockdev.c +++ b/blockdev.c @@ -309,8 +309,7 @@ typedef enum { MEDIA_DISK, MEDIA_CDROM } DriveMediaType; /* Takes the ownership of bs_opts */ static DriveInfo *blockdev_init(QDict *bs_opts, - BlockInterfaceType type, - DriveMediaType media) + BlockInterfaceType type) { const char *buf; const char *file = NULL; @@ -488,22 +487,6 @@ static DriveInfo *blockdev_init(QDict *bs_opts, bdrv_set_io_limits(dinfo->bdrv, &cfg); } - switch(type) { - case IF_IDE: - case IF_SCSI: - case IF_XEN: - case IF_NONE: - dinfo->media_cd = media == MEDIA_CDROM; - break; - case IF_SD: - case IF_FLOPPY: - case IF_PFLASH: - case IF_MTD: - case IF_VIRTIO: - break; - default: - abort(); - } if (!file || !*file) { if (has_driver_specific_opts) { file = NULL; @@ -525,11 +508,6 @@ static DriveInfo *blockdev_init(QDict *bs_opts, bdrv_flags |= BDRV_O_INCOMING; } - if (media == MEDIA_CDROM) { - /* CDROM is fine for any interface, don't check. */ - ro = 1; - } - bdrv_flags |= ro ? 0 : BDRV_O_RDWR; if (ro && copy_on_read) { @@ -713,6 +691,7 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type) media = MEDIA_DISK; } else if (!strcmp(value, "cdrom")) { media = MEDIA_CDROM; + qdict_put(bs_opts, "read-only", qstring_from_str("on")); } else { error_report("'%s' invalid media", value); goto fail; @@ -860,7 +839,7 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type) } /* Actual block device init: Functionality shared with blockdev-add */ - dinfo = blockdev_init(bs_opts, type, media); + dinfo = blockdev_init(bs_opts, type); if (dinfo == NULL) { goto fail; } @@ -878,6 +857,17 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type) dinfo->unit = unit_id; dinfo->devaddr = devaddr; + switch(type) { + case IF_IDE: + case IF_SCSI: + case IF_XEN: + case IF_NONE: + dinfo->media_cd = media == MEDIA_CDROM; + break; + default: + break; + } + fail: qemu_opts_del(legacy_opts); return dinfo; @@ -2176,7 +2166,7 @@ void qmp_blockdev_add(BlockdevOptions *options, Error **errp) qdict_flatten(qdict); - dinfo = blockdev_init(qdict, IF_NONE, MEDIA_DISK); + dinfo = blockdev_init(qdict, IF_NONE); if (!dinfo) { error_setg(errp, "Could not open image"); goto fail; -- 1.8.1.4