From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=57718 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q26DY-00070N-4K for qemu-devel@nongnu.org; Tue, 22 Mar 2011 14:22:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q26DW-0003oi-RK for qemu-devel@nongnu.org; Tue, 22 Mar 2011 14:22:08 -0400 Received: from mnementh.archaic.org.uk ([81.2.115.146]:38095) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q26DW-0003nz-KG for qemu-devel@nongnu.org; Tue, 22 Mar 2011 14:22:06 -0400 From: Peter Maydell Date: Tue, 22 Mar 2011 18:21:58 +0000 Message-Id: <1300818118-8047-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH] hw/versatilepb, realview: Fix condition for instantiation of onboard NIC List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: patches@linaro.org 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 --- hw/realview.c | 4 ++-- hw/versatilepb.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/realview.c b/hw/realview.c index a67861e..96fb9da 100644 --- a/hw/realview.c +++ b/hw/realview.c @@ -288,8 +288,8 @@ static void realview_init(ram_addr_t ram_size, for(n = 0; n < nb_nics; n++) { nd = &nd_table[n]; - if ((!nd->model && !done_nic) - || strcmp(nd->model, is_pb ? "lan9118" : "smc91c111") == 0) { + if (!done_nic && (!nd->model || + strcmp(nd->model, is_pb ? "lan9118" : "smc91c111") == 0)) { if (is_pb) { lan9118_init(nd, 0x4e000000, pic[28]); } else { diff --git a/hw/versatilepb.c b/hw/versatilepb.c index 9f1bfcf..46b6a3f 100644 --- a/hw/versatilepb.c +++ b/hw/versatilepb.c @@ -223,7 +223,7 @@ static void versatile_init(ram_addr_t ram_size, for(n = 0; n < nb_nics; 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]); done_smc = 1; } else { -- 1.7.1