[Qemu-devel] [6226] ETRAX: Always provide a valid net model.

[Edgar E. Iglesias]

Revision: 6226
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6226
Author:   edgar_igl
Date:     2009-01-07 22:46:50 +0000 (Wed, 07 Jan 2009)

Log Message:
-----------
ETRAX: Always provide a valid net model.

Signed-off-by: Edgar E. Iglesias <address@hidden>

Modified Paths:
--------------
    trunk/hw/axis_dev88.c
    trunk/hw/etraxfs.c

Modified: trunk/hw/axis_dev88.c
===================================================================
--- trunk/hw/axis_dev88.c       2009-01-07 20:07:09 UTC (rev 6225)
+++ trunk/hw/axis_dev88.c       2009-01-07 22:46:50 UTC (rev 6226)
@@ -303,9 +303,12 @@
     }
 
     /* 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]);

Modified: trunk/hw/etraxfs.c
===================================================================
--- trunk/hw/etraxfs.c  2009-01-07 20:07:09 UTC (rev 6225)
+++ trunk/hw/etraxfs.c  2009-01-07 22:46:50 UTC (rev 6226)
@@ -94,9 +94,12 @@
     }
 
     /* 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]);