From 0ae18ceeaaa2c1749e742c4b112f6c3bf0896408 Mon Sep 17 00:00:00 2001 From: aliguori Date: Tue, 13 Jan 2009 19:39:36 +0000 Subject: 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 Signed-off-by: Anthony Liguori git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6286 c046a42c-6fe2-441c-8c8c-71466251a162 --- hw/realview.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'hw/realview.c') diff --git a/hw/realview.c b/hw/realview.c index a9d20ed..5abbc16 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); } } -- cgit v1.1