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 13869C47DDB for ; Fri, 26 Jan 2024 16:24:30 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rTP04-0000yz-Bn; Fri, 26 Jan 2024 11:24:16 -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 1rTP02-0000y2-Im for qemu-devel@nongnu.org; Fri, 26 Jan 2024 11:24:14 -0500 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 1rTP00-0000q9-TY for qemu-devel@nongnu.org; Fri, 26 Jan 2024 11:24:14 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706286252; 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=rMQuR8R6QlQHRSwOG/FSTc/zzqVC7dZA/DT7zA6+8dI=; b=NfIfPoMnCXk56gHN19dQSEaYamfWciUd+2GiAcToIOCjqSlkE73/xGCmwYURLq6YSI4rX4 r6ZoKhZRNiID64hACQbRz3P+hqMuV1BcpzM5d1VyxF+PmuXRi9rgiu20ScfmtKxUv8xd76 /MIhOjjWXR76Rl0+akfaSob6aMfH2f0= Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-61-7n-VIHdFPMS2QBANEZdfFA-1; Fri, 26 Jan 2024 11:24:10 -0500 X-MC-Unique: 7n-VIHdFPMS2QBANEZdfFA-1 Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-783ddd331f5so50703985a.1 for ; Fri, 26 Jan 2024 08:24:10 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706286250; x=1706891050; 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=rMQuR8R6QlQHRSwOG/FSTc/zzqVC7dZA/DT7zA6+8dI=; b=POK1H7WKovwTEQask5Cm2HnU5lmfmbjsUNyGLuaqgMYGZqdDett/EVeeDl/UV9jNeg +DT/udBJojz5O0vlXXffLRiLnbs9yLueSbxheGx4sYxA30CSTG8YQ4nITAb+tRd6tPWc XutDbLBzZOX/ZGJ1CuOa2CSKUtcAV7yxSkrYts3nKjS7kRJD2ZK8tcpxVDjGAx+Q0u7c FWDJCvTX+iOf+MeOxR65OuEupn0Ga0DpzxPxMJFQ0E/9P9OIh8fZ0FTZaBMwz0GldwEJ 30qk2bhk6xwm0vIEJC8PpzaFg2kJ+fALAlLGYuSigXsVr/Jzrt0/4v3QtCI3OgCNhJj7 6UVQ== X-Gm-Message-State: AOJu0Yy54z2Q4rLmqIp7xm9vrPubhzek2I7ZwFQtXTM1HvbUNhYHmM/9 wVIiiwmWexO7datxvbm0VBwJd+KtGeFIggxzIMpXQ5ViMPFZJBJmZGk3b+/Cx7xwS+wNdRuT1O/ g/y+rEAKQhx+0q02k3OiCobYFd74JDJ+HhY43lHUd6oNLejuHgpUW X-Received: by 2002:ae9:f441:0:b0:783:72be:ad7b with SMTP id z1-20020ae9f441000000b0078372bead7bmr117676qkl.49.1706286249871; Fri, 26 Jan 2024 08:24:09 -0800 (PST) X-Google-Smtp-Source: AGHT+IGve8osCeSz94pphOQKBeiYKdjKW3PTHAEmsCCFmca81zDyaESrbU9kB6ceXp2nM2J6gkk/hQ== X-Received: by 2002:ae9:f441:0:b0:783:72be:ad7b with SMTP id z1-20020ae9f441000000b0078372bead7bmr117656qkl.49.1706286249602; Fri, 26 Jan 2024 08:24:09 -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 n16-20020ae9c310000000b007832895cf8csm703584qkg.38.2024.01.26.08.23.56 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 26 Jan 2024 08:24:09 -0800 (PST) Message-ID: Date: Fri, 26 Jan 2024 17:23:54 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3 31/46] hw/net/etraxfs-eth: use qemu_configure_nic_device() Content-Language: en-US To: David Woodhouse , qemu-devel@nongnu.org, "Edgar E. Iglesias" 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 , 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 , Magnus Damm , Artyom Tarasenko , Stefano Stabellini , Anthony Perard , Paul Durrant , Max Filippov , David Woodhouse References: <20240108204909.564514-1-dwmw2@infradead.org> <20240108204909.564514-32-dwmw2@infradead.org> From: Thomas Huth Autocrypt: addr=thuth@redhat.com; keydata= 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 In-Reply-To: <20240108204909.564514-32-dwmw2@infradead.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit 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: -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_H4=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=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 08/01/2024 21.27, David Woodhouse wrote: > From: David Woodhouse > > Signed-off-by: David Woodhouse > --- > hw/cris/axis_dev88.c | 9 ++++----- > hw/net/etraxfs_eth.c | 5 ++--- > include/hw/cris/etraxfs.h | 2 +- > 3 files changed, 7 insertions(+), 9 deletions(-) > > diff --git a/hw/cris/axis_dev88.c b/hw/cris/axis_dev88.c > index d82050d927..5556634921 100644 > --- a/hw/cris/axis_dev88.c > +++ b/hw/cris/axis_dev88.c > @@ -308,15 +308,14 @@ void axisdev88_init(MachineState *machine) > > /* Add the two ethernet blocks. */ > dma_eth = g_malloc0(sizeof dma_eth[0] * 4); /* Allocate 4 channels. */ > - etraxfs_eth_init(&nd_table[0], 0x30034000, 1, &dma_eth[0], &dma_eth[1]); > - if (nb_nics > 1) { > - etraxfs_eth_init(&nd_table[1], 0x30036000, 2, &dma_eth[2], &dma_eth[3]); > - } > > + etraxfs_eth_init(0x30034000, 1, &dma_eth[0], &dma_eth[1]); > /* The DMA Connector block is missing, hardwire things for now. */ > etraxfs_dmac_connect_client(etraxfs_dmac, 0, &dma_eth[0]); > etraxfs_dmac_connect_client(etraxfs_dmac, 1, &dma_eth[1]); > - if (nb_nics > 1) { > + > + if (qemu_find_nic_info("etraxfs-eth", true, "fseth")) { > + etraxfs_eth_init(0x30036000, 2, &dma_eth[2], &dma_eth[3]); > etraxfs_dmac_connect_client(etraxfs_dmac, 6, &dma_eth[2]); > etraxfs_dmac_connect_client(etraxfs_dmac, 7, &dma_eth[3]); > } > diff --git a/hw/net/etraxfs_eth.c b/hw/net/etraxfs_eth.c > index ba57a978d1..5faf20c782 100644 > --- a/hw/net/etraxfs_eth.c > +++ b/hw/net/etraxfs_eth.c > @@ -647,15 +647,14 @@ static void etraxfs_eth_class_init(ObjectClass *klass, void *data) > > /* Instantiate an ETRAXFS Ethernet MAC. */ > DeviceState * > -etraxfs_eth_init(NICInfo *nd, hwaddr base, int phyaddr, > +etraxfs_eth_init(hwaddr base, int phyaddr, > struct etraxfs_dma_client *dma_out, > struct etraxfs_dma_client *dma_in) > { > DeviceState *dev; > - qemu_check_nic_model(nd, "fseth"); > > dev = qdev_new("etraxfs-eth"); > - qdev_set_nic_properties(dev, nd); > + qemu_configure_nic_device(dev, true, "fseth"); > qdev_prop_set_uint32(dev, "phyaddr", phyaddr); > > /* > diff --git a/include/hw/cris/etraxfs.h b/include/hw/cris/etraxfs.h > index 467b529dc0..012c4e9974 100644 > --- a/include/hw/cris/etraxfs.h > +++ b/include/hw/cris/etraxfs.h > @@ -31,7 +31,7 @@ > #include "hw/sysbus.h" > #include "qapi/error.h" > > -DeviceState *etraxfs_eth_init(NICInfo *nd, hwaddr base, int phyaddr, > +DeviceState *etraxfs_eth_init(hwaddr base, int phyaddr, > struct etraxfs_dma_client *dma_out, > struct etraxfs_dma_client *dma_in); > Reviewed-by: Thomas Huth