From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=39322 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OWA9V-0006Ko-W4 for qemu-devel@nongnu.org; Tue, 06 Jul 2010 11:33:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OWA9T-00006a-6S for qemu-devel@nongnu.org; Tue, 06 Jul 2010 11:33:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39216) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OWA9S-00006T-Pe for qemu-devel@nongnu.org; Tue, 06 Jul 2010 11:33:39 -0400 From: Kevin Wolf Date: Tue, 6 Jul 2010 17:33:13 +0200 Message-Id: <1278430406-18667-5-git-send-email-kwolf@redhat.com> In-Reply-To: <1278430406-18667-1-git-send-email-kwolf@redhat.com> References: <1278430406-18667-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 04/17] blockdev: Clean up how readonly persists across virtual media change List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Markus Armbruster Since commit cb4e5f8e, monitor command change makes the new media readonly iff the type hint is BDRV_TYPE_CDROM, i.e. the drive was created with media=cdrom. The intention is to avoid changing a block device's read-only-ness. However, BDRV_TYPE_CDROM is only a hint. It is currently sufficent for read-only. But it's not necessary, and it may not remain sufficient. Use bdrv_is_read_only() instead. Signed-off-by: Markus Armbruster Signed-off-by: Kevin Wolf --- blockdev.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/blockdev.c b/blockdev.c index be88098..0a9dec3 100644 --- a/blockdev.c +++ b/blockdev.c @@ -589,7 +589,7 @@ int do_change_block(Monitor *mon, const char *device, if (eject_device(mon, bs, 0) < 0) { return -1; } - bdrv_flags = bdrv_get_type_hint(bs) == BDRV_TYPE_CDROM ? 0 : BDRV_O_RDWR; + bdrv_flags = bdrv_is_read_only(bs) ? 0 : BDRV_O_RDWR; if (bdrv_open(bs, filename, bdrv_flags, drv) < 0) { qerror_report(QERR_OPEN_FILE_FAILED, filename); return -1; -- 1.6.6.1