[{"id":1773860,"web_url":"http://patchwork.ozlabs.org/comment/1773860/","msgid":"<00edc956-8d4f-e5e7-4745-053025082f22@reactos.org>","list_archive_url":null,"date":"2017-09-22T20:13:42","subject":"Re: [Qemu-devel] [PATCH 30/34] hw/net/pcnet: use TYPE_PCI_PCNET","submitter":{"id":2909,"url":"http://patchwork.ozlabs.org/api/people/2909/","name":"Hervé Poussineau","email":"hpoussin@reactos.org"},"content":"Le 22/09/2017 à 18:01, Philippe Mathieu-Daudé a écrit :\n> Signed-off-by: Philippe Mathieu-Daudé \n> ---\n> include/hw/net/pci.h | 1 +\n> hw/mips/mips_malta.c | 2 +-\n> hw/net/pcnet-pci.c | 3 +--\n> hw/ppc/prep.c | 3 ++-\n> 4 files changed, 5 insertions(+), 4 deletions(-)\n\nReviewed-by: Hervé Poussineau ","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\" (1024-bit key;\n\tunprotected) header.d=reactos.org header.i=@reactos.org\n\theader.b=\"PbbB420U\"; 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 3xzPv95WHTz9s82\n\tfor ;\n\tSat, 23 Sep 2017 06:18:45 +1000 (AEST)","from localhost ([::1]:60882 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dvUPL-0001lg-RK\n\tfor incoming@patchwork.ozlabs.org; Fri, 22 Sep 2017 16:18:43 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:33917)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dvUKg-0006SQ-Ls\n\tfor qemu-devel@nongnu.org; Fri, 22 Sep 2017 16:13:55 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dvUKb-0006Dx-Qn\n\tfor qemu-devel@nongnu.org; Fri, 22 Sep 2017 16:13:54 -0400","from iserv.reactos.org ([2a01:4f8:221:4c5::3]:47269)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)\n\t(Exim 4.71) (envelope-from )\n\tid 1dvUKX-0006BA-2R; Fri, 22 Sep 2017 16:13:45 -0400","from rob92-5-82-227-227-196.fbx.proxad.net ([82.227.227.196]\n\thelo=[192.168.0.35]) by iserv.reactos.org with esmtpsa\n\t(TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2)\n\t(envelope-from )\n\tid 1dvUKV-0005gc-R2; Fri, 22 Sep 2017 20:13:44 +0000"],"DKIM-Signature":"v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;\n\td=reactos.org; s=25047; \n\th=Content-Transfer-Encoding:Content-Type:In-Reply-To:MIME-Version:Date:Message-ID:From:References:Cc:To:Subject;\n\tbh=OrfEOVKmqaEWfWGzZtaxgRo7KowNGDTC5inLVzYgQMs=; \n\tb=PbbB420UfB2be1f0Z/Ox4tu14UZR6BZ42VM4bqknuO4H/QJDx2MF7K8JZ7z5Sprpro5vR8izjhdscoxBQv3SChhF5K7GjrHU2P9BCRfY8xwqRAYm7ifYcLpyNbcLGDMnI/inLkilMx3VYqoT7oyOSx/jCfzvSm0c5g6P/UJ2oM0=;","To":"=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= ,\n\tPeter Maydell ,\n\tThomas Huth , \tPaolo Bonzini ,\n\t\"Michael S. Tsirkin\" , \n\tMarcel Apfelbaum , Aurelien Jarno\n\t, Yongbok Kim ,\n\tAlexander Graf , David Gibson\n\t, \tJason Wang ","References":"<20170922154014.29350-1-f4bug@amsat.org>\n\t<20170922160111.31885-8-f4bug@amsat.org>","From":"=?utf-8?q?Herv=C3=A9_Poussineau?= ","Message-ID":"<00edc956-8d4f-e5e7-4745-053025082f22@reactos.org>","Date":"Fri, 22 Sep 2017 22:13:42 +0200","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101\n\tThunderbird/52.2.1","MIME-Version":"1.0","In-Reply-To":"<20170922160111.31885-8-f4bug@amsat.org>","Content-Type":"text/plain; charset=utf-8; format=flowed","Content-Language":"en-US","Content-Transfer-Encoding":"8bit","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]","X-Received-From":"2a01:4f8:221:4c5::3","Subject":"Re: [Qemu-devel] [PATCH 30/34] hw/net/pcnet: use TYPE_PCI_PCNET","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-trivial@nongnu.org, qemu-ppc@nongnu.org, qemu-devel@nongnu.org","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}},{"id":1773984,"web_url":"http://patchwork.ozlabs.org/comment/1773984/","msgid":"<20170923051403.GD4998@umbus.fritz.box>","list_archive_url":null,"date":"2017-09-23T05:14:03","subject":"Re: [Qemu-devel] [PATCH 30/34] hw/net/pcnet: use TYPE_PCI_PCNET","submitter":{"id":47,"url":"http://patchwork.ozlabs.org/api/people/47/","name":"David Gibson","email":"david@gibson.dropbear.id.au"},"content":"On Fri, Sep 22, 2017 at 01:01:07PM -0300, Philippe Mathieu-Daudé wrote:\n> Signed-off-by: Philippe Mathieu-Daudé \n\nppc portion\n\nAcked-by: David Gibson \n\n> ---\n> include/hw/net/pci.h | 1 +\n> hw/mips/mips_malta.c | 2 +-\n> hw/net/pcnet-pci.c | 3 +--\n> hw/ppc/prep.c | 3 ++-\n> 4 files changed, 5 insertions(+), 4 deletions(-)\n> \n> diff --git a/include/hw/net/pci.h b/include/hw/net/pci.h\n> index 92111f86f3..5ad5487a91 100644\n> --- a/include/hw/net/pci.h\n> +++ b/include/hw/net/pci.h\n> @@ -15,6 +15,7 @@\n> \n> #define TYPE_PCI_E1000 \"e1000\"\n> #define TYPE_PCI_E1000E \"e1000e\"\n> +#define TYPE_PCI_PCNET \"pcnet\"\n> \n> PCIDevice *pci_nic_init_nofail(NICInfo *nd, PCIBus *rootbus,\n> const char *default_model,\n> diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c\n> index fb6a2f9363..921678fdb0 100644\n> --- a/hw/mips/mips_malta.c\n> +++ b/hw/mips/mips_malta.c\n> @@ -597,7 +597,7 @@ static void network_init(PCIBus *pci_bus)\n> /* The malta board has a PCNet card using PCI SLOT 11 */\n> default_devaddr = \"0b\";\n> \n> - pci_nic_init_nofail(nd, pci_bus, \"pcnet\", default_devaddr);\n> + pci_nic_init_nofail(nd, pci_bus, TYPE_PCI_PCNET, default_devaddr);\n> }\n> }\n> \n> diff --git a/hw/net/pcnet-pci.c b/hw/net/pcnet-pci.c\n> index 0acf8a4879..878e2c89c1 100644\n> --- a/hw/net/pcnet-pci.c\n> +++ b/hw/net/pcnet-pci.c\n> @@ -29,6 +29,7 @@\n> \n> #include \"qemu/osdep.h\"\n> #include \"hw/pci/pci.h\"\n> +#include \"hw/net/pci.h\"\n> #include \"net/net.h\"\n> #include \"hw/loader.h\"\n> #include \"qemu/timer.h\"\n> @@ -46,8 +47,6 @@\n> //#define PCNET_DEBUG_TMD\n> //#define PCNET_DEBUG_MATCH\n> \n> -#define TYPE_PCI_PCNET \"pcnet\"\n> -\n> #define PCI_PCNET(obj) \\\n> OBJECT_CHECK(PCIPCNetState, (obj), TYPE_PCI_PCNET)\n> \n> diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c\n> index fb330a1769..b2c7a62ebc 100644\n> --- a/hw/ppc/prep.c\n> +++ b/hw/ppc/prep.c\n> @@ -44,6 +44,7 @@\n> #include \"hw/input/i8042.h\"\n> #include \"hw/isa/pc87312.h\"\n> #include \"hw/net/ne2000-isa.h\"\n> +#include \"hw/net/pci.h\"\n> #include \"sysemu/block-backend.h\"\n> #include \"sysemu/arch_init.h\"\n> #include \"sysemu/kvm.h\"\n> @@ -800,7 +801,7 @@ static void ibm_40p_init(MachineState *machine)\n> pci_vga_init(pci_bus);\n> \n> for (i = 0; i < nb_nics; i++) {\n> - pci_nic_init_nofail(&nd_table[i], pci_bus, \"pcnet\",\n> + pci_nic_init_nofail(&nd_table[i], pci_bus, TYPE_PCI_PCNET,\n> i == 0 ? \"3\" : NULL);\n> }\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\" (1024-bit key;\n\tunprotected) header.d=gibson.dropbear.id.au\n\theader.i=@gibson.dropbear.id.au header.b=\"UFulw7Cb\"; \n\tdkim-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 3xzfL954yfz9t67\n\tfor ;\n\tSat, 23 Sep 2017 15:39:29 +1000 (AEST)","from localhost ([::1]:33781 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dvd9z-0005sL-SW\n\tfor incoming@patchwork.ozlabs.org; Sat, 23 Sep 2017 01:39:27 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:36142)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dvd0I-0007Jh-68\n\tfor qemu-devel@nongnu.org; Sat, 23 Sep 2017 01:29:27 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dvd0G-0002Au-O4\n\tfor qemu-devel@nongnu.org; Sat, 23 Sep 2017 01:29:26 -0400","from ozlabs.org ([103.22.144.67]:60467)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1dvd0G-00029u-Ba; Sat, 23 Sep 2017 01:29:24 -0400","by ozlabs.org (Postfix, from userid 1007)\n\tid 3xzf6R6FVTz9t3w; Sat, 23 Sep 2017 15:29:19 +1000 (AEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple;\n\td=gibson.dropbear.id.au; s=201602; t=1506144559;\n\tbh=esW/+Pi5zbqQzWFAlHDFsKt+BkR37b7mI0KJap01vWk=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=UFulw7CbUHpxVvDgWi66V3Gybx2VHm4wldzgvCN5DyxY1Zx8pEw1i3ujxE1mosO9y\n\tb4/ryOLkM2fcrmgQauBeYL3fZkjv8ilkeXMuXwdL+JqHZeT3mJbjsZdxY8m80P5gRi\n\tYrpJykvcCc/mMK79Hv6bWfcDWytsoaW4UMdAbGjE=","Date":"Sat, 23 Sep 2017 15:14:03 +1000","From":"David Gibson ","To":"Philippe =?iso-8859-1?q?Mathieu-Daud=E9?= ","Message-ID":"<20170923051403.GD4998@umbus.fritz.box>","References":"<20170922154014.29350-1-f4bug@amsat.org>\n\t<20170922160111.31885-8-f4bug@amsat.org>","MIME-Version":"1.0","Content-Type":"multipart/signed; micalg=pgp-sha256;\n\tprotocol=\"application/pgp-signature\"; boundary=\"FJ766Kk/2p6HVARF\"","Content-Disposition":"inline","In-Reply-To":"<20170922160111.31885-8-f4bug@amsat.org>","User-Agent":"Mutt/1.9.0 (2017-09-02)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"103.22.144.67","Subject":"Re: [Qemu-devel] [PATCH 30/34] hw/net/pcnet: use TYPE_PCI_PCNET","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":"Peter Maydell , Thomas Huth ,\n\t\"Michael S. Tsirkin\" , qemu-ppc@nongnu.org, Jason Wang\n\t, Alexander Graf , \n\tqemu-devel@nongnu.org, Yongbok Kim , \n\t=?iso-8859-1?q?Herv=E9?= Poussineau ,\n\tMarcel Apfelbaum , Paolo Bonzini\n\t, qemu-trivial@nongnu.org, Aurelien Jarno\n\t","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}}]