From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=56556 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OW7BP-0003Ry-P6 for qemu-devel@nongnu.org; Tue, 06 Jul 2010 08:23:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OW6xQ-0003Hs-38 for qemu-devel@nongnu.org; Tue, 06 Jul 2010 08:09:02 -0400 Received: from oxygen.pond.sub.org ([213.239.205.148]:38889) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OW6xP-0003Gu-UI for qemu-devel@nongnu.org; Tue, 06 Jul 2010 08:09:00 -0400 From: Markus Armbruster Date: Tue, 6 Jul 2010 14:08:44 +0200 Message-Id: <1278418136-24556-2-git-send-email-armbru@redhat.com> In-Reply-To: <1278418136-24556-1-git-send-email-armbru@redhat.com> References: <1278418136-24556-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v2 01/13] 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: qemu-devel@nongnu.org Cc: kwolf@redhat.com, kraxel@redhat.com, hch@lst.de 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 --- blockdev.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/blockdev.c b/blockdev.c index cecde2b..cca3eec 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