diff options
author | blueswir1 | 2007-05-27 21:38:20 +0200 |
---|---|---|
committer | blueswir1 | 2007-05-27 21:38:20 +0200 |
commit | dbe06e1841028ffa080ffe06273397fc583a7fcc (patch) | |
tree | 7623fe232285badb6d69a049a4e843810d7830a1 /hw/sun4m.c | |
parent | Improved sanity checking to -net options (diff) | |
download | qemu-dbe06e1841028ffa080ffe06273397fc583a7fcc.tar.gz qemu-dbe06e1841028ffa080ffe06273397fc583a7fcc.tar.xz qemu-dbe06e1841028ffa080ffe06273397fc583a7fcc.zip |
Handle unconnected vlan case in lance
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2878 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/sun4m.c')
-rw-r--r-- | hw/sun4m.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/hw/sun4m.c b/hw/sun4m.c index c69d732f91..9efcdd62d2 100644 --- a/hw/sun4m.c +++ b/hw/sun4m.c @@ -349,15 +349,15 @@ static void sun4m_hw_init(const struct hwdef *hwdef, int ram_size, } tcx_init(ds, hwdef->tcx_base, phys_ram_base + ram_size, ram_size, hwdef->vram_size, graphic_width, graphic_height, graphic_depth); - if (nd_table[0].vlan) { - if (nd_table[0].model == NULL - || strcmp(nd_table[0].model, "lance") == 0) { - lance_init(&nd_table[0], hwdef->le_base, ledma, *ledma_irq); - } else { - fprintf(stderr, "qemu: Unsupported NIC: %s\n", nd_table[0].model); - exit (1); - } + + if (nd_table[0].model == NULL + || strcmp(nd_table[0].model, "lance") == 0) { + lance_init(&nd_table[0], hwdef->le_base, ledma, *ledma_irq); + } else { + fprintf(stderr, "qemu: Unsupported NIC: %s\n", nd_table[0].model); + exit (1); } + nvram = m48t59_init(slavio_irq[0], hwdef->nvram_base, 0, hwdef->nvram_size, 8); for (i = 0; i < MAX_CPUS; i++) { |