From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a17:907:9874:b0:a31:23a7:2a34 with SMTP id ko20csp791519ejc; Fri, 26 Jan 2024 02:45:04 -0800 (PST) X-Google-Smtp-Source: AGHT+IGQgyAwJyX2XyY01aRDY1NxxwF6+mhi/RZTBYQi3lsabH28RbtjQixsCrGts17/S+SZpL8M X-Received: by 2002:a05:620a:45a5:b0:783:bc25:cefb with SMTP id bp37-20020a05620a45a500b00783bc25cefbmr1258770qkb.88.1706265903801; Fri, 26 Jan 2024 02:45:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706265903; cv=none; d=google.com; s=arc-20160816; b=GnnWXaJvZPNHFAZnGyyPo6QRQJJzM9uoEtp/Hl7x/rX5x+d96fELtVjBR+LvQeIcAF IbXhY1skFRWXvzAtDccfUGZW9X9M0fhrjWcKdBvKZNjbwdDbnxckDOqugw71f4SDpJuf +tv2Rv3pgvbXF9/9Tpq2omcgAfohECp8VOEQ8QoR1dAtyPspvmOMSdCag441Bq1FUoJ2 xdmXakW4SLbYa5gYuLdvUcnGngybGaQ92pZhJATqFQdZhgp8I4Ul1yNzEYe8n5M02gcu HvxEnYBEK/F2HaB9zCmFOx+wcZy8GpMbdIITEvasYY0FOjHpmEYTu6VIyadNL8YQnckx VF8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :content-language:in-reply-to:autocrypt:from:references:cc:to :subject:user-agent:mime-version:date:message-id:dkim-signature; bh=qdgZVkts9TNdCcMB7WSm4PePcnSmcwv1SyVUyDuZlro=; fh=RIVWBOSs2OZlP7XXIPkGQw38oz8oDq1OvCeujjh55qg=; b=oQHfh2g3ZyTHmiP7yd6u8xrySgGL/aT9gJACf6ICVkQexL6vnvIswkTqh90s9lC2GI r9EBvGbbR/D/WZu9LRcazOMEtKSNdouBUr3M7Q0ElH3qRAqadZVKwuoNQvz6BzrGmf36 7K4c30rkoVn8lq2fO7b4cdsvmmZjZyU63LwJtbilRizqoJyxBQZlK2GYF5GWt7yZhfzW IsRiLLl0yQSlwT5dnbwut2HTFX7bp1sxTldYNyEgsle6zmpjiGY2iPOYzQTCK7CvEN8C g0jCOuLTf4QFyLGQsP+as/euIBkVxVIl0aZ1g7i51NB9WbKws45H09CMtVo5nsJyGzLY cHyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=J4uHGz3j; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k26-20020ae9f11a000000b00783376514b6si1018726qkg.366.2024.01.26.02.45.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Jan 2024 02:45:03 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=J4uHGz3j; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rTJhY-0000hd-Ux; Fri, 26 Jan 2024 05:44:48 -0500 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 1rTJhX-0000gN-1h for qemu-arm@nongnu.org; Fri, 26 Jan 2024 05:44:47 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rTJhT-0002pX-G3 for qemu-arm@nongnu.org; Fri, 26 Jan 2024 05:44:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706265860; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=qdgZVkts9TNdCcMB7WSm4PePcnSmcwv1SyVUyDuZlro=; b=J4uHGz3jqVTrH4AP1dg3FveprL3OlQI8UKqZCTjaj1qOStIGDpqIM7UKsM0m3abGqo/2UJ iZYyiNOk991jEeUVbxFgvKenH85D9GE2A52oi6b6HPx24dOJ6bwR4eNY1Vxd2iYQo7h4od BDfl4xeQBBK8I3BSLN/jri209SV1NvI= Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-442-eb2VohstMqOdMRO-WBg1-w-1; Fri, 26 Jan 2024 05:44:18 -0500 X-MC-Unique: eb2VohstMqOdMRO-WBg1-w-1 Received: by mail-qt1-f200.google.com with SMTP id d75a77b69052e-429f3c43c66so2658881cf.1 for ; Fri, 26 Jan 2024 02:44:18 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706265858; x=1706870658; h=content-transfer-encoding:in-reply-to:autocrypt: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=qdgZVkts9TNdCcMB7WSm4PePcnSmcwv1SyVUyDuZlro=; b=ubNken2q0w4OLu6vFQhNTKC6IWRhhHG4qXTqj1PeqGgex8ze6TdiegI240CXZpHp9E Bg1pVjQfJ8srn6BVncztLNSlIJtapzooIXw9RwL/WfkTdWOqqbGSV7b9m2k5bHS3fbHb 5aJlTVV3Jbh1oGQtgB1PoKNYhMQqq9WPlHLZL3KykcsNVUC3Ky2hBBZZnwU1fhTrdycO 3ACUWqnM7IDOmnGXv/R7HVYFHfEOdXd6PgBunOcTZR+6fs7wUcvkZiBSaW7i3OjVgjRw KZQb4Hg4ry2fNee0UHZh5jWWMC9xOWrF6t3RAdUnc6flaYZEi6qcvcJBgLvSlB55wz8E jtnw== X-Gm-Message-State: AOJu0Yww8vuFR/56fUwl6O8XyzM1H5bLk9R5N7hwldTc/iF7A9oyxInL JE87gnSVkx79cvtW24wBh82H149UleErZkrm1FIo5++9AnSz14+V16pDkBMGlW/7KeV2/LT8gcK JYkk+FR5wqZpAe1Ijb47NRNhqIVVSOEmhkatDZzJIK4TSxLvTGw== X-Received: by 2002:a05:622a:1244:b0:42a:85b1:9bdf with SMTP id z4-20020a05622a124400b0042a85b19bdfmr49561qtx.118.1706265857456; Fri, 26 Jan 2024 02:44:17 -0800 (PST) X-Received: by 2002:a05:622a:1244:b0:42a:85b1:9bdf with SMTP id z4-20020a05622a124400b0042a85b19bdfmr49529qtx.118.1706265856437; Fri, 26 Jan 2024 02:44:16 -0800 (PST) Received: from [192.168.0.9] (ip-109-43-176-119.web.vodafone.de. [109.43.176.119]) by smtp.gmail.com with ESMTPSA id z5-20020ac86b85000000b0042a6859ff3esm405399qts.61.2024.01.26.02.44.02 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 26 Jan 2024 02:44:16 -0800 (PST) Message-ID: Date: Fri, 26 Jan 2024 11:43:59 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3 05/46] hw/i386/pc: use qemu_get_nic_info() and pci_init_nic_devices() To: David Woodhouse , qemu-devel@nongnu.org Cc: Richard Henderson , Beniamino Galvani , Peter Maydell , Strahinja Jankovic , Niek Linnenbank , =?UTF-8?Q?C=C3=A9dric_Le_Goater?= , Andrew Jeffery , Joel Stanley , Igor Mitsyanko , Jean-Christophe Dubois , Andrey Smirnov , =?UTF-8?Q?Philippe_Mathieu-Daud=C3=A9?= , Rob Herring , Subbaraya Sundeep , Jan Kiszka , Tyrone Ting , Hao Wu , Radoslaw Biernacki , Leif Lindholm , Marcin Juszkiewicz , "Edgar E. Iglesias" , Alistair Francis , Helge Deller , Paolo Bonzini , Eduardo Habkost , "Michael S. Tsirkin" , Marcel Apfelbaum , Song Gao , Thomas Huth , Laurent Vivier , Huacai Chen , Jiaxun Yang , =?UTF-8?Q?Herv=C3=A9_Poussineau?= , Aleksandar Rikalo , Aurelien Jarno , Jason Wang , Jia Liu , Stafford Horne , Mark Cave-Ayland , Nicholas Piggin , Daniel Henrique Barboza , David Gibson , Harsh Prateek Bora , Bin Meng , Palmer Dabbelt , Weiwei Li , Liu Zhiwei , Halil Pasic , Christian Borntraeger , Eric Farman , David Hildenbrand , Ilya Leoshkevich , Yoshinori Sato , Magnus Damm , Artyom Tarasenko , Stefano Stabellini , Anthony Perard , Paul Durrant , Max Filippov , qemu-arm@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-s390x@nongnu.org, xen-devel@lists.xenproject.org, David Woodhouse References: <20240108204909.564514-1-dwmw2@infradead.org> <20240108204909.564514-6-dwmw2@infradead.org> From: Thomas Huth Autocrypt: addr=thuth@redhat.com; keydata= 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 In-Reply-To: <20240108204909.564514-6-dwmw2@infradead.org> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=170.10.133.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=-1.5, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SORBS_WEB=1.5, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@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-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org X-TUID: vZEcwRgqWzfH On 08/01/2024 21.26, David Woodhouse wrote: > From: David Woodhouse > > Eliminate direct access to nd_table[] and nb_nics by processing the the > Xen and ISA NICs first and then calling pci_init_nic_devices() for the > rest. > > Signed-off-by: David Woodhouse > Reviewed-by: Paul Durrant > --- > hw/i386/pc.c | 26 ++++++++++++++++---------- > include/hw/net/ne2000-isa.h | 2 -- > 2 files changed, 16 insertions(+), 12 deletions(-) > > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 496498df3a..d80c536d88 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -658,8 +658,11 @@ static void pc_init_ne2k_isa(ISABus *bus, NICInfo *nd) > { > static int nb_ne2k = 0; > > - if (nb_ne2k == NE2000_NB_MAX) > + if (nb_ne2k == NE2000_NB_MAX) { > + error_setg(&error_fatal, > + "maximum number of ISA NE2000 devices exceeded"); > return; > + } error_setg(&error_fatal, ...) quits QEMU, so the "return;" does not make much sense anymore. Now, according to include/qapi/error.h : * Please don't error_setg(&error_fatal, ...), use error_report() and * exit(), because that's more obvious. So I'd suggest to do that instead. Thanks, Thomas > isa_ne2000_init(bus, ne2000_io[nb_ne2k], > ne2000_irq[nb_ne2k], nd); > nb_ne2k++;