falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/versatilepb, realview: Fix condition for instantiation of onboard NIC 

Correct the condition determining whether we instantiate the onboard
NIC or a PCI card NIC on VersatilePB and Realview boards. This was broken
in two ways:
 (1) if the user asked for two default NICs ("-net nic -net nic") we would
crash trying to strcmp() a NULL pointer
 (2) if the user asked for two NICs explicitly of the same model as the
onboard NIC (eg "-net nic,model=smc91c111 -net nic,model=smc91c111")
we would try to instantiate two onboard NICs at the same address.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
This commit is contained in:
Peter Maydell 2011-03-22 18:21:58 +00:00 committed by Aurelien Jarno
parent 366c933245
commit e6b3c8ca02
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/realview.c
View File

@ -288,8 +288,8 @@ static void realview_init(ram_addr_t ram_size,
for(n = 0; n < nb_nics; n++) { for(n = 0; n < nb_nics; n++) {
nd = &nd_table[n]; nd = &nd_table[n];
if ((!nd->model && !done_nic) if (!done_nic && (!nd->model ||
|| strcmp(nd->model, is_pb ? "lan9118" : "smc91c111") == 0) { strcmp(nd->model, is_pb ? "lan9118" : "smc91c111") == 0)) {
if (is_pb) { if (is_pb) {
lan9118_init(nd, 0x4e000000, pic[28]); lan9118_init(nd, 0x4e000000, pic[28]);
} else { } else {

2
hw/versatilepb.c
View File

@ -223,7 +223,7 @@ static void versatile_init(ram_addr_t ram_size,
for(n = 0; n < nb_nics; n++) { for(n = 0; n < nb_nics; n++) {
nd = &nd_table[n]; nd = &nd_table[n];
if ((!nd->model && !done_smc) || strcmp(nd->model, "smc91c111") == 0) { if (!done_smc && (!nd->model || strcmp(nd->model, "smc91c111") == 0)) {
smc91c111_init(nd, 0x10010000, sic[25]); smc91c111_init(nd, 0x10010000, sic[25]);
done_smc = 1; done_smc = 1;
} else { } else {