aboutsummaryrefslogtreecommitdiff
path: root/hw/ppc_prep.c
diff options
context:
space:
mode:
authoraurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>2009-01-09 13:10:41 +0000
committeraurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>2009-01-09 13:10:41 +0000
commit5652ef78d1295c149cdbe68db09806ec7d266083 (patch)
treeafa4391fafedf764c3817062f5630a116568d3cc /hw/ppc_prep.c
parente5d01b06776fcc2cc6e75c32959c921daea86d02 (diff)
mips, ppc: make sure nd->model is always defined
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6261 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/ppc_prep.c')
-rw-r--r--hw/ppc_prep.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
index 571c48e138..d6023993c5 100644
--- a/hw/ppc_prep.c
+++ b/hw/ppc_prep.c
@@ -671,8 +671,10 @@ static void ppc_prep_init (ram_addr_t ram_size, int vga_ram_size,
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);