From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C4BBBC77B7A for ; Wed, 24 May 2023 19:01:46 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q1tjP-0007AU-01; Wed, 24 May 2023 15:01:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q1tjN-00079p-F1 for qemu-devel@nongnu.org; Wed, 24 May 2023 15:01:05 -0400 Received: from mail-pf1-x42e.google.com ([2607:f8b0:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q1tjK-0005uA-Ig for qemu-devel@nongnu.org; Wed, 24 May 2023 15:01:05 -0400 Received: by mail-pf1-x42e.google.com with SMTP id d2e1a72fcca58-64d41d8bc63so1048903b3a.0 for ; Wed, 24 May 2023 12:01:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684954861; x=1687546861; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=FtLkIAzjTkJ+aVYj7imKJKMmgu33aX0vxDAXdscaFFE=; b=cIHgACVJ+iolKcvWVX5j8jZodVxEMxftC+4FErPZw0s89kqSiUs/trtvRstLO4GZvj F2c1K6b7GHtwIIYAZSdQaDE+HIVemNF66SijLS/j+pnyPa3mgbO5Op900+Kxf3J094VN AaQxJf35nI1jSk9144M6Pzv9fHUHmslSGPstJHr4Ppqbi46hOitPbsQsvVrpoceTy04n Uwrk00Ke1Q3w3n/MvVmoN49okWplqOFge3IeV8CLOfNrP7VWp7fGmJ9ndThFXWuJYorn Fa8p5+4UYQHb70eOYSp6BZfn1xY4ILWRzULS5+YuXwR10Ppa432dM/4jTxnCra44dmU5 lzIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684954861; x=1687546861; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=FtLkIAzjTkJ+aVYj7imKJKMmgu33aX0vxDAXdscaFFE=; b=H1xcqNjk0+WZRBSvYBR2+Q9xEDYTIZrfbou1Kp9esW13atYqiW21zSegsb7YjxApXN nyC7/hxRH5jQVhQ2RZCvW2zyw2tdjVG96zoK0FfJqs4P/OR6MR0Rp4DZ+pqZIBKXCxLN IhBTWruUW+Zgi/H5dUab8aGmJaqX8MUzclb1/b5Nn7ETABi24Ya2wtnlrSBUUIz+hTOy S0me/L/onsfp3hpnsLqhwhza6MndcQsxBCqboWDMSpY/uw1rVWQ6aH0Z6PCsExsoVMFX LdNMHlMZXfrzGNBLKumn47M/YgC00btrzfcANsXHA77GpXdIxaXHWrtoVXUMeuc2v9FG ZXLg== X-Gm-Message-State: AC+VfDzPkY6JcRAuFOpwPWkoUqcnaqW2R8R5Lvm/LUl5srQyd2FyVUhD VIsjxcSdF1TJidSnPY67EjBvSA== X-Google-Smtp-Source: ACHHUZ7sdDKaerBRDYAV4kTNQJOCfxh6bEVN0Lp27cqsSxxK/C7AH+hpfpU/XhVQLthWBiNEJ5jQEA== X-Received: by 2002:a17:903:2343:b0:1ae:bf5:7a7 with SMTP id c3-20020a170903234300b001ae0bf507a7mr21597756plh.35.1684954860802; Wed, 24 May 2023 12:01:00 -0700 (PDT) Received: from ?IPV6:2602:ae:1598:4c01:6b03:9af2:33c1:3d6b? ([2602:ae:1598:4c01:6b03:9af2:33c1:3d6b]) by smtp.gmail.com with ESMTPSA id bj6-20020a170902850600b001a183ade911sm9080278plb.56.2023.05.24.12.01.00 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 24 May 2023 12:01:00 -0700 (PDT) Message-ID: <78cc4cd6-f961-a271-6d00-b04d5a5732ff@linaro.org> Date: Wed, 24 May 2023 12:00:58 -0700 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Subject: Re: [PATCH 01/10] hw/arm/realview: Simplify using 'break' statement Content-Language: en-US To: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, Thomas Huth References: <20230524145906.33156-1-philmd@linaro.org> <20230524145906.33156-2-philmd@linaro.org> From: Richard Henderson In-Reply-To: <20230524145906.33156-2-philmd@linaro.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::42e; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42e.google.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.107, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.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é > --- > 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);