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/realview.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/realview.c')
| -rw-r--r-- | hw/realview.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/hw/realview.c b/hw/realview.c index a9d20edc52..5abbc16d9d 100644 --- a/hw/realview.c +++ b/hw/realview.c @@ -121,11 +121,13 @@ static void realview_init(ram_addr_t ram_size, int vga_ram_size, } for(n = 0; n < nb_nics; n++) { nd = &nd_table[n]; - if (!nd->model) - nd->model = done_smc ? "rtl8139" : "smc91c111"; - if (strcmp(nd->model, "smc91c111") == 0) { + + if ((!nd->model && !done_smc) || strcmp(nd->model, "smc91c111") == 0) { smc91c111_init(nd, 0x4e000000, pic[28]); + done_smc = 1; } else { + if (!nd->model) + nd->model = "rtl8139"; pci_nic_init(pci_bus, nd, -1); } } |