From patchwork Mon Jun 24 09:10:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 253762 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CDDFF2C016F for ; Mon, 24 Jun 2013 19:18:11 +1000 (EST) Received: from localhost ([::1]:36587 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ur2uY-0004Dt-05 for incoming@patchwork.ozlabs.org; Mon, 24 Jun 2013 05:18:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47513) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ur2nz-0002M6-Ba for qemu-devel@nongnu.org; Mon, 24 Jun 2013 05:11:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ur2nu-0007NJ-9Z for qemu-devel@nongnu.org; Mon, 24 Jun 2013 05:11:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:63791) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ur2nt-0007NC-UX for qemu-devel@nongnu.org; Mon, 24 Jun 2013 05:11:18 -0400 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.14.4/8.14.4) with ESMTP id r5O9BHqh031482 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 24 Jun 2013 05:11:17 -0400 Received: from localhost (ovpn-112-34.ams2.redhat.com [10.36.112.34]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r5O9BGMQ001596; Mon, 24 Jun 2013 05:11:16 -0400 From: Stefan Hajnoczi To: Date: Mon, 24 Jun 2013 11:10:29 +0200 Message-Id: <1372065035-19601-18-git-send-email-stefanha@redhat.com> In-Reply-To: <1372065035-19601-1-git-send-email-stefanha@redhat.com> References: <1372065035-19601-1-git-send-email-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , Anthony Liguori , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 17/23] ide: Clean up ide_exec_cmd() 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 From: Kevin Wolf All commands are now converted to ide_cmd_table handlers, so it can be unconditional now and the old switch block can go. Signed-off-by: Kevin Wolf Signed-off-by: Stefan Hajnoczi --- hw/ide/core.c | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index 1c8f414..03d1cfa 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -1694,6 +1694,7 @@ static bool ide_cmd_permitted(IDEState *s, uint32_t cmd) void ide_exec_cmd(IDEBus *bus, uint32_t val) { IDEState *s; + bool complete; #if defined(DEBUG_IDE) printf("ide: CMD=%02x\n", val); @@ -1708,37 +1709,24 @@ void ide_exec_cmd(IDEBus *bus, uint32_t val) return; if (!ide_cmd_permitted(s, val)) { - goto abort_cmd; + ide_abort_command(s); + ide_set_irq(s->bus); + return; } - if (ide_cmd_table[val].handler != NULL) { - bool complete; - - s->status = READY_STAT | BUSY_STAT; - s->error = 0; - - complete = ide_cmd_table[val].handler(s, val); - if (complete) { - s->status &= ~BUSY_STAT; - assert(!!s->error == !!(s->status & ERR_STAT)); + s->status = READY_STAT | BUSY_STAT; + s->error = 0; - if ((ide_cmd_table[val].flags & SET_DSC) && !s->error) { - s->status |= SEEK_STAT; - } + complete = ide_cmd_table[val].handler(s, val); + if (complete) { + s->status &= ~BUSY_STAT; + assert(!!s->error == !!(s->status & ERR_STAT)); - ide_set_irq(s->bus); + if ((ide_cmd_table[val].flags & SET_DSC) && !s->error) { + s->status |= SEEK_STAT; } - return; - } - - switch(val) { - default: - /* should not be reachable */ - abort_cmd: - ide_abort_command(s); ide_set_irq(s->bus); - break; } }