From patchwork Thu Aug 2 01:32:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Shanahan X-Patchwork-Id: 174635 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A90C52C0090 for ; Thu, 2 Aug 2012 11:33:16 +1000 (EST) Received: from localhost ([::1]:35270 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwkHq-0008SM-Oi for incoming@patchwork.ozlabs.org; Wed, 01 Aug 2012 21:33:14 -0400 Received: from eggs.gnu.org ([208.118.235.92]:49781) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwkHj-0008Rs-CS for qemu-devel@nongnu.org; Wed, 01 Aug 2012 21:33:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SwkHi-0004KO-8F for qemu-devel@nongnu.org; Wed, 01 Aug 2012 21:33:07 -0400 Received: from ipmail06.adl2.internode.on.net ([150.101.137.129]:9964) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwkHh-0004Jc-Sc for qemu-devel@nongnu.org; Wed, 01 Aug 2012 21:33:06 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AmIKAFTYGVB20ggz/2dsb2JhbABFhRKyfAOBBIEIgk4THCNPJhgNN4gMDL1PBIxJgm2CPGADiEuMewGQDYJv Received: from ppp118-210-8-51.lns20.adl2.internode.on.net (HELO mail.disenchant.local) ([118.210.8.51]) by ipmail06.adl2.internode.on.net with ESMTP; 02 Aug 2012 11:02:44 +0930 Received: by mail.disenchant.local (Postfix, from userid 1000) id C1847A1608; Thu, 2 Aug 2012 11:02:42 +0930 (CST) Date: Thu, 2 Aug 2012 11:02:42 +0930 From: Kevin Shanahan To: qemu-devel@nongnu.org Message-ID: <20120802013242.GA18298@tuon.disenchant.local> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 150.101.137.129 Cc: Kevin Wolf Subject: [Qemu-devel] [PATCH] block: Set cdrom device read only flag X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Set the block driver read_only flag for cdrom devices so that qmp_change_blockdev does not attempt to open cdrom files in read-write mode when changing media. Signed-off-by: Kevin Shanahan --- Proposed fix for https://bugs.launchpad.net/qemu/+bug/1027525 diff -urN qemu-kvm-1.1.1.orig/blockdev.c qemu-kvm-1.1.1/blockdev.c --- qemu-kvm-1.1.1.orig/blockdev.c 2012-07-16 17:22:03.000000000 +0930 +++ qemu-kvm-1.1.1/blockdev.c 2012-08-02 10:28:40.000000000 +0930 @@ -565,6 +565,7 @@ break; case MEDIA_CDROM: dinfo->media_cd = 1; + dinfo->bdrv->read_only = 1; break; } break;