From nobody Thu Nov 28 10:53:54 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1692985970; cv=none; d=zohomail.com; s=zohoarc; b=KPliL71ehun/L4L8GO495sIOFVp0Lc5PBKmFhrV5mn9dMRBlP7psPDO9Z00mCxhy1wFM6VX+ZFXz+LaOiXeenv8lOBj53XbB55FiVxuuqtnbbFxUbzwbJDxkWtA/LMIIxL1aSJsEhLXuzNhs+lcBcfsbmoudm3r3ExQkCm5PRxQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692985970; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Q/U6yu/q06QRRglGNRuIjVC/824TEYwlNE4A/1nMHOk=; b=fWUkqMTlDprgdWSz2vLBvubj02CPgInDmlYTbpxnUBnc5kOSst+wNK2zSsZkWdEGW/8pL1QY5UgorL9oQ1mrdIun6VMAJqNlwanHOASWoSiua6c+zBHzaGYicyaWNMxcJeHOUJCn2LEVt2EPrAIEfhAq1zXr3AfgfoCHTdBtdgg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1692985970102295.43423170557935; Fri, 25 Aug 2023 10:52:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qZayH-0005PB-Du; Fri, 25 Aug 2023 13:51:45 -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 1qZayF-0005N9-G1 for qemu-devel@nongnu.org; Fri, 25 Aug 2023 13:51:43 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qZayD-0000ky-FF for qemu-devel@nongnu.org; Fri, 25 Aug 2023 13:51:43 -0400 Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-647-ejIGPbiXMmeLYh3amTi3SA-1; Fri, 25 Aug 2023 13:51:34 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9047F1C07846; Fri, 25 Aug 2023 17:51:33 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.97]) by smtp.corp.redhat.com (Postfix) with ESMTP id 51E1A6B2B6; Fri, 25 Aug 2023 17:51:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692985900; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Q/U6yu/q06QRRglGNRuIjVC/824TEYwlNE4A/1nMHOk=; b=DO7ZOsl/B/xhjQbuvTGL4nHqfm2G/73jrjsQvSeqbVDEA1GGSAO2+91twB1YnUBOdHT+8n UfF9Y1++Zcd59F/5cz30tNx++RX5ETy7RCfajJOk6mAA55pYdNzF7/OuRlsGciGz89vt2t p/YRoh640Q7oXfUDPxcwlJNV7RZEVyY= X-MC-Unique: ejIGPbiXMmeLYh3amTi3SA-1 From: Thomas Huth To: qemu-devel@nongnu.org, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Cc: Jiaxun Yang , qemu-trivial@nongnu.org Subject: [PATCH 3/3] hw/mips/jazz: Simplify the NIC setup code Date: Fri, 25 Aug 2023 19:51:23 +0200 Message-Id: <20230825175123.624114-4-thuth@redhat.com> In-Reply-To: <20230825175123.624114-1-thuth@redhat.com> References: <20230825175123.624114-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1692985971038100003 Content-Type: text/plain; charset="utf-8" The for-loop does not make much sense here - it is always left after the first iteration, so we can also check for nb_nics =3D=3D 1 instead which is way easier to understand. Also, the checks for nd->model are superfluous since the code in mips_jazz_init_net() calls qemu_check_nic_model() that already takes care of this (i.e. initializing nd->model if it has not been set yet, and checking whether it is the "help" option or the supported NIC model). Signed-off-by: Thomas Huth --- hw/mips/jazz.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c index a95a1bd743..86cd1d2fb2 100644 --- a/hw/mips/jazz.c +++ b/hw/mips/jazz.c @@ -172,7 +172,6 @@ static void mips_jazz_init(MachineState *machine, MemoryRegion *rtc =3D g_new(MemoryRegion, 1); MemoryRegion *dma_dummy =3D g_new(MemoryRegion, 1); MemoryRegion *dp8393x_prom =3D g_new(MemoryRegion, 1); - NICInfo *nd; DeviceState *dev, *rc4030; MMIOKBDState *i8042; SysBusDevice *sysbus; @@ -315,21 +314,11 @@ static void mips_jazz_init(MachineState *machine, } =20 /* Network controller */ - for (n =3D 0; n < nb_nics; n++) { - nd =3D &nd_table[n]; - if (!nd->model) { - nd->model =3D g_strdup("dp83932"); - } - if (strcmp(nd->model, "dp83932") =3D=3D 0) { - mips_jazz_init_net(nd, rc4030_dma_mr, rc4030, dp8393x_prom); - break; - } else if (is_help_option(nd->model)) { - error_report("Supported NICs: dp83932"); - exit(1); - } else { - error_report("Unsupported NIC: %s", nd->model); - exit(1); - } + if (nb_nics =3D=3D 1) { + mips_jazz_init_net(&nd_table[0], rc4030_dma_mr, rc4030, dp8393x_pr= om); + } else if (nb_nics > 1) { + error_report("This machine only supports one NIC"); + exit(1); } =20 /* SCSI adapter */ --=20 2.39.3