aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2005-12-18 17:51:01 +0000
committerbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2005-12-18 17:51:01 +0000
commit183b4a380683751911a24a06abae6c9d8d58ac86 (patch)
tree4f02d21746ba00ae35aa79133392c3f969c35e67 /hw
parent5198cfd9277af376c0d1c667f5a1943f100fee45 (diff)
do not init ne2000 if no network enabled
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1714 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw')
-rw-r--r--hw/mips_r4k.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index 2b47ef5849..5f51f874c4 100644
--- a/hw/mips_r4k.c
+++ b/hw/mips_r4k.c
@@ -272,7 +272,8 @@ void mips_r4k_init (int ram_size, int vga_ram_size, int boot_device,
vga_initialize(NULL, ds, phys_ram_base + ram_size, ram_size,
vga_ram_size, 0, 0);
- isa_ne2000_init(0x300, 9, &nd_table[0]);
+ if (nd_table[0].vlan)
+ isa_ne2000_init(0x300, 9, &nd_table[0]);
}
QEMUMachine mips_machine = {