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 CA0D9C47422 for ; Fri, 26 Jan 2024 14:10:28 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rTMtn-00062s-DM; Fri, 26 Jan 2024 09:09:39 -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 1rTMtk-000620-9d for qemu-devel@nongnu.org; Fri, 26 Jan 2024 09:09:36 -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 1rTMth-00005E-QX for qemu-devel@nongnu.org; Fri, 26 Jan 2024 09:09:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706278173; 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=NO7X1dwpU5Xvr/LrJb2bnn9ffrjcQd9yPnLE3T0EJgM=; b=g2EmhkgIfNxw/VWXiTx+AQ3V/akW3Y1dYD5mjA2X5O9vPlBe6KjklN/mQP0gjesscuh4p3 R7O8j19Mkgm7O07UHTCBKhVMC2UQ5ZMp5SPmyuDCU6YD4SsNriKcfOWZY7bn6fb3BwxxmT 5NHVUVasfBPqCu6O7/uIH4DYEvUBfWQ= Received: from mail-il1-f197.google.com (mail-il1-f197.google.com [209.85.166.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-468-uSt0i6BhN5iVH6T5wFeqbg-1; Fri, 26 Jan 2024 09:09:31 -0500 X-MC-Unique: uSt0i6BhN5iVH6T5wFeqbg-1 Received: by mail-il1-f197.google.com with SMTP id e9e14a558f8ab-361a9198bffso1765415ab.0 for ; Fri, 26 Jan 2024 06:09:31 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706278171; x=1706882971; 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=NO7X1dwpU5Xvr/LrJb2bnn9ffrjcQd9yPnLE3T0EJgM=; b=hPa3YB5TkCBReY75BJZ7AmVUCJtS9+2kUmF53OzRKYB3AOZjE1mxphXSty/XgPOHC7 4a5j6fGgltUvgPcSkmgS/wqxTfLuXxBe1zBcRltZRl0Hb+3rndquHfm+US4QenjCedLf Zfcp8zJTDfokhZWcIBSk+0/1B1cZDTX7yYvGbdNj1H0ge2HatldnUcUqz4d3xRBWDBz1 EQTaGx2vqst0oV6y8PgokXE8XZ4hCHRb5vwxZIx6xR2G4KxhjDCLxzCNiA0AFt7BmbZi W25d338UZtkf/wV1/3wBnMpTKFTgPX73nnVJHFSTHvz9YdwXLKTjHxty+HYIDbtiL+PH 4VYg== X-Gm-Message-State: AOJu0Yw4hLdaQotwUPWxA542nYRBoJjGF6dHR/t4aXlgvhOeQtDe35Z/ Gr7vgjN3GyUz/5/YVxnWzWVZWM3nH7Ju+S8yh/PP6x2a43kAKRvYMYV+mEC7QzY6K5v/XxW4jtD 2gUEt0AOdwi/s3e6yT2zgiJvbup1MWRSnsr8Whnvmf58dw+Y2sTkF X-Received: by 2002:a05:6e02:1485:b0:35f:f880:10ec with SMTP id n5-20020a056e02148500b0035ff88010ecmr1108850ilk.4.1706278170831; Fri, 26 Jan 2024 06:09:30 -0800 (PST) X-Google-Smtp-Source: AGHT+IEOZ9u2mMQVhkRNNWWWISV7liSk3fthtoJ6m5CDLOFBQhKRYyEd2roTBFBjCy9bijfswKayuQ== X-Received: by 2002:a05:6e02:1485:b0:35f:f880:10ec with SMTP id n5-20020a056e02148500b0035ff88010ecmr1108832ilk.4.1706278170540; Fri, 26 Jan 2024 06:09:30 -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 f3-20020a056638022300b0046e509dd7a1sm289947jaq.118.2024.01.26.06.09.27 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 26 Jan 2024 06:09:30 -0800 (PST) Message-ID: <441fd675-56f8-406d-9bda-031f0c723b12@redhat.com> Date: Fri, 26 Jan 2024 15:09:26 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3 16/46] hw/ppc/spapr: use qemu_get_nic_info() and pci_init_nic_devices() Content-Language: en-US To: David Woodhouse , qemu-devel@nongnu.org, qemu-ppc@nongnu.org Cc: =?UTF-8?Q?C=C3=A9dric_Le_Goater?= , Jason Wang , Mark Cave-Ayland , Nicholas Piggin , Daniel Henrique Barboza , David Gibson , Harsh Prateek Bora , David Woodhouse References: <20240108204909.564514-1-dwmw2@infradead.org> <20240108204909.564514-17-dwmw2@infradead.org> From: Thomas Huth Autocrypt: addr=thuth@redhat.com; keydata= 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 In-Reply-To: <20240108204909.564514-17-dwmw2@infradead.org> 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: -33 X-Spam_score: -3.4 X-Spam_bar: --- X-Spam_report: (-3.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.313, 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, 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-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 08/01/2024 21.26, David Woodhouse wrote: > From: David Woodhouse > > Avoid directly referencing nd_table[] by first instantiating any > spapr-vlan devices using a qemu_get_nic_info() loop, then calling > pci_init_nic_devices() to do the rest. > > No functional change intended. > > Signed-off-by: David Woodhouse > --- > hw/ppc/spapr.c | 18 +++++------------- > 1 file changed, 5 insertions(+), 13 deletions(-) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 4997aa4f1d..37604e7caf 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -2796,6 +2796,7 @@ static void spapr_machine_init(MachineState *machine) > MemoryRegion *sysmem = get_system_memory(); > long load_limit, fw_size; > Error *resize_hpt_err = NULL; > + NICInfo *nd; > > if (!filename) { > error_report("Could not find LPAR firmware '%s'", bios_name); > @@ -2996,21 +2997,12 @@ static void spapr_machine_init(MachineState *machine) > > phb = spapr_create_default_phb(); > > - for (i = 0; i < nb_nics; i++) { > - NICInfo *nd = &nd_table[i]; > - > - if (!nd->model) { > - nd->model = g_strdup("spapr-vlan"); > - } > - > - if (g_str_equal(nd->model, "spapr-vlan") || > - g_str_equal(nd->model, "ibmveth")) { > - spapr_vlan_create(spapr->vio_bus, nd); > - } else { > - pci_nic_init_nofail(&nd_table[i], phb->bus, nd->model, NULL); > - } > + while ((nd = qemu_find_nic_info("spapr-vlan", true, "ibmveth"))) { > + spapr_vlan_create(spapr->vio_bus, nd); > } > > + pci_init_nic_devices(phb->bus, NULL); > + > for (i = 0; i <= drive_get_max_bus(IF_SCSI); i++) { > spapr_vscsi_create(spapr->vio_bus); > } Reviewed-by: Thomas Huth