From patchwork Fri Sep 11 20:19:16 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 33494 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id AD8D1B70AD for ; Sat, 12 Sep 2009 06:35:24 +1000 (EST) Received: from localhost ([127.0.0.1]:51100 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MmCq0-0004yW-LU for incoming@patchwork.ozlabs.org; Fri, 11 Sep 2009 16:35:20 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MmCam-0003MA-IE for qemu-devel@nongnu.org; Fri, 11 Sep 2009 16:19:36 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MmCaf-0003H9-JQ for qemu-devel@nongnu.org; Fri, 11 Sep 2009 16:19:34 -0400 Received: from [199.232.76.173] (port=34682 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MmCaf-0003Gw-Cz for qemu-devel@nongnu.org; Fri, 11 Sep 2009 16:19:29 -0400 Received: from oxygen.pond.sub.org ([213.239.205.148]:41817) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MmCae-0005rw-Ke for qemu-devel@nongnu.org; Fri, 11 Sep 2009 16:19:29 -0400 Received: from pike.pond.sub.org (pD9E39C1E.dip.t-dialin.net [217.227.156.30]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 0A9D9276D4E for ; Fri, 11 Sep 2009 22:19:27 +0200 (CEST) Received: by pike.pond.sub.org (Postfix, from userid 1000) id 9B74B10086; Fri, 11 Sep 2009 22:19:21 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 11 Sep 2009 22:19:16 +0200 Message-Id: <37d5a3ce941bc89f6d73b8e7bf746952a0074da2.1252699478.git.armbru@redhat.com> X-Mailer: git-send-email 1.6.0.6 In-Reply-To: References: X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Subject: [Qemu-devel] [PATCH 1/6] Move function definitions out of xilinx.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org xilinx.h defines a couple of static inline functions for creating devices. While that's a fair technique for hot functions, device initialization is about as cold as it gets. Define them in the device source files instead, and keep only declarations in the header. Signed-off-by: Markus Armbruster --- hw/xilinx.h | 58 ++++++++------------------------------------------ hw/xilinx_ethlite.c | 19 ++++++++++++++++ hw/xilinx_intc.c | 14 ++++++++++++ hw/xilinx_timer.c | 15 +++++++++++++ 4 files changed, 58 insertions(+), 48 deletions(-) diff --git a/hw/xilinx.h b/hw/xilinx.h index 070679c..ea91be1 100644 --- a/hw/xilinx.h +++ b/hw/xilinx.h @@ -1,50 +1,12 @@ +#ifndef XILINX_H +#define XILINX_H -/* OPB Interrupt Controller. */ qemu_irq *microblaze_pic_init_cpu(CPUState *env); - -static inline DeviceState * -xilinx_intc_create(target_phys_addr_t base, qemu_irq irq, int kind_of_intr) -{ - DeviceState *dev; - - dev = qdev_create(NULL, "xilinx,intc"); - qdev_prop_set_uint32(dev, "kind-of-intr", kind_of_intr); - qdev_init(dev); - sysbus_mmio_map(sysbus_from_qdev(dev), 0, base); - sysbus_connect_irq(sysbus_from_qdev(dev), 0, irq); - return dev; -} - -/* OPB Timer/Counter. */ -static inline DeviceState * -xilinx_timer_create(target_phys_addr_t base, qemu_irq irq, int nr, int freq) -{ - DeviceState *dev; - - dev = qdev_create(NULL, "xilinx,timer"); - qdev_prop_set_uint32(dev, "nr-timers", nr); - qdev_prop_set_uint32(dev, "frequency", freq); - qdev_init(dev); - sysbus_mmio_map(sysbus_from_qdev(dev), 0, base); - sysbus_connect_irq(sysbus_from_qdev(dev), 0, irq); - return dev; -} - -/* XPS Ethernet Lite MAC. */ -static inline DeviceState * -xilinx_ethlite_create(NICInfo *nd, target_phys_addr_t base, qemu_irq irq, - int txpingpong, int rxpingpong) -{ - DeviceState *dev; - - qemu_check_nic_model(nd, "xilinx-ethlite"); - - dev = qdev_create(NULL, "xilinx,ethlite"); - dev->nd = nd; - qdev_prop_set_uint32(dev, "txpingpong", txpingpong); - qdev_prop_set_uint32(dev, "rxpingpong", rxpingpong); - qdev_init(dev); - sysbus_mmio_map(sysbus_from_qdev(dev), 0, base); - sysbus_connect_irq(sysbus_from_qdev(dev), 0, irq); - return dev; -} +DeviceState *xilinx_intc_create(target_phys_addr_t base, qemu_irq irq, + int kind_of_intr); +DeviceState *xilinx_timer_create(target_phys_addr_t base, qemu_irq irq, + int nr, int freq); +DeviceState *xilinx_ethlite_create(NICInfo *nd, target_phys_addr_t base, + qemu_irq irq, int txpingpong, int rxpingpong); + +#endif diff --git a/hw/xilinx_ethlite.c b/hw/xilinx_ethlite.c index 9b0074c..1710149 100644 --- a/hw/xilinx_ethlite.c +++ b/hw/xilinx_ethlite.c @@ -25,6 +25,7 @@ #include "sysbus.h" #include "hw.h" #include "net.h" +#include "xilinx.h" #define D(x) #define R_TX_BUF0 0 @@ -201,6 +202,24 @@ static ssize_t eth_rx(VLANClientState *vc, const uint8_t *buf, size_t size) return size; } +DeviceState * +xilinx_ethlite_create(NICInfo *nd, target_phys_addr_t base, qemu_irq irq, + int txpingpong, int rxpingpong) +{ + DeviceState *dev; + + qemu_check_nic_model(nd, "xilinx-ethlite"); + + dev = qdev_create(NULL, "xilinx,ethlite"); + dev->nd = nd; + qdev_prop_set_uint32(dev, "txpingpong", txpingpong); + qdev_prop_set_uint32(dev, "rxpingpong", rxpingpong); + qdev_init(dev); + sysbus_mmio_map(sysbus_from_qdev(dev), 0, base); + sysbus_connect_irq(sysbus_from_qdev(dev), 0, irq); + return dev; +} + static void eth_cleanup(VLANClientState *vc) { struct xlx_ethlite *s = vc->opaque; diff --git a/hw/xilinx_intc.c b/hw/xilinx_intc.c index 8ef6474..dfb8442 100644 --- a/hw/xilinx_intc.c +++ b/hw/xilinx_intc.c @@ -24,6 +24,7 @@ #include "sysbus.h" #include "hw.h" +#include "xilinx.h" #define D(x) @@ -145,6 +146,19 @@ static void irq_handler(void *opaque, int irq, int level) update_irq(p); } +DeviceState * +xilinx_intc_create(target_phys_addr_t base, qemu_irq irq, int kind_of_intr) +{ + DeviceState *dev; + + dev = qdev_create(NULL, "xilinx,intc"); + qdev_prop_set_uint32(dev, "kind-of-intr", kind_of_intr); + qdev_init(dev); + sysbus_mmio_map(sysbus_from_qdev(dev), 0, base); + sysbus_connect_irq(sysbus_from_qdev(dev), 0, irq); + return dev; +} + static int xilinx_intc_init(SysBusDevice *dev) { struct xlx_pic *p = FROM_SYSBUS(typeof (*p), dev); diff --git a/hw/xilinx_timer.c b/hw/xilinx_timer.c index e2d9541..26df4b0 100644 --- a/hw/xilinx_timer.c +++ b/hw/xilinx_timer.c @@ -25,6 +25,7 @@ #include "sysbus.h" #include "sysemu.h" #include "qemu-timer.h" +#include "xilinx.h" #define D(x) @@ -189,6 +190,20 @@ static void timer_hit(void *opaque) timer_update_irq(t); } +DeviceState * +xilinx_timer_create(target_phys_addr_t base, qemu_irq irq, int nr, int freq) +{ + DeviceState *dev; + + dev = qdev_create(NULL, "xilinx,timer"); + qdev_prop_set_uint32(dev, "nr-timers", nr); + qdev_prop_set_uint32(dev, "frequency", freq); + qdev_init(dev); + sysbus_mmio_map(sysbus_from_qdev(dev), 0, base); + sysbus_connect_irq(sysbus_from_qdev(dev), 0, irq); + return dev; +} + static int xilinx_timer_init(SysBusDevice *dev) { struct timerblock *t = FROM_SYSBUS(typeof (*t), dev);