From patchwork Thu Mar 31 19:44:08 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Shah X-Patchwork-Id: 89124 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 45EA1B6F07 for ; Fri, 1 Apr 2011 06:47:17 +1100 (EST) Received: from localhost ([127.0.0.1]:35424 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q5Npq-0008Vk-CX for incoming@patchwork.ozlabs.org; Thu, 31 Mar 2011 15:47:14 -0400 Received: from [140.186.70.92] (port=56560 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q5NnJ-0007Ub-Mv for qemu-devel@nongnu.org; Thu, 31 Mar 2011 15:44:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q5NnI-0001gL-GM for qemu-devel@nongnu.org; Thu, 31 Mar 2011 15:44:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47836) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q5NnI-0001fz-5h for qemu-devel@nongnu.org; Thu, 31 Mar 2011 15:44:36 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p2VJiXnP026997 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 31 Mar 2011 15:44:33 -0400 Received: from localhost (ovpn-113-107.phx2.redhat.com [10.3.113.107]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p2VJiUFj001930; Thu, 31 Mar 2011 15:44:32 -0400 From: Amit Shah To: qemu list Date: Fri, 1 Apr 2011 01:14:08 +0530 Message-Id: In-Reply-To: <2a24c3a3e75c383de13b87d064fb958ea9f268ff.1301600598.git.amit.shah@redhat.com> References: <20110331095325.GA13226@amit-x200.redhat.com> <2a24c3a3e75c383de13b87d064fb958ea9f268ff.1301600598.git.amit.shah@redhat.com> In-Reply-To: <2a24c3a3e75c383de13b87d064fb958ea9f268ff.1301600598.git.amit.shah@redhat.com> References: <2a24c3a3e75c383de13b87d064fb958ea9f268ff.1301600598.git.amit.shah@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Gleb Natapov , Juan Quintela , Stefan Hajnoczi , Markus Armbruster , Amit Shah Subject: [Qemu-devel] [RFC PATCH 3/3] atapi: Allow GET_EVENT_STATUS_NOTIFICATION and TEST_UNIT_READY after media change 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 After a media change, the only commands allowed from the guest were REQUEST_SENSE and INQUIRY. The guest may also issue GET_EVENT_STATUS_NOTIFICATION and TEST_UNIT_READY commands to get media changed notification. Enable those commands. After this, the HSM violation messages from Linux guests aren't seen. Signed-off-by: Amit Shah --- hw/ide/core.c | 28 +++++++++++++++++++++------- 1 files changed, 21 insertions(+), 7 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index 89e212b..362a258 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -625,6 +625,14 @@ void ide_atapi_cmd_ok(IDEState *s) ide_set_irq(s->bus); } +static void ide_atapi_cmd_ua(IDEState *s) +{ + s->sense_key = SENSE_UNIT_ATTENTION; + s->asc = ASC_MEDIUM_MAY_HAVE_CHANGED; + ide_atapi_cmd_ok(s); + s->sense_key = SENSE_NONE; +} + void ide_atapi_cmd_error(IDEState *s, int sense_key, int asc) { #ifdef DEBUG_IDE_ATAPI @@ -1243,20 +1251,26 @@ static void ide_atapi_cmd(IDEState *s) /* If there's a UNIT_ATTENTION condition pending, only REQUEST_SENSE and INQUIRY commands are allowed to complete. */ if (s->sense_key == SENSE_UNIT_ATTENTION && - s->io_buffer[0] != GPCMD_REQUEST_SENSE && - s->io_buffer[0] != GPCMD_INQUIRY) { - ide_atapi_cmd_check_status(s); - return; + s->io_buffer[0] != GPCMD_REQUEST_SENSE && + s->io_buffer[0] != GPCMD_INQUIRY && + s->io_buffer[0] != GPCMD_GET_EVENT_STATUS_NOTIFICATION && + s->io_buffer[0] != GPCMD_TEST_UNIT_READY) { + ide_atapi_cmd_check_status(s); + return; } switch(s->io_buffer[0]) { case GPCMD_TEST_UNIT_READY: - if (bdrv_is_inserted(s->bs) && !s->cdrom_changed) { - ide_atapi_cmd_ok(s); + if (bdrv_is_inserted(s->bs)) { + if (!s->cdrom_changed) { + ide_atapi_cmd_ok(s); + } else { + ide_atapi_cmd_ua(s); + } } else { - s->cdrom_changed = 0; ide_atapi_cmd_error(s, SENSE_NOT_READY, ASC_MEDIUM_NOT_PRESENT); } + s->cdrom_changed = 0; break; case GPCMD_MODE_SENSE_6: case GPCMD_MODE_SENSE_10: