{"id":817623,"url":"http://patchwork.ozlabs.org/api/patches/817623/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170922160111.31885-6-f4bug@amsat.org/","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":"<20170922160111.31885-6-f4bug@amsat.org>","list_archive_url":null,"date":"2017-09-22T16:01:05","name":"[28/34] hw/net/e1000: use TYPE_PCI_E1000","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"9c3a9e0c80d092667f4e86972bf3513c52ec242b","submitter":{"id":70924,"url":"http://patchwork.ozlabs.org/api/people/70924/?format=json","name":"Philippe Mathieu-Daudé","email":"f4bug@amsat.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170922160111.31885-6-f4bug@amsat.org/mbox/","series":[{"id":4657,"url":"http://patchwork.ozlabs.org/api/series/4657/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=4657","date":"2017-09-22T15:39:40","name":"remove i386/pc dependency from non-PC world (part 1)","version":1,"mbox":"http://patchwork.ozlabs.org/series/4657/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/817623/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/817623/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=)","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=\"EjmYACOw\"; 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 3xzJWj0bpmz9sNr\n\tfor ;\n\tSat, 23 Sep 2017 02:16:33 +1000 (AEST)","from localhost ([::1]:59910 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dvQcx-0002Jr-3R\n\tfor incoming@patchwork.ozlabs.org; Fri, 22 Sep 2017 12:16:31 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:51778)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from )\n\tid 1dvQOv-0006Km-RS\n\tfor qemu-devel@nongnu.org; Fri, 22 Sep 2017 12:02:03 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from )\n\tid 1dvQOs-00006G-1F\n\tfor qemu-devel@nongnu.org; Fri, 22 Sep 2017 12:02:01 -0400","from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:36452)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)\n\t(Exim 4.71) (envelope-from )\n\tid 1dvQOr-00005u-Sw; Fri, 22 Sep 2017 12:01:57 -0400","by mail-qt0-x241.google.com with SMTP id t46so920892qtj.3;\n\tFri, 22 Sep 2017 09:01:57 -0700 (PDT)","from yoga.lan ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id\n\ty31sm108325qta.83.2017.09.22.09.01.53\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tFri, 22 Sep 2017 09:01:56 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=sender:from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=2pAq1pCiV3UQCOga6qLKiM2YY3i1rxCvJSRwWruViv0=;\n\tb=EjmYACOwxBIKLXvPSTyNwApA03Fa4EDYh9QdVGNKHtBmVaOfPV6BTj6tQlHE9VGbxg\n\tlvn1IubOBjErjnuQvEC3IEVYCy7opxinKqZDYrScQihnJlMakSeW9J8yuraIaNpQX7mi\n\tiAoSQ8OgNb/Pb8ieqZIVZt+KLwdLg7Q3G6nrxo9MwBDt7zvYS2y6RJ2uInRwdFQyiSlC\n\tSFYaJGn9vYNzOBVuHG2dSBaTX6obfvQRBDXVnUNIMVaOeHIOvLqqJW2rx/X8EMaDlBVM\n\tyFK7aOPKES6YHzLjUCkYI87eviPpeZEfIxEP/uQN5sBQKAo/tjFpeD0mpVoZOrCLLFBO\n\tobJw==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:sender:from:to:cc:subject:date:message-id\n\t:in-reply-to:references:mime-version:content-transfer-encoding;\n\tbh=2pAq1pCiV3UQCOga6qLKiM2YY3i1rxCvJSRwWruViv0=;\n\tb=DC4UcdO0jYjp+MMI+5pdVy4FRhtfd38UHjyvMaytm+my1yzoNOpPO3vnC1lm/LBziw\n\tXujhF/fP8+uAFT/dXkd/Ym8/OHk0dNRWljZHBaVtw1t3llTxopbMW47t08yuirm3Aid0\n\t52Gu6VMCAUZEQ6cjyFz2VGLcGxEu1TB6brL2AqT0K2bK9H1WLrUb6bDOBYmKwxRV1bTT\n\tr2IvAeyIRrBLFXTnTEcvPabqX4CPgGfiNL5ViScV5qKYSbwYnULZbHBWQFabEuz6OT7p\n\tdZjg27RFRyuICZHWgxkzktg8mp6FG5mSHllpIgwU5ymKfxNhmfi2xPN60HPm8jYyZ3hh\n\tFzmw==","X-Gm-Message-State":"AHPjjUi4C72q1pf5oN/EjuKPO3uu3gKckac3gtVUY0dGvDstbkKqwCL4\n\thTw/TmPgoqMDv1zzf/C6a1g=","X-Google-Smtp-Source":"AOwi7QDvFJRsMbcO/3o36qqzZENUUeh7rbKiYd46ywAk9PMsTzKRgiUxmcrDFCU12nXlkCRyj+l7nw==","X-Received":"by 10.200.27.185 with SMTP id z54mr8649044qtj.250.1506096117161; \n\tFri, 22 Sep 2017 09:01:57 -0700 (PDT)","From":"=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= ","To":"Peter Maydell , Thomas Huth ,\n\tPaolo Bonzini ,\n\t\"Michael S. Tsirkin\" , \n\tRichard Henderson , Alexander Graf , \n\tDavid Gibson ,\n\tBalaton Zoltan , Jason Wang ","Date":"Fri, 22 Sep 2017 13:01:05 -0300","Message-Id":"<20170922160111.31885-6-f4bug@amsat.org>","X-Mailer":"git-send-email 2.14.1","In-Reply-To":"<20170922154014.29350-1-f4bug@amsat.org>","References":"<20170922154014.29350-1-f4bug@amsat.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","X-detected-operating-system":"by eggs.gnu.org: Genre and OS details not\n\trecognized.","X-Received-From":"2607:f8b0:400d:c0d::241","Subject":"[Qemu-devel] [PATCH 28/34] hw/net/e1000: use TYPE_PCI_E1000","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, =?utf-8?q?Philippe_Mathi?=\n\t=?utf-8?b?ZXUtRGF1ZMOp?= , \tqemu-devel@nongnu.org","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Signed-off-by: Philippe Mathieu-Daudé \n---\n include/hw/net/pci.h | 2 ++\n hw/alpha/dp264.c | 3 ++-\n hw/i386/pc.c | 3 ++-\n hw/ppc/ppc440_bamboo.c | 3 ++-\n 4 files changed, 8 insertions(+), 3 deletions(-)","diff":"diff --git a/include/hw/net/pci.h b/include/hw/net/pci.h\nindex 529591b7f3..b24b5257a5 100644\n--- a/include/hw/net/pci.h\n+++ b/include/hw/net/pci.h\n@@ -13,6 +13,8 @@\n #include \"hw/pci/pci.h\"\n #include \"hw/pci/pci_bus.h\"\n \n+#define TYPE_PCI_E1000 \"e1000\"\n+\n PCIDevice *pci_nic_init_nofail(NICInfo *nd, PCIBus *rootbus,\n const char *default_model,\n const char *default_devaddr);\ndiff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c\nindex df6dadf13f..65947fe1bf 100644\n--- a/hw/alpha/dp264.c\n+++ b/hw/alpha/dp264.c\n@@ -21,6 +21,7 @@\n #include \"hw/timer/i8254.h\"\n #include \"hw/input/i8042.h\"\n #include \"hw/char/serial.h\"\n+#include \"hw/net/pci.h\"\n #include \"qemu/cutils.h\"\n \n #define MAX_IDE_BUS 2\n@@ -93,7 +94,7 @@ static void clipper_init(MachineState *machine)\n \n /* Network setup. e1000 is good enough, failing Tulip support. */\n for (i = 0; i < nb_nics; i++) {\n- pci_nic_init_nofail(&nd_table[i], pci_bus, \"e1000\", NULL);\n+ pci_nic_init_nofail(&nd_table[i], pci_bus, TYPE_PCI_E1000, NULL);\n }\n \n /* IDE disk setup. */\ndiff --git a/hw/i386/pc.c b/hw/i386/pc.c\nindex 085577e066..3cdeb148aa 100644\n--- a/hw/i386/pc.c\n+++ b/hw/i386/pc.c\n@@ -72,6 +72,7 @@\n #include \"hw/nmi.h\"\n #include \"hw/i386/intel_iommu.h\"\n #include \"hw/net/ne2000-isa.h\"\n+#include \"hw/net/pci.h\"\n \n /* debug PC/ISA interrupts */\n //#define DEBUG_IRQ\n@@ -1606,7 +1607,7 @@ void pc_nic_init(ISABus *isa_bus, PCIBus *pci_bus)\n if (!pci_bus || (nd->model && strcmp(nd->model, \"ne2k_isa\") == 0)) {\n pc_init_ne2k_isa(isa_bus, nd);\n } else {\n- pci_nic_init_nofail(nd, pci_bus, \"e1000\", NULL);\n+ pci_nic_init_nofail(nd, pci_bus, TYPE_PCI_E1000, NULL);\n }\n }\n rom_reset_order_override();\ndiff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c\nindex f92d47f28d..6387dbda9f 100644\n--- a/hw/ppc/ppc440_bamboo.c\n+++ b/hw/ppc/ppc440_bamboo.c\n@@ -24,6 +24,7 @@\n #include \"elf.h\"\n #include \"exec/address-spaces.h\"\n #include \"hw/char/serial.h\"\n+#include \"hw/net/pci.h\"\n #include \"hw/ppc/ppc.h\"\n #include \"ppc405.h\"\n #include \"sysemu/sysemu.h\"\n@@ -248,7 +249,7 @@ static void bamboo_init(MachineState *machine)\n for (i = 0; i < nb_nics; i++) {\n /* There are no PCI NICs on the Bamboo board, but there are\n * PCI slots, so we can pick whatever default model we want. */\n- pci_nic_init_nofail(&nd_table[i], pcibus, \"e1000\", NULL);\n+ pci_nic_init_nofail(&nd_table[i], pcibus, TYPE_PCI_E1000, NULL);\n }\n }\n \n","prefixes":["28/34"]}