{"id":811612,"url":"http://patchwork.ozlabs.org/api/patches/811612/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1504879106-2225-3-git-send-email-mark.cave-ayland@ilande.co.uk/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1504879106-2225-3-git-send-email-mark.cave-ayland@ilande.co.uk>","list_archive_url":null,"date":"2017-09-08T13:58:26","name":"[2/2] sun4u: use sunhme as default on-board NIC","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"2e5a99c6dc8c89b84cc59c0533b7f7026f0023c5","submitter":{"id":12451,"url":"http://patchwork.ozlabs.org/api/people/12451/?format=json","name":"Mark Cave-Ayland","email":"mark.cave-ayland@ilande.co.uk"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1504879106-2225-3-git-send-email-mark.cave-ayland@ilande.co.uk/mbox/","series":[{"id":2222,"url":"http://patchwork.ozlabs.org/api/series/2222/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2222","date":"2017-09-08T13:58:24","name":"sun4u: add Sun HME (Happy Meal Ethernet) on-board NIC","version":1,"mbox":"http://patchwork.ozlabs.org/series/2222/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/811612/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/811612/checks/","tags":{},"related":[],"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 3xpfBD12bnz9s7G\n\tfor ;\n\tSat, 9 Sep 2017 00:01:24 +1000 (AEST)","from localhost ([::1]:45581 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dqJqU-0004BR-8m\n\tfor incoming@patchwork.ozlabs.org; Fri, 08 Sep 2017 10:01:22 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:42503)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dqJnz-00026h-Eb\n\tfor qemu-devel@nongnu.org; Fri, 08 Sep 2017 09:58:48 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dqJnw-0005hS-Cq\n\tfor qemu-devel@nongnu.org; Fri, 08 Sep 2017 09:58:47 -0400","from chuckie.co.uk ([82.165.15.123]:53051\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 1dqJnw-0005gM-6p\n\tfor qemu-devel@nongnu.org; Fri, 08 Sep 2017 09:58:44 -0400","from host109-147-184-220.range109-147.btcentralplus.com\n\t([109.147.184.220] helo=kentang.home)\n\tby s16892447.onlinehome-server.info with esmtpsa\n\t(TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76)\n\t(envelope-from )\n\tid 1dqJnx-0003B2-7z; Fri, 08 Sep 2017 14:58:46 +0100"],"From":"Mark Cave-Ayland ","To":"qemu-devel@nongnu.org,\n\tatar4qemu@gmail.com","Date":"Fri, 8 Sep 2017 14:58:26 +0100","Message-Id":"<1504879106-2225-3-git-send-email-mark.cave-ayland@ilande.co.uk>","X-Mailer":"git-send-email 1.7.10.4","In-Reply-To":"<1504879106-2225-1-git-send-email-mark.cave-ayland@ilande.co.uk>","References":"<1504879106-2225-1-git-send-email-mark.cave-ayland@ilande.co.uk>","X-SA-Exim-Connect-IP":"109.147.184.220","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":"[Qemu-devel] [PATCH 2/2] sun4u: use sunhme as default on-board NIC","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","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Signed-off-by: Mark Cave-Ayland \n---\n hw/sparc64/sun4u.c | 25 +++++++++++++++++++++----\n 1 file changed, 21 insertions(+), 4 deletions(-)","diff":"diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c\nindex 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","prefixes":["2/2"]}