From 4abe5e1623fac47ae6451e7a0a1742dc8fb0da25 Mon Sep 17 00:00:00 2001 From: Blue Swirl Date: Sat, 5 Feb 2011 15:39:57 +0000 Subject: [PATCH] ne2000_isa: refactor device creation Turn isa_ne2000_init into an inline function. Signed-off-by: Blue Swirl --- hw/ne2000-isa.c | 13 ------------- hw/pc.h | 12 +++++++++++- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/hw/ne2000-isa.c b/hw/ne2000-isa.c index 3ff0d89..e41dbba 100644 --- a/hw/ne2000-isa.c +++ b/hw/ne2000-isa.c @@ -92,19 +92,6 @@ static int isa_ne2000_initfn(ISADevice *dev) return 0; } -void isa_ne2000_init(int base, int irq, NICInfo *nd) -{ - ISADevice *dev; - - qemu_check_nic_model(nd, "ne2k_isa"); - - dev = isa_create("ne2k_isa"); - qdev_prop_set_uint32(&dev->qdev, "iobase", base); - qdev_prop_set_uint32(&dev->qdev, "irq", irq); - qdev_set_nic_properties(&dev->qdev, nd); - qdev_init_nofail(&dev->qdev); -} - static ISADeviceInfo ne2000_isa_info = { .qdev.name = "ne2k_isa", .qdev.size = sizeof(ISANE2000State), diff --git a/hw/pc.h b/hw/pc.h index f823b7d..abdf307 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -176,8 +176,18 @@ void pci_cirrus_vga_init(PCIBus *bus); void isa_cirrus_vga_init(void); /* ne2000.c */ +static inline void isa_ne2000_init(int base, int irq, NICInfo *nd) +{ + ISADevice *dev; -void isa_ne2000_init(int base, int irq, NICInfo *nd); + qemu_check_nic_model(nd, "ne2k_isa"); + + dev = isa_create("ne2k_isa"); + qdev_prop_set_uint32(&dev->qdev, "iobase", base); + qdev_prop_set_uint32(&dev->qdev, "irq", irq); + qdev_set_nic_properties(&dev->qdev, nd); + qdev_init_nofail(&dev->qdev); +} /* e820 types */ #define E820_RAM 1 -- 2.7.4