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

login
register
mail settings
Submitter Peter Maydell
Date March 22, 2011, 6:21 p.m.
Message ID <1300818118-8047-1-git-send-email-peter.maydell@linaro.org>
Download mbox | patch
Permalink /patch/87952/
State New
Headers show

Comments

Peter Maydell - March 22, 2011, 6:21 p.m.
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>
---
 hw/realview.c    |    4 ++--
 hw/versatilepb.c |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
Aurelien Jarno - April 1, 2011, 8:42 p.m.
On Tue, Mar 22, 2011 at 06:21:58PM +0000, Peter Maydell wrote:
> 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>
> ---
>  hw/realview.c    |    4 ++--
>  hw/versatilepb.c |    2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)

Thanks, applied.

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

Patch

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 {