[{"id":1767862,"web_url":"http://patchwork.ozlabs.org/comment/1767862/","msgid":"","list_archive_url":null,"date":"2017-09-13T12:54:19","subject":"Re: [Qemu-devel] [PATCH 2/2] sun4u: use sunhme as default on-board\n\tNIC","submitter":{"id":5438,"url":"http://patchwork.ozlabs.org/api/people/5438/","name":"Artyom Tarasenko","email":"atar4qemu@gmail.com"},"content":"On Fri, Sep 8, 2017 at 3:58 PM, Mark Cave-Ayland\n wrote:\n> Signed-off-by: Mark Cave-Ayland \n\nReviewed-by: Artyom Tarasenko \n\n> ---\n> hw/sparc64/sun4u.c | 25 +++++++++++++++++++++----\n> 1 file changed, 21 insertions(+), 4 deletions(-)\n>\n> diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c\n> index 5e59269..c3280aa 100644\n> --- a/hw/sparc64/sun4u.c\n> +++ b/hw/sparc64/sun4u.c\n> @@ -427,7 +427,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem,\n> unsigned int i;\n> uint64_t initrd_addr, initrd_size, kernel_addr, kernel_size, kernel_entry;\n> PCIBus *pci_bus, *pci_busA, *pci_busB;\n> - PCIDevice *ebus;\n> + PCIDevice *ebus, *pci_dev;\n> ISABus *isa_bus;\n> SysBusDevice *s;\n> qemu_irq *ivec_irqs, *pbm_irqs;\n> @@ -435,6 +435,8 @@ static void sun4uv_init(MemoryRegion *address_space_mem,\n> DriveInfo *fd[MAX_FD];\n> DeviceState *dev;\n> FWCfgState *fw_cfg;\n> + NICInfo *nd;\n> + int onboard_nic_idx;\n>\n> /* init CPUs */\n> cpu = sparc64_cpu_devinit(machine->cpu_model, hwdef->default_cpu_model,\n> @@ -464,8 +466,23 @@ static void sun4uv_init(MemoryRegion *address_space_mem,\n> serial_hds_isa_init(isa_bus, i, MAX_SERIAL_PORTS);\n> parallel_hds_isa_init(isa_bus, MAX_PARALLEL_PORTS);\n>\n> - for(i = 0; i < nb_nics; i++)\n> - pci_nic_init_nofail(&nd_table[i], pci_bus, \"ne2k_pci\", NULL);\n> + onboard_nic_idx = -1;\n> + for (i = 0; i < nb_nics; i++) {\n> + nd = &nd_table[i];\n> +\n> + if (onboard_nic_idx == -1 &&\n> + (!nd->model || strcmp(nd->model, \"sunhme\") == 0)) {\n> + pci_dev = pci_create(pci_bus, -1, \"sunhme\");\n> + dev = &pci_dev->qdev;\n> + qdev_set_nic_properties(dev, nd);\n> + qdev_init_nofail(dev);\n> +\n> + onboard_nic_idx = i;\n> + } else {\n> + pci_nic_init_nofail(nd, pci_bus, \"ne2k_pci\", NULL);\n> + }\n> + }\n> + onboard_nic_idx = MAX(onboard_nic_idx, 0);\n>\n> ide_drive_get(hd, ARRAY_SIZE(hd));\n>\n> @@ -510,7 +527,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem,\n> /* XXX: need an option to load a NVRAM image */\n> 0,\n> graphic_width, graphic_height, graphic_depth,\n> - (uint8_t *)&nd_table[0].macaddr);\n> + (uint8_t *)&nd_table[onboard_nic_idx].macaddr);\n>\n> dev = qdev_create(NULL, TYPE_FW_CFG_IO);\n> qdev_prop_set_bit(dev, \"dma_enabled\", false);\n> --\n> 1.7.10.4\n>","headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"eh7rI/+Q\"; dkim-atps=neutral"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xshTg5xQDz9sNr\n\tfor ;\n\tWed, 13 Sep 2017 22:55:19 +1000 (AEST)","from localhost ([::1]:42335 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1ds7CH-0003zx-Sp\n\tfor incoming@patchwork.ozlabs.org; Wed, 13 Sep 2017 08:55:17 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:55641)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1ds7Bo-0003xY-1h\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 08:54:49 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1ds7Bi-00045o-3f\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 08:54:48 -0400","from mail-io0-x242.google.com ([2607:f8b0:4001:c06::242]:36606)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)\n\t(Exim 4.71) (envelope-from ) id 1ds7Bh-000447-VG\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 08:54:42 -0400","by mail-io0-x242.google.com with SMTP id n69so340041ioi.3\n\tfor ; Wed, 13 Sep 2017 05:54:40 -0700 (PDT)","by 10.2.79.194 with HTTP; Wed, 13 Sep 2017 05:54:19 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=mime-version:in-reply-to:references:from:date:message-id:subject:to\n\t:cc; bh=9p5BWduhc47k3a/cCasO9nVw84JFT13wmRQ7C+yI5TQ=;\n\tb=eh7rI/+QsGCRbVbt4fv8t/E8t5U2lnqDnWvzNDxJ95qbrzHdsWOKkw12/M3O/Yuo22\n\tLXJ2bH6flwKns/zd2LxC7Bz44IhyTlTFFjeNsLU8xRu9/c9ZtVLjrxHvLJA7rwxgeQEU\n\tNuNku4xGVRG8a/IOpw1LNztWsAJxuahogiLu5zlQzTjTpT4lRtWz/WM2V+kBxAGd9AOP\n\t9SOuVFw3/aWX9YkkbONV0xK9EWS4aaCrbDxMEYybqLFhRUygLg7UM5RzWFMarOrNPUE1\n\t7afqoilUNofP0cVd4YPt4tL5m3/HPPBYr0DKVfFlxLa8cNwqDIT6CKo80X4th+gXX5w0\n\tAJeA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:mime-version:in-reply-to:references:from:date\n\t:message-id:subject:to:cc;\n\tbh=9p5BWduhc47k3a/cCasO9nVw84JFT13wmRQ7C+yI5TQ=;\n\tb=YdJzkkxEVWYC3Dc6ef1ZUQyJIU2HLmDPf+eNaR1zLtmsBqy/k3FW3qHmCzrqsiISN5\n\tsiqg8wirWPqr/ADCd35NNz0rg+8wyVPXqnypk4PDf39wFvrlcoag1+JpRvMcUK7WijqW\n\tNTFMJbLc9GfeH7d3k8pmmFe0qBgA03TxZjJ+OLAYUYSXSonmo87l6Du/By4hk6gV80ZE\n\tjQQpnS4zu9g+T8cVOamXyYPnWTkKRyWI/R0fE3fD3SRO8xyMKoF+qeDBu4o46oTnt3I5\n\tVpefAcIj4wlnA5ml/Fn5rK9rPy9B3mIeLnI6PlmbPw/M+gb5tQ4B+uTZZM0uKqewBReC\n\tMAcw==","X-Gm-Message-State":"AHPjjUgCVpTQoY1WwGVh6jZTVc4QVOzg75SwOAAlH8qgunJi9k40+mlw\n\tTm188qUjoGDcsv63H/lGAhJJkMjt1DTyNSQBA9GeGg==","X-Google-Smtp-Source":"AOwi7QCnmsoakjSWcTinl6xxACZAEl5HdGDSLuAnJ2U6Az9F9oC3kYoSFl4QX0kd04HAfGYGEuod1D8YSgdOwfV+0MU=","X-Received":"by 10.107.15.138 with SMTP id 10mr25413738iop.203.1505307279850; \n\tWed, 13 Sep 2017 05:54:39 -0700 (PDT)","MIME-Version":"1.0","In-Reply-To":"<1504879106-2225-3-git-send-email-mark.cave-ayland@ilande.co.uk>","References":"<1504879106-2225-1-git-send-email-mark.cave-ayland@ilande.co.uk>\n\t<1504879106-2225-3-git-send-email-mark.cave-ayland@ilande.co.uk>","From":"Artyom Tarasenko ","Date":"Wed, 13 Sep 2017 14:54:19 +0200","Message-ID":"","To":"Mark Cave-Ayland ","Content-Type":"text/plain; charset=\"UTF-8\"","X-detected-operating-system":"by eggs.gnu.org: Genre and OS details not\n\trecognized.","X-Received-From":"2607:f8b0:4001:c06::242","Subject":"Re: [Qemu-devel] [PATCH 2/2] sun4u: use sunhme as default on-board\n\tNIC","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"qemu-devel ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}},{"id":1772452,"web_url":"http://patchwork.ozlabs.org/comment/1772452/","msgid":"<07cb382d-499a-2805-92a3-1829a5344b69@ilande.co.uk>","list_archive_url":null,"date":"2017-09-21T06:47:35","subject":"Re: [Qemu-devel] [PATCH 2/2] sun4u: use sunhme as default on-board\n\tNIC","submitter":{"id":12451,"url":"http://patchwork.ozlabs.org/api/people/12451/","name":"Mark Cave-Ayland","email":"mark.cave-ayland@ilande.co.uk"},"content":"On 13/09/17 13:54, Artyom Tarasenko wrote:\n\n> On Fri, Sep 8, 2017 at 3:58 PM, Mark Cave-Ayland\n> wrote:\n>> Signed-off-by: Mark Cave-Ayland \n> \n> Reviewed-by: Artyom Tarasenko \n\nApplied to my qemu-sparc branch.\n\n\nATB,\n\nMark.","headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xyRzQ2567z9s03\n\tfor ;\n\tThu, 21 Sep 2017 16:49:05 +1000 (AEST)","from localhost ([::1]:52084 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1duvIG-0002UY-0S\n\tfor incoming@patchwork.ozlabs.org; Thu, 21 Sep 2017 02:49:04 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:43682)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1duvHv-0002UD-Mz\n\tfor qemu-devel@nongnu.org; Thu, 21 Sep 2017 02:48:44 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1duvHq-00079j-Oy\n\tfor qemu-devel@nongnu.org; Thu, 21 Sep 2017 02:48:43 -0400","from chuckie.co.uk ([82.165.15.123]:60563\n\thelo=s16892447.onlinehome-server.info)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1duvHq-00078u-Hn\n\tfor qemu-devel@nongnu.org; Thu, 21 Sep 2017 02:48:38 -0400","from host86-191-82-173.range86-191.btcentralplus.com\n\t([86.191.82.173] helo=[192.168.1.65])\n\tby s16892447.onlinehome-server.info with esmtpsa\n\t(TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.76)\n\t(envelope-from )\n\tid 1duvHp-0004R5-B5; Thu, 21 Sep 2017 07:48:38 +0100"],"To":"Artyom Tarasenko ","References":"<1504879106-2225-1-git-send-email-mark.cave-ayland@ilande.co.uk>\n\t<1504879106-2225-3-git-send-email-mark.cave-ayland@ilande.co.uk>\n\t","From":"Mark Cave-Ayland ","Message-ID":"<07cb382d-499a-2805-92a3-1829a5344b69@ilande.co.uk>","Date":"Thu, 21 Sep 2017 07:47:35 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101\n\tThunderbird/52.3.0","MIME-Version":"1.0","In-Reply-To":"","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-US","Content-Transfer-Encoding":"7bit","X-SA-Exim-Connect-IP":"86.191.82.173","X-SA-Exim-Mail-From":"mark.cave-ayland@ilande.co.uk","X-SA-Exim-Version":"4.2.1 (built Sun, 08 Jan 2012 02:45:44 +0000)","X-SA-Exim-Scanned":"Yes (on s16892447.onlinehome-server.info)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 3.x [fuzzy]","X-Received-From":"82.165.15.123","Subject":"Re: [Qemu-devel] [PATCH 2/2] sun4u: use sunhme as default on-board\n\tNIC","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"qemu-devel ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}}]