diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-10-14 10:44:52 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-10-14 10:44:52 -0500 |
| commit | 36f490b176afab3096e9c2877b365354f67e269d (patch) | |
| tree | b99964fa0e30e9a7931c4944cd1897f8f735aee3 /hw/ne2000-isa.c | |
| parent | ebffe2afceb1a17b5d134b5debf553955fe5ea1a (diff) | |
| parent | 0d9595245393f6e59831447a06235a0a1b2cdfd4 (diff) | |
| download | qemu-36f490b176afab3096e9c2877b365354f67e269d.zip qemu-36f490b176afab3096e9c2877b365354f67e269d.tar.gz qemu-36f490b176afab3096e9c2877b365354f67e269d.tar.bz2 | |
Merge remote-tracking branch 'qemu-kvm-tmp/memory/batch' into staging
Diffstat (limited to 'hw/ne2000-isa.c')
| -rw-r--r-- | hw/ne2000-isa.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/hw/ne2000-isa.c b/hw/ne2000-isa.c index 756ed5c..11ffee7 100644 --- a/hw/ne2000-isa.c +++ b/hw/ne2000-isa.c @@ -68,10 +68,7 @@ static int isa_ne2000_initfn(ISADevice *dev) NE2000State *s = &isa->ne2000; ne2000_setup_io(s, 0x20); - isa_init_ioport_range(dev, isa->iobase, 16); - isa_init_ioport_range(dev, isa->iobase + 0x10, 2); - isa_init_ioport(dev, isa->iobase + 0x1f); - memory_region_add_subregion(get_system_io(), isa->iobase, &s->io); + isa_register_ioport(dev, &s->io, isa->iobase); isa_init_irq(dev, &s->irq, isa->isairq); |