diff options
| author | aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-01-09 13:10:41 +0000 |
|---|---|---|
| committer | aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-01-09 13:10:41 +0000 |
| commit | 5652ef78d1295c149cdbe68db09806ec7d266083 (patch) | |
| tree | afa4391fafedf764c3817062f5630a116568d3cc | |
| parent | e5d01b06776fcc2cc6e75c32959c921daea86d02 (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
| -rw-r--r-- | hw/mips_r4k.c | 6 | ||||
| -rw-r--r-- | hw/ppc_prep.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c index 6551b02e0b..56a1719af0 100644 --- a/hw/mips_r4k.c +++ b/hw/mips_r4k.c @@ -248,8 +248,10 @@ void mips_r4k_init (ram_addr_t ram_size, int vga_ram_size, 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"); 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); |