From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LLH8P-0001LF-0E
	for qemu-devel@nongnu.org; Fri, 09 Jan 2009 08:10:45 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LLH8O-0001Ky-7b
	for qemu-devel@nongnu.org; Fri, 09 Jan 2009 08:10:44 -0500
Received: from [199.232.76.173] (port=47575 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LLH8O-0001Kp-0b
	for qemu-devel@nongnu.org; Fri, 09 Jan 2009 08:10:44 -0500
Received: from savannah.gnu.org ([199.232.41.3]:41743 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <INVALID.NOREPLY@gnu.org>)
	id 1LLH8N-0006xn-Ej
	for qemu-devel@nongnu.org; Fri, 09 Jan 2009 08:10:43 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1LLH8M-0005DG-F4
	for qemu-devel@nongnu.org; Fri, 09 Jan 2009 13:10:42 +0000
Received: from aurel32 by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <aurel32@savannah.gnu.org>) id 1LLH8M-0005DC-7O
	for qemu-devel@nongnu.org; Fri, 09 Jan 2009 13:10:42 +0000
MIME-Version: 1.0
Errors-To: aurel32
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Aurelien Jarno <aurelien@aurel32.net>
Message-Id: <E1LLH8M-0005DC-7O@cvs.savannah.gnu.org>
Date: Fri, 09 Jan 2009 13:10:42 +0000
Subject: [Qemu-devel]
	[6261] mips, ppc: make sure nd->model is always defined
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

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);