From patchwork Sun Oct 2 16:10:27 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Herv=C3=A9_Poussineau?= X-Patchwork-Id: 117333 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 1F95CB6F76 for ; Mon, 3 Oct 2011 03:40:01 +1100 (EST) Received: from localhost ([::1]:36032 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RAOdq-0007y5-MK for incoming@patchwork.ozlabs.org; Sun, 02 Oct 2011 12:11:50 -0400 Received: from eggs.gnu.org ([140.186.70.92]:38759) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RAOdV-00076G-AI for qemu-devel@nongnu.org; Sun, 02 Oct 2011 12:11:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RAOdT-0008Fd-Rz for qemu-devel@nongnu.org; Sun, 02 Oct 2011 12:11:29 -0400 Received: from smtp5-g21.free.fr ([212.27.42.5]:34524) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RAOdT-0008FY-6e for qemu-devel@nongnu.org; Sun, 02 Oct 2011 12:11:27 -0400 Received: from localhost.localdomain (unknown [88.171.126.33]) by smtp5-g21.free.fr (Postfix) with ESMTP id E3D48D482B7; Sun, 2 Oct 2011 18:11:21 +0200 (CEST) From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= To: qemu-devel@nongnu.org Date: Sun, 2 Oct 2011 18:10:27 +0200 Message-Id: <1317571828-9059-16-git-send-email-hpoussin@reactos.org> X-Mailer: git-send-email 1.7.6.3 In-Reply-To: <1317571828-9059-1-git-send-email-hpoussin@reactos.org> References: <1317571828-9059-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 212.27.42.5 Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Subject: [Qemu-devel] [PATCH v3 15/16] isa: remove useless test in isa_register_ioport() 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 Use ISA bus from given device instead of global ISA bus Signed-off-by: Hervé Poussineau --- hw/isa-bus.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/isa-bus.c b/hw/isa-bus.c index 2f9ad24..ab8dbe9 100644 --- a/hw/isa-bus.c +++ b/hw/isa-bus.c @@ -117,18 +117,18 @@ void isa_init_ioport(ISADevice *dev, uint16_t ioport) void isa_register_ioport(ISADevice *dev, MemoryRegion *io, uint16_t start) { - ISABus *bus = isabus; + ISABus *bus = isa_bus_from_device(dev); + assert(bus == isabus); if (!bus || !bus->ops->get_io_space) { hw_error("Tried to register I/O port with no isa bus present."); } memory_region_add_subregion(bus->ops->get_io_space(bus), start, io); - if (dev != NULL) { - assert(dev->nio < ARRAY_SIZE(dev->io)); - dev->io[dev->nio++] = io; - isa_init_ioport_range(dev, start, memory_region_size(io)); - } + + assert(dev->nio < ARRAY_SIZE(dev->io)); + dev->io[dev->nio++] = io; + isa_init_ioport_range(dev, start, memory_region_size(io)); } static int isa_qdev_init(DeviceState *qdev, DeviceInfo *base)