From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a17:907:9874:b0:a31:23a7:2a34 with SMTP id ko20csp889221ejc; Fri, 26 Jan 2024 05:58:37 -0800 (PST) X-Google-Smtp-Source: AGHT+IGsAy/bOwh55JVB67d6U1KbCgtOU0hRPAvSp7b+lAuI5gEY/E5ThpN8bei8/FHUtjfrKOLd X-Received: by 2002:a05:6830:719e:b0:6de:9a76:dfae with SMTP id el30-20020a056830719e00b006de9a76dfaemr2537729otb.2.1706277517553; Fri, 26 Jan 2024 05:58:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706277517; cv=none; d=google.com; s=arc-20160816; b=mjqNXngR95Xuv1xZoKh7pu9J+A8vms7mq/40rHkMi5hnfzy8gRct58S0Co1pO5m985 al+/F35Gm6bPUrpvznTBmuxuWdsLMekVujouBUNQXW0DJ6riCSxD74LTGbCIBoHQZHOe Slcl+TOR7Cr8udTCtJFQ3rIf5P1trvfc61K7LB3U21ocZSCy0JwV6HU15MK4Td4zjlbP SSj7cxB2RpzLl6FXlSbWWUFkvwvxG4ywRdAV9/QNNdqx1TSG+NISRwR7F+de3UxLsL7S QPnCuu4DdlHhfjxN66onkqbQAFUmji4Dcvxr1IraZy395xpN6+aBL/gLQ9Lk1An85xcT rM9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:autocrypt :from:references:cc:to:subject:user-agent:mime-version:date :message-id:dkim-signature:sender:precedence:errors-to :list-subscribe:list-help:list-post:list-unsubscribe:list-id; bh=4f00KaOYW+hD0GFHAeduBNGn1fOJMEZkwWILKd+Ajqk=; fh=qaitVn3CqZfU6hyKoPn5hCqxlgT4S9GHz9nfyPTF7Jc=; b=Ttd0+U4y+aytBAVM3F4IpUu7OkZDZAtFNxU3J9Kyx4/Qx27rpObTbLDB7hSmPRXbZf 90txv1t3BJkordePIwj5lVOfBIVcj/5rErn7YU7wL8IpcxIddr8diTTd+R/rGZw5gsqY oe2ILBSa7fvzo2YITkvA4bjrQyUaO4p4+1LSjX2iWiJ9Jt1pI61xk1YhzQv2hJLejwto 9LkXToUdSM3C/xMmeT0oAXxM7qFfcJxkdIuH4iTtSWSaSsw3vb/Eip9/wnj5wKPoBFHY dwndj4a2PuPPnS5FNpqfV/9Yz+HJuuPEHrF1cLTGIbCz4Sp/Y3aeFAwQTUQv8y+d8sTy 8gUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="Zsc/GggB"; spf=pass (google.com: domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id w21-20020ac857d5000000b00429785b48cesi1297926qta.23.2024.01.26.05.58.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jan 2024 05:58:37 -0800 (PST) Received-SPF: pass (google.com: domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="Zsc/GggB"; spf=pass (google.com: domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from list by lists.xenproject.org with outflank-mailman.672020.1045612 (Exim 4.92) (envelope-from ) id 1rTMiM-0008Bj-OV; Fri, 26 Jan 2024 13:57:50 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 672020.1045612; Fri, 26 Jan 2024 13:57:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rTMiM-0008Bc-Ly; Fri, 26 Jan 2024 13:57:50 +0000 Received: by outflank-mailman (input) for mailman id 672020; Fri, 26 Jan 2024 13:57:49 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rTMiL-0008AH-Gg for xen-devel@lists.xenproject.org; Fri, 26 Jan 2024 13:57:49 +0000 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id e2f47acb-bc52-11ee-8a43-1f161083a0e0; Fri, 26 Jan 2024 14:57:48 +0100 (CET) Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-62-95RRimV7OUm4sRSmbOGkdA-1; Fri, 26 Jan 2024 08:57:46 -0500 Received: by mail-qv1-f72.google.com with SMTP id 6a1803df08f44-68b382f111dso6335056d6.3 for ; Fri, 26 Jan 2024 05:57:46 -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 bt3-20020ad455c3000000b0068698b10ae6sm520455qvb.119.2024.01.26.05.57.30 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 26 Jan 2024 05:57:45 -0800 (PST) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: e2f47acb-bc52-11ee-8a43-1f161083a0e0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706277467; 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=4f00KaOYW+hD0GFHAeduBNGn1fOJMEZkwWILKd+Ajqk=; b=Zsc/GggBMPGDdhGUQtXCWRCbrtSiL0H6+GTci6mbtmTQILy4AR1BT0rKikAFbB7s8M+3Jr ChmfdNQC3ZjiojUEkTRkOkanXude3xr7JlFctyWCHXdU3ybqODUMIg4gheUxUmlG7hNWOt syo1R/hygN+RlSzCYIWPGlBdAni79+A= X-MC-Unique: 95RRimV7OUm4sRSmbOGkdA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706277465; x=1706882265; 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=4f00KaOYW+hD0GFHAeduBNGn1fOJMEZkwWILKd+Ajqk=; b=vq3nQshFAeJhKPC75zQbf5wW+GHIkSKO+5WugKN7w0to/KBz76frFYJWAivWWFyfPW vhcifOZDvfY+2L75vGl7NC9GJtOccyfcLQYQUeJdpFAHxGqb3QvypNYRrYkOEslZuA8y AokWLstuohuUNUmyddfjQ8Xm0tCn6gMYAiOAKfReduJFqxVAFWqqddfUWDKWDXmIIEf5 p5O09XzaO4k4lfqBFAD8Ewbgmpg3AADl1HLSWFHYLVJVsOLhKDif5GTHD9GXY/B1edYj GUogYb32ZzLaBPAYEPZuaqfQ0gUjqyQy0RJ1viEoyrx1X/GjNmgRZB1pVgsw0PSscARq mhWA== X-Gm-Message-State: AOJu0YzrcP3RtfT4MWQp6ButR9JwW+VB+ka32e//8b72tW+nf3XiERrZ Vx+6zRZbJSE/hZRqGTGS5PYegjlGxoweg6/8GOiVq6TyJ5HdUOvxaX1lIO3A/lVCn4PW3s5Ic6V WFxGeguj7RA8rEEk3dDB6NSi7tmZ5xJ8xammTrZ95ja41x25/UJ0hQInPmW12o2cV X-Received: by 2002:a05:6214:1301:b0:681:899d:7169 with SMTP id pn1-20020a056214130100b00681899d7169mr1527491qvb.70.1706277465593; Fri, 26 Jan 2024 05:57:45 -0800 (PST) X-Received: by 2002:a05:6214:1301:b0:681:899d:7169 with SMTP id pn1-20020a056214130100b00681899d7169mr1527480qvb.70.1706277465344; Fri, 26 Jan 2024 05:57:45 -0800 (PST) Message-ID: Date: Fri, 26 Jan 2024 14:57:29 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3 13/46] hw/mips/malta: use pci_init_nic_devices() To: David Woodhouse , qemu-devel@nongnu.org, =?UTF-8?Q?Philippe_Mathieu-Daud=C3=A9?= 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 , 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-14-dwmw2@infradead.org> From: Thomas Huth Autocrypt: addr=thuth@redhat.com; keydata= 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 In-Reply-To: <20240108204909.564514-14-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 X-TUID: qYKuyWq1WOuj On 08/01/2024 21.26, David Woodhouse wrote: > From: David Woodhouse > > The Malta board setup code would previously place the first NIC into PCI > slot 11 if was a PCNet card, and the rest (including the first if it was > anything other than a PCNet card) would be dynamically assigned. > > Now it will place any PCNet NIC into slot 11, and then anything else will > be dynamically assigned. > > Signed-off-by: David Woodhouse > --- > hw/mips/malta.c | 15 +++------------ > 1 file changed, 3 insertions(+), 12 deletions(-) > > diff --git a/hw/mips/malta.c b/hw/mips/malta.c > index d22bb1edef..af74008c82 100644 > --- a/hw/mips/malta.c > +++ b/hw/mips/malta.c > @@ -612,18 +612,9 @@ static MaltaFPGAState *malta_fpga_init(MemoryRegion *address_space, > /* Network support */ > static void network_init(PCIBus *pci_bus) > { > - int i; > - > - for (i = 0; i < nb_nics; i++) { > - NICInfo *nd = &nd_table[i]; > - const char *default_devaddr = NULL; > - > - if (i == 0 && (!nd->model || strcmp(nd->model, "pcnet") == 0)) > - /* The malta board has a PCNet card using PCI SLOT 11 */ > - default_devaddr = "0b"; > - > - pci_nic_init_nofail(nd, pci_bus, "pcnet", default_devaddr); > - } > + /* The malta board has a PCNet card using PCI SLOT 11 */ > + pci_init_nic_in_slot(pci_bus, "pcnet", NULL, "0b"); > + pci_init_nic_devices(pci_bus, "pcnet"); > } Reviewed-by: Thomas Huth Philippe, could you maybe have a look at this, too?