From patchwork Tue Jun 1 22:12:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 54332 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 45428B7D24 for ; Wed, 2 Jun 2010 08:32:51 +1000 (EST) Received: from localhost ([127.0.0.1]:46285 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OJa0u-00056c-OO for incoming@patchwork.ozlabs.org; Tue, 01 Jun 2010 18:32:48 -0400 Received: from [140.186.70.92] (port=50665 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OJZxT-0002bB-Sk for qemu-devel@nongnu.org; Tue, 01 Jun 2010 18:29:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OJZhL-0000jV-Hu for qemu-devel@nongnu.org; Tue, 01 Jun 2010 18:12:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:11503) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OJZhL-0000ie-6W for qemu-devel@nongnu.org; Tue, 01 Jun 2010 18:12:35 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o51MCVZB007791 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 1 Jun 2010 18:12:31 -0400 Received: from blackpad.lan.raisama.net (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o51MCSkj018805 for ; Tue, 1 Jun 2010 18:12:28 -0400 Received: by blackpad.lan.raisama.net (Postfix, from userid 500) id 0549C17F6CF; Tue, 1 Jun 2010 19:12:20 -0300 (BRT) Date: Tue, 1 Jun 2010 19:12:19 -0300 From: Eduardo Habkost To: qemu-devel@nongnu.org Message-ID: <20100601221219.GB13961@blackpad.lan.raisama.net> Mail-Followup-To: qemu-devel@nongnu.org MIME-Version: 1.0 Content-Disposition: inline X-Fnord: you can see the fnord User-Agent: Mutt/1.5.19 (2009-01-05) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH] monitor: allow device to be ejected if no disk is inserted X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Resubmitting a patch that was submitted in December[1]. It was on the staging tree but somehow it got dropped. I have rebased it to current master branch on git. [1] http://article.gmane.org/gmane.comp.emulators.qemu/59813 -------- This changes the monitor eject_device() function to not check for bdrv_is_inserted(). Example run where the bug manifests itself: (output of 'info block' is stripped to include only the CD-ROM device) (qemu) info block ide1-cd0: type=cdrom removable=1 locked=0 [not inserted] (qemu) change ide1-cd0 /dev/cdrom host_cdrom (qemu) info block ide1-cd0: type=cdrom removable=1 locked=0 file=/dev/cdrom ro=1 drv=host_cdrom encrypted=0 (qemu) eject ide1-cd0 (qemu) info block ide1-cd0: type=cdrom removable=1 locked=0 file=/dev/cdrom ro=1 drv=host_cdrom encrypted=0 # at this point, a disk was inserted on the host CD-ROM drive (qemu) info block ide1-cd0: type=cdrom removable=1 locked=0 file=/dev/cdrom ro=1 drv=host_cdrom encrypted=0 (qemu) eject ide1-cd0 (qemu) info block ide1-cd0: type=cdrom removable=1 locked=0 [not inserted] (qemu) The first eject command didn't work because the is_inserted() check failed. I have no clue why the code had the is_inserted() check, as it doesn't matter if there is a disk present at the host drive, when the user wants the virtual device to be disconnected from the host device. The is_inserted() check has another side effect: a memory leak if the "change" command is used multiple times, as do_change() calls eject_device() before re-opening the block device, but bdrv_close() is never called. Signed-off-by: Eduardo Habkost --- monitor.c | 22 ++++++++++------------ 1 files changed, 10 insertions(+), 12 deletions(-) diff --git a/monitor.c b/monitor.c index 15b53b9..57c355a 100644 --- a/monitor.c +++ b/monitor.c @@ -951,20 +951,18 @@ static int do_quit(Monitor *mon, const QDict *qdict, QObject **ret_data) static int eject_device(Monitor *mon, BlockDriverState *bs, int force) { - if (bdrv_is_inserted(bs)) { - if (!force) { - if (!bdrv_is_removable(bs)) { - qerror_report(QERR_DEVICE_NOT_REMOVABLE, - bdrv_get_device_name(bs)); - return -1; - } - if (bdrv_is_locked(bs)) { - qerror_report(QERR_DEVICE_LOCKED, bdrv_get_device_name(bs)); - return -1; - } + if (!force) { + if (!bdrv_is_removable(bs)) { + qerror_report(QERR_DEVICE_NOT_REMOVABLE, + bdrv_get_device_name(bs)); + return -1; + } + if (bdrv_is_locked(bs)) { + qerror_report(QERR_DEVICE_LOCKED, bdrv_get_device_name(bs)); + return -1; } - bdrv_close(bs); } + bdrv_close(bs); return 0; }