[Qemu-devel] [6261] mips, ppc: make sure nd->model is always defined

[Qemu-devel] [6261] mips, ppc: make sure nd->model is always defined

[Aurelien Jarno]

Revision: 6261
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6261
Author:   aurel32
Date:     2009-01-09 13:10:41 +0000 (Fri, 09 Jan 2009)

Log Message:
-----------
mips, ppc: make sure nd->model is always defined

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

Modified Paths:
--------------
    trunk/hw/mips_r4k.c
    trunk/hw/ppc_prep.c

Modified: trunk/hw/mips_r4k.c
===================================================================
--- trunk/hw/mips_r4k.c	2009-01-09 11:01:31 UTC (rev 6260)
+++ trunk/hw/mips_r4k.c	2009-01-09 13:10:41 UTC (rev 6261)
@@ -248,8 +248,10 @@
                  vga_ram_size);
 
     if (nd_table[0].vlan) {
-        if (nd_table[0].model == NULL
-            || strcmp(nd_table[0].model, "ne2k_isa") == 0) {
+        if (nd_table[i].model == NULL) {
+	    nd_table[i].model = "ne2k_isa";
+        }
+        if (strcmp(nd_table[0].model, "ne2k_isa") == 0) {
             isa_ne2000_init(0x300, i8259[9], &nd_table[0]);
         } else if (strcmp(nd_table[0].model, "?") == 0) {
             fprintf(stderr, "qemu: Supported NICs: ne2k_isa\n");

Modified: trunk/hw/ppc_prep.c
===================================================================
--- trunk/hw/ppc_prep.c	2009-01-09 11:01:31 UTC (rev 6260)
+++ trunk/hw/ppc_prep.c	2009-01-09 13:10:41 UTC (rev 6261)
@@ -671,8 +671,10 @@
     if (nb_nics1 > NE2000_NB_MAX)
         nb_nics1 = NE2000_NB_MAX;
     for(i = 0; i < nb_nics1; i++) {
-        if (nd_table[i].model == NULL
-            || strcmp(nd_table[i].model, "ne2k_isa") == 0) {
+        if (nd_table[i].model == NULL) {
+	    nd_table[i].model = "ne2k_isa";
+        }
+        if (strcmp(nd_table[i].model, "ne2k_isa") == 0) {
             isa_ne2000_init(ne2000_io[i], i8259[ne2000_irq[i]], &nd_table[i]);
         } else {
             pci_nic_init(pci_bus, &nd_table[i], -1);