ETRAX: Always provide a valid net model.

Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6226 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/hw/axis_dev88.c b/hw/axis_dev88.c
index 3f90fa538ef4114474ee5582e1db6b38a5f60814..f7bdd1465bf8d082cd85bcb1a64d5a31a2d51c5b 100644 (file)
--- a/hw/axis_dev88.c
+++ b/hw/axis_dev88.c
@@ -303,9 +303,12 @@ void axisdev88_init (ram_addr_t ram_size, int vga_ram_size,
     }
 
     /* Add the two ethernet blocks.  */
+    nd_table[0].model = nd_table[0].model ? nd_table[0].model : "fseth";
     eth[0] = etraxfs_eth_init(&nd_table[0], env, pic->irq + 25, 0x30034000);
-    if (nb_nics > 1)
+    if (nb_nics > 1) {
+        nd_table[1].model = nd_table[1].model ? nd_table[1].model : "fseth";
         eth[1] = etraxfs_eth_init(&nd_table[1], env, pic->irq + 26, 0x30036000);
+    }
 
     /* The DMA Connector block is missing, hardwire things for now.  */
     etraxfs_dmac_connect_client(etraxfs_dmac, 0, eth[0]);

diff --git a/hw/etraxfs.c b/hw/etraxfs.c
index 5cd56f36992b6bccb6f23d5c5c2a9f968545f37b..01b5a6e6fe486d4f954f118ddad8aa14c3df08d8 100644 (file)
--- a/hw/etraxfs.c
+++ b/hw/etraxfs.c
@@ -94,9 +94,12 @@ void bareetraxfs_init (ram_addr_t ram_size, int vga_ram_size,
     }
 
     /* Add the two ethernet blocks.  */
+    nd_table[0].model = nd_table[0].model ? nd_table[0].model : "fseth";
     eth[0] = etraxfs_eth_init(&nd_table[0], env, pic->irq + 25, 0x30034000);
-    if (nb_nics > 1)
+    if (nb_nics > 1) {
+        nd_table[1].model = nd_table[1].model ? nd_table[1].model : "fseth";
         eth[1] = etraxfs_eth_init(&nd_table[1], env, pic->irq + 26, 0x30036000);
+    }
 
     /* The DMA Connector block is missing, hardwire things for now.  */
     etraxfs_dmac_connect_client(etraxfs_dmac, 0, eth[0]);