From patchwork Mon Nov 30 21:06:16 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 39859 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 312C91007D2 for ; Tue, 1 Dec 2009 08:09:00 +1100 (EST) Received: from localhost ([127.0.0.1]:33681 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFDUP-0002pD-7I for incoming@patchwork.ozlabs.org; Mon, 30 Nov 2009 16:08:57 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NFDRy-0001Ci-JJ for qemu-devel@nongnu.org; Mon, 30 Nov 2009 16:06:26 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NFDRt-000184-Kx for qemu-devel@nongnu.org; Mon, 30 Nov 2009 16:06:25 -0500 Received: from [199.232.76.173] (port=54021 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFDRt-00017l-HD for qemu-devel@nongnu.org; Mon, 30 Nov 2009 16:06:21 -0500 Received: from mx1.redhat.com ([209.132.183.28]:21697) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NFDRs-0003Y8-Qs for qemu-devel@nongnu.org; Mon, 30 Nov 2009 16:06:21 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nAUL6Ion004242 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 30 Nov 2009 16:06:18 -0500 Received: from blackpad.lan.raisama.net (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nAUL6HLJ022433; Mon, 30 Nov 2009 16:06:18 -0500 Received: by blackpad.lan.raisama.net (Postfix, from userid 500) id C2A9917FDA7; Mon, 30 Nov 2009 19:06:16 -0200 (BRST) From: Eduardo Habkost To: Anthony Liguori Date: Mon, 30 Nov 2009 19:06:16 -0200 Message-Id: <1259615176-13040-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH] monitor: make 'eject' work when there is no disk on the host drive 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 This patch 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() check has another bad side effect: a memory leak (and other potential problems caused by a missing bdrv_close() call), if the 'change' command is used multiple times when there is no disk on the host drive, 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 | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-) diff --git a/monitor.c b/monitor.c index 3286ba2..042aba5 100644 --- a/monitor.c +++ b/monitor.c @@ -554,19 +554,17 @@ 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)) { - monitor_printf(mon, "device is not removable\n"); - return -1; - } - if (bdrv_is_locked(bs)) { - monitor_printf(mon, "device is locked\n"); - return -1; - } + if (!force) { + if (!bdrv_is_removable(bs)) { + monitor_printf(mon, "device is not removable\n"); + return -1; + } + if (bdrv_is_locked(bs)) { + monitor_printf(mon, "device is locked\n"); + return -1; } - bdrv_close(bs); } + bdrv_close(bs); return 0; }