From patchwork Fri Dec 18 19:07:43 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 41425 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 4A2CD1007D1 for ; Sat, 19 Dec 2009 06:08:37 +1100 (EST) Received: from localhost ([127.0.0.1]:57648 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NLiBm-0000sx-Dq for incoming@patchwork.ozlabs.org; Fri, 18 Dec 2009 14:08:34 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NLiB6-0000q3-Lm for qemu-devel@nongnu.org; Fri, 18 Dec 2009 14:07:52 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NLiB1-0000gh-7m for qemu-devel@nongnu.org; Fri, 18 Dec 2009 14:07:51 -0500 Received: from [199.232.76.173] (port=33794 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NLiB1-0000ga-4Q for qemu-devel@nongnu.org; Fri, 18 Dec 2009 14:07:47 -0500 Received: from caiajhbdcahe.dreamhost.com ([208.97.132.74]:44669 helo=homiemail-a18.g.dreamhost.com) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NLiB0-00039i-Pe for qemu-devel@nongnu.org; Fri, 18 Dec 2009 14:07:46 -0500 Received: from blackpad.lan.raisama.net (201.86.14.223.dynamic.adsl.gvt.net.br [201.86.14.223]) by homiemail-a18.g.dreamhost.com (Postfix) with ESMTPA id 0224825006B; Fri, 18 Dec 2009 11:07:44 -0800 (PST) Received: by blackpad.lan.raisama.net (Postfix, from userid 500) id 4E03E17FE18; Fri, 18 Dec 2009 17:07:43 -0200 (BRST) From: Eduardo Habkost To: Anthony Liguori In-reply-to: <1259858001-1273-2-git-send-email-ehabkost@redhat.com> References: <1259858001-1273-1-git-send-email-ehabkost@redhat.com> <1259858001-1273-2-git-send-email-ehabkost@redhat.com> Date: Fri, 18 Dec 2009 17:07:43 -0200 Message-Id: <1261162670-sup-2248@blackpad.lan.raisama.net> User-Agent: Sup/git X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: Naphtali Sprei , qemu-devel , Luiz Capitulino Subject: [Qemu-devel] [PATCH v2 STABLE] 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 Rebasing previous patch to latest staging tree. For the master branch and stable-0.12. 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 0.11.50 monitor - type 'help' for more information (qemu) info block ide1-cd0: type=cdrom removable=1 locked=0 [not inserted] (qemu) change ide1-cd0 /mnt/common/images/smalldisk1.img (qemu) info block ide1-cd0: type=cdrom removable=1 locked=0 file=/mnt/common/images/smalldisk1.img ro=0 drv=raw encrypted=0 (qemu) eject ide1-cd0 (qemu) info block ide1-cd0: type=cdrom removable=1 locked=0 [not inserted] When using a file, eject works as expected. But when using a host cdrom device: (qemu) change ide1-cd0 /dev/cdrom (qemu) info block ide1-cd0: type=cdrom removable=1 locked=0 file=/dev/cdrom ro=0 drv=host_cdrom encrypted=0 (qemu) eject ide1-cd0 (qemu) info block ide1-cd0: type=cdrom removable=1 locked=0 file=/dev/cdrom ro=0 drv=host_cdrom encrypted=0 Eject didn't work because the is_inserted() check fails. 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() 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 96f7876..97fbe25 100644 --- a/monitor.c +++ b/monitor.c @@ -846,20 +846,18 @@ static void 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)) { - qemu_error_new(QERR_DEVICE_NOT_REMOVABLE, - bdrv_get_device_name(bs)); - return -1; - } - if (bdrv_is_locked(bs)) { - qemu_error_new(QERR_DEVICE_LOCKED, bdrv_get_device_name(bs)); - return -1; - } + if (!force) { + if (!bdrv_is_removable(bs)) { + qemu_error_new(QERR_DEVICE_NOT_REMOVABLE, + bdrv_get_device_name(bs)); + return -1; + } + if (bdrv_is_locked(bs)) { + qemu_error_new(QERR_DEVICE_LOCKED, bdrv_get_device_name(bs)); + return -1; } - bdrv_close(bs); } + bdrv_close(bs); return 0; }