From patchwork Tue Apr 12 14:09:18 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Shah X-Patchwork-Id: 90808 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CA082B6F4C for ; Wed, 13 Apr 2011 00:10:28 +1000 (EST) Received: from localhost ([::1]:59904 helo=lists2.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q9eIT-0002l1-3s for incoming@patchwork.ozlabs.org; Tue, 12 Apr 2011 10:10:25 -0400 Received: from eggs.gnu.org ([140.186.70.92]:34534) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q9eI0-0002gT-9u for qemu-devel@nongnu.org; Tue, 12 Apr 2011 10:09:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q9eHz-0004Qe-Ct for qemu-devel@nongnu.org; Tue, 12 Apr 2011 10:09:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46571) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q9eHz-0004QU-4O for qemu-devel@nongnu.org; Tue, 12 Apr 2011 10:09:55 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p3CE9rcq031180 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 12 Apr 2011 10:09:53 -0400 Received: from localhost (ovpn-113-83.phx2.redhat.com [10.3.113.83]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p3CE9nRw032719; Tue, 12 Apr 2011 10:09:51 -0400 From: Amit Shah To: qemu list Date: Tue, 12 Apr 2011 19:39:18 +0530 Message-Id: <98856f5c8b3dec86e4902c2558799a4ba690603d.1302617257.git.amit.shah@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Kevin Wolf , Juan Quintela , Stefan Hajnoczi , Markus Armbruster , Amit Shah , Paolo Bonzini Subject: [Qemu-devel] [PATCH v4 2/5] atapi: Move GET_EVENT_STATUS_NOTIFICATION command handling to its own function 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 This makes the code more readable. Also, there's a block like: if () { ... } else { ... } Split that into if () { ... return; } ... Signed-off-by: Amit Shah --- hw/ide/core.c | 37 ++++++++++++++++++++++++------------- 1 files changed, 24 insertions(+), 13 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index 60137c6..5b64676 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -1084,6 +1084,29 @@ static int ide_dvd_read_structure(IDEState *s, int format, } } +static void handle_get_event_status_notification(IDEState *s, + uint8_t *buf, + const uint8_t *packet) +{ + unsigned int max_len; + + max_len = ube16_to_cpu(packet + 7); + + if (!(packet[1] & 0x01)) { /* asynchronous mode */ + /* Only polling is supported, asynchronous mode is not. */ + ide_atapi_cmd_error(s, SENSE_ILLEGAL_REQUEST, + ASC_INV_FIELD_IN_CMD_PACKET); + return; + } + + /* polling */ + /* We don't support any event class (yet). */ + cpu_to_ube16(buf, 0x00); /* No event descriptor returned */ + buf[2] = 0x80; /* No Event Available (NEA) */ + buf[3] = 0x00; /* Empty supported event classes */ + ide_atapi_cmd_reply(s, 4, max_len); +} + static void ide_atapi_cmd(IDEState *s) { const uint8_t *packet; @@ -1530,19 +1553,7 @@ static void ide_atapi_cmd(IDEState *s) break; } case GPCMD_GET_EVENT_STATUS_NOTIFICATION: - max_len = ube16_to_cpu(packet + 7); - - if (packet[1] & 0x01) { /* polling */ - /* We don't support any event class (yet). */ - cpu_to_ube16(buf, 0x00); /* No event descriptor returned */ - buf[2] = 0x80; /* No Event Available (NEA) */ - buf[3] = 0x00; /* Empty supported event classes */ - ide_atapi_cmd_reply(s, 4, max_len); - } else { /* asynchronous mode */ - /* Only polling is supported, asynchronous mode is not. */ - ide_atapi_cmd_error(s, SENSE_ILLEGAL_REQUEST, - ASC_INV_FIELD_IN_CMD_PACKET); - } + handle_get_event_status_notification(s, buf, packet); break; default: ide_atapi_cmd_error(s, SENSE_ILLEGAL_REQUEST,