diff options
| author | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-01-13 19:39:36 +0000 |
|---|---|---|
| committer | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-01-13 19:39:36 +0000 |
| commit | 0ae18ceeaaa2c1749e742c4b112f6c3bf0896408 (patch) | |
| tree | 282e33540c3e7b006d41cf9aec84c119f5223aef /hw/mips_mipssim.c | |
| parent | 973cbd37ce6d4c33dea7f4ed6b8e0e602fa50d25 (diff) | |
Check NIC model in some NIC init functions (Mark McLoughlin)
Some NIC init functions are only called when that model is
the only valid model. In that case, it makes sense to use
qemu_check_nic_model() from the NIC init function itself.
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6286 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/mips_mipssim.c')
| -rw-r--r-- | hw/mips_mipssim.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/hw/mips_mipssim.c b/hw/mips_mipssim.c index dc62f696a0..83f1a63e5c 100644 --- a/hw/mips_mipssim.c +++ b/hw/mips_mipssim.c @@ -175,19 +175,9 @@ mips_mipssim_init (ram_addr_t ram_size, int vga_ram_size, if (serial_hds[0]) serial_init(0x3f8, env->irq[4], 115200, serial_hds[0]); - if (nd_table[0].vlan) { - if (nd_table[0].model == NULL - || strcmp(nd_table[0].model, "mipsnet") == 0) { - /* MIPSnet uses the MIPS CPU INT0, which is interrupt 2. */ - mipsnet_init(0x4200, env->irq[2], &nd_table[0]); - } else if (strcmp(nd_table[0].model, "?") == 0) { - fprintf(stderr, "qemu: Supported NICs: mipsnet\n"); - exit (1); - } else { - fprintf(stderr, "qemu: Unsupported NIC: %s\n", nd_table[0].model); - exit (1); - } - } + if (nd_table[0].vlan) + /* MIPSnet uses the MIPS CPU INT0, which is interrupt 2. */ + mipsnet_init(0x4200, env->irq[2], &nd_table[0]); } QEMUMachine mips_mipssim_machine = { |