Re: [PATCH 01/10] hw/arm/realview: Simplify using 'break' statement

[Richard Henderson <richard.henderson@linaro.org>]

On 5/24/23 07:58, Philippe Mathieu-Daudé wrote:
> The 'break' statement terminates the execution of the nearest
> enclosing 'for' statement in which it appears.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/arm/realview.c | 6 ++----
>   1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/hw/arm/realview.c b/hw/arm/realview.c
> index a5aa2f046a..a52ff35084 100644
> --- a/hw/arm/realview.c
> +++ b/hw/arm/realview.c
> @@ -88,7 +88,6 @@ static void realview_init(MachineState *machine,
>       I2CBus *i2c;
>       int n;
>       unsigned int smp_cpus = machine->smp.cpus;
> -    int done_nic = 0;
>       qemu_irq cpu_irq[4];
>       int is_mpcore = 0;
>       int is_pb = 0;
> @@ -294,14 +293,13 @@ static void realview_init(MachineState *machine,
>       for(n = 0; n < nb_nics; n++) {
>           nd = &nd_table[n];
>   
> -        if (!done_nic && (!nd->model ||
> -                    strcmp(nd->model, is_pb ? "lan9118" : "smc91c111") == 0)) {
> +        if (!nd->model || strcmp(nd->model, is_pb ? "lan9118" : "smc91c111") == 0) {
>               if (is_pb) {
>                   lan9118_init(nd, 0x4e000000, pic[28]);
>               } else {
>                   smc91c111_init(nd, 0x4e000000, pic[28]);
>               }
> -            done_nic = 1;
> +            break;

While I agree this preserves existing behaviour, it doesn't seem like the logic is 
actually correct.  This will only ever connect 1 of nb_nics.


r~


>           } else {
>               if (pci_bus) {
>                   pci_nic_init_nofail(nd, pci_bus, "rtl8139", NULL);