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/mcf5208.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/mcf5208.c')
| -rw-r--r-- | hw/mcf5208.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/hw/mcf5208.c b/hw/mcf5208.c index 71ba3fb0a2..f06c25a54c 100644 --- a/hw/mcf5208.c +++ b/hw/mcf5208.c @@ -241,18 +241,8 @@ static void mcf5208evb_init(ram_addr_t ram_size, int vga_ram_size, fprintf(stderr, "Too many NICs\n"); exit(1); } - if (nd_table[0].vlan) { - if (nd_table[0].model == NULL - || strcmp(nd_table[0].model, "mcf_fec") == 0) { - mcf_fec_init(&nd_table[0], 0xfc030000, pic + 36); - } else if (strcmp(nd_table[0].model, "?") == 0) { - fprintf(stderr, "qemu: Supported NICs: mcf_fec\n"); - exit (1); - } else { - fprintf(stderr, "qemu: Unsupported NIC: %s\n", nd_table[0].model); - exit (1); - } - } + if (nd_table[0].vlan) + mcf_fec_init(&nd_table[0], 0xfc030000, pic + 36); /* 0xfc000000 SCM. */ /* 0xfc004000 XBS. */ |