diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2011-02-05 15:39:57 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2011-02-20 09:32:26 +0000 |
| commit | 60a14ad31e3629c13816d5060cb30d73985171e9 (patch) | |
| tree | b3aadf4566507668efda1774fce28ab01f7788ed | |
| parent | 7353153891a9bbdbaa1672c37208effb5a09d715 (diff) | |
| download | focaccia-qemu-60a14ad31e3629c13816d5060cb30d73985171e9.tar.gz focaccia-qemu-60a14ad31e3629c13816d5060cb30d73985171e9.zip | |
ne2000_isa: refactor device creation
Turn isa_ne2000_init into an inline function. Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
| -rw-r--r-- | hw/ne2000-isa.c | 13 | ||||
| -rw-r--r-- | hw/pc.h | 12 |
2 files changed, 11 insertions, 14 deletions
diff --git a/hw/ne2000-isa.c b/hw/ne2000-isa.c index 3ff0d89a74..e41dbbaa79 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 f823b7d25a..abdf307fe0 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 |