From patchwork Wed Sep 28 11:00:47 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 116764 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 53B69B6F84 for ; Wed, 28 Sep 2011 21:44:23 +1000 (EST) Received: from localhost ([::1]:34255 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R8ru9-0007wP-5D for incoming@patchwork.ozlabs.org; Wed, 28 Sep 2011 07:02:21 -0400 Received: from eggs.gnu.org ([140.186.70.92]:46885) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R8rt7-0004jC-OE for qemu-devel@nongnu.org; Wed, 28 Sep 2011 07:01:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R8rt2-0004EW-6Z for qemu-devel@nongnu.org; Wed, 28 Sep 2011 07:01:17 -0400 Received: from goliath.siemens.de ([192.35.17.28]:20916) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R8rt1-0004DL-PL for qemu-devel@nongnu.org; Wed, 28 Sep 2011 07:01:12 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by goliath.siemens.de (8.13.6/8.13.6) with ESMTP id p8SB196X015363; Wed, 28 Sep 2011 13:01:09 +0200 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p8SB18Vn017664; Wed, 28 Sep 2011 13:01:09 +0200 From: Jan Kiszka To: Anthony Liguori , qemu-devel Date: Wed, 28 Sep 2011 13:00:47 +0200 Message-Id: <467297c246c8e6687c51b844182844331187a85c.1317207666.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 192.35.17.28 Cc: Blue Swirl Subject: [Qemu-devel] [PATCH 01/22] pc: Drop useless test from isa_irq_handler 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 IsaIrqState::ioapic is always non-NULL. Probably, the concrete qemu_irq was supposed to be tested, but that's already done by qemu_set_irq. Signed-off-by: Jan Kiszka --- hw/pc.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index 203627d..a15d165 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -96,9 +96,8 @@ void isa_irq_handler(void *opaque, int n, int level) if (n < 16) { qemu_set_irq(isa->i8259[n], level); } - if (isa->ioapic) - qemu_set_irq(isa->ioapic[n], level); -}; + qemu_set_irq(isa->ioapic[n], level); +} static void ioport80_write(void *opaque, uint32_t addr, uint32_t data) {