From patchwork Mon Oct 10 14:59:53 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avi Kivity X-Patchwork-Id: 118755 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 ED31AB70C6 for ; Tue, 11 Oct 2011 02:17:41 +1100 (EST) Received: from localhost ([::1]:34394 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RDHLr-00074n-Ve for incoming@patchwork.ozlabs.org; Mon, 10 Oct 2011 11:01:11 -0400 Received: from eggs.gnu.org ([140.186.70.92]:37779) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RDHLC-0005jP-V0 for qemu-devel@nongnu.org; Mon, 10 Oct 2011 11:00:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RDHL5-0002AM-2N for qemu-devel@nongnu.org; Mon, 10 Oct 2011 11:00:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:10876) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RDHL4-00029v-MT for qemu-devel@nongnu.org; Mon, 10 Oct 2011 11:00:22 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p9AF0K7k004586 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 10 Oct 2011 11:00:20 -0400 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p9AF0JNO006230; Mon, 10 Oct 2011 11:00:20 -0400 Received: from s01.tlv.redhat.com (s01.tlv.redhat.com [10.35.255.8]) by cleopatra.tlv.redhat.com (Postfix) with ESMTP id 7A21FB06CB; Mon, 10 Oct 2011 17:00:01 +0200 (IST) From: Avi Kivity To: Anthony Liguori , qemu-devel@nongnu.org Date: Mon, 10 Oct 2011 16:59:53 +0200 Message-Id: <1318258793-10576-25-git-send-email-avi@redhat.com> In-Reply-To: <1318258793-10576-1-git-send-email-avi@redhat.com> References: <1318258793-10576-1-git-send-email-avi@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 24/24] isa: Remove isa_init_ioport_range and isa_init_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 From: Richard Henderson All users have been converted to either isa_register_ioport or isa_register_old_portio_list. Signed-off-by: Richard Henderson Signed-off-by: Avi Kivity --- hw/isa-bus.c | 19 +++++-------------- hw/isa.h | 2 -- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/hw/isa-bus.c b/hw/isa-bus.c index 5d8ff84..7c2c261 100644 --- a/hw/isa-bus.c +++ b/hw/isa-bus.c @@ -83,24 +83,17 @@ void isa_init_irq(ISADevice *dev, qemu_irq *p, int isairq) dev->nirqs++; } -void isa_init_ioport_range(ISADevice *dev, uint16_t start, uint16_t length) +static inline void isa_init_ioport(ISADevice *dev, uint16_t ioport) { - if (dev->ioport_id == 0 || start < dev->ioport_id) { - dev->ioport_id = start; + if (dev && (dev->ioport_id == 0 || ioport < dev->ioport_id)) { + dev->ioport_id = ioport; } } -void isa_init_ioport(ISADevice *dev, uint16_t ioport) -{ - isa_init_ioport_range(dev, ioport, 1); -} - void isa_register_ioport(ISADevice *dev, MemoryRegion *io, uint16_t start) { memory_region_add_subregion(isabus->address_space_io, start, io); - if (dev != NULL) { - isa_init_ioport(dev, start); - } + isa_init_ioport(dev, start); } void isa_register_portio_list(ISADevice *dev, uint16_t start, @@ -112,9 +105,7 @@ void isa_register_portio_list(ISADevice *dev, uint16_t start, /* START is how we should treat DEV, regardless of the actual contents of the portio array. This is how the old code actually handled e.g. the FDC device. */ - if (dev) { - isa_init_ioport(dev, start); - } + isa_init_ioport(dev, start); portio_list_init(piolist, pio_start, opaque, name); portio_list_add(piolist, isabus->address_space_io, start); diff --git a/hw/isa.h b/hw/isa.h index 177ef95..d3cae35 100644 --- a/hw/isa.h +++ b/hw/isa.h @@ -28,8 +28,6 @@ ISABus *isa_bus_new(DeviceState *dev, MemoryRegion *address_space_io); void isa_bus_irqs(qemu_irq *irqs); qemu_irq isa_get_irq(int isairq); void isa_init_irq(ISADevice *dev, qemu_irq *p, int isairq); -void isa_init_ioport(ISADevice *dev, uint16_t ioport); -void isa_init_ioport_range(ISADevice *dev, uint16_t start, uint16_t length); void isa_qdev_register(ISADeviceInfo *info); MemoryRegion *isa_address_space(ISADevice *dev); ISADevice *isa_create(const char *name);