{"id":817621,"url":"http://patchwork.ozlabs.org/api/patches/817621/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170922160111.31885-9-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-9-f4bug@amsat.org>","list_archive_url":null,"date":"2017-09-22T16:01:08","name":"[31/34] hw/net/rtl8139: use TYPE_PCI_RTL8139","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"9a11ded202854701903799903d4c095426557814","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-9-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/817621/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/817621/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=\"SXC6poPB\"; 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 3xzJR10555z9t3h\n\tfor ;\n\tSat, 23 Sep 2017 02:12:29 +1000 (AEST)","from localhost ([::1]:59851 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dvQZ1-0006oN-1V\n\tfor incoming@patchwork.ozlabs.org; Fri, 22 Sep 2017 12:12:27 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:51929)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from )\n\tid 1dvQP5-0006Tu-8M\n\tfor qemu-devel@nongnu.org; Fri, 22 Sep 2017 12:02:12 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from )\n\tid 1dvQP3-0000Dp-Du\n\tfor qemu-devel@nongnu.org; Fri, 22 Sep 2017 12:02:11 -0400","from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:33382)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)\n\t(Exim 4.71) (envelope-from )\n\tid 1dvQP3-0000DP-8S; Fri, 22 Sep 2017 12:02:09 -0400","by mail-qt0-x242.google.com with SMTP id b1so930600qtc.0;\n\tFri, 22 Sep 2017 09:02:09 -0700 (PDT)","from yoga.lan ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id\n\ty31sm108325qta.83.2017.09.22.09.02.04\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tFri, 22 Sep 2017 09:02:07 -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=a6h2NXEXKYQkP/pFrbML8x3vzg+ev/dvgMIczgNPBLg=;\n\tb=SXC6poPBdhNIWfw7/aaJXiVBe0EABun0rnOvD9EyY2lWf/CLEfOArQTtDxHEOFGJ3d\n\th12uM0dq/j6E7bBK1TOvRrQBid1htN/AlqF4ouZ6laHTkJGD9al1VFl8KtzcjEBWozpW\n\tO6P6bIFNnrjBP4s3Vb7OCdnG+nrpVNIqUCLWIaZH+ApwoXH7WpsLu3M/0tO7nrC/gkLQ\n\tuGwZ6UCmh/4f3xdKCfib9kiQ27eyEQ715+UPIOUN0Gw/U26ZkmIrBe1nk7LnM/iKKFav\n\t7YnwpZD1Q5fFf3v6PGRn6wUOxRbNWvF6mdVU7TXX8X7i2mJHsQxqgNHLG5wyDz3rUbdy\n\tOS3A==","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=a6h2NXEXKYQkP/pFrbML8x3vzg+ev/dvgMIczgNPBLg=;\n\tb=CQOzIgjIiTUNZB4HCSf/ck9AVJfejlFgLQpAI+thFGrHmbC5OjIwwxf+EajAPln9A8\n\trHAmbzNtfWBqDEcA78Gw5IvVRU/DwLtcP9UIOn/bPCjgSBbAlXEAo5MCuGAvFc/tBkwa\n\tHMEUFub9lS5W1y1ah29EB6GogtM4/FuU/8IHndm9TaICAZIVXiZSl8wuweKUxepVAJDF\n\tuEO1vBcL2Vqj2IQDXPAOqASoy9vyG2YQTXRIaHu4k5cxyUY1NufRFD1ji66Xc838lKky\n\tPhdPeKFiDbBRWCzV8s/rD0g7josoDmH9brr9OwCQn4HzrUUWpMqzbqvoIiAKVeB35ksP\n\tQS6Q==","X-Gm-Message-State":"AHPjjUi7aOocHzur8fDFdZJxHmR3k8LYZ3ZXiEUc6pkZYL7UJyFQDzFq\n\tQ3CI5Q3wHZI130VyWVqXFc8=","X-Google-Smtp-Source":"AOwi7QDwlEabJI6QFXq7PFcMgm5oC4jYl45dtOyhlX4FTHZurprHyoEOUqiBYoUo/QsKtGpK/sjyKQ==","X-Received":"by 10.200.17.131 with SMTP id d3mr8428365qtj.329.1506096128611; \n\tFri, 22 Sep 2017 09:02:08 -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\tMarcel Apfelbaum ,\n\tAurelien Jarno ,\n\tYongbok Kim ,\n\tMagnus Damm , Jason Wang ","Date":"Fri, 22 Sep 2017 13:01:08 -0300","Message-Id":"<20170922160111.31885-9-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::242","Subject":"[Qemu-devel] [PATCH 31/34] hw/net/rtl8139: use TYPE_PCI_RTL8139","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-arm@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 | 1 +\n hw/arm/realview.c | 3 ++-\n hw/arm/versatilepb.c | 3 ++-\n hw/mips/mips_fulong2e.c | 3 ++-\n hw/net/rtl8139.c | 7 +++----\n hw/sh4/r2d.c | 5 +++--\n 6 files changed, 13 insertions(+), 9 deletions(-)","diff":"diff --git a/include/hw/net/pci.h b/include/hw/net/pci.h\nindex 5ad5487a91..43ed3b0145 100644\n--- a/include/hw/net/pci.h\n+++ b/include/hw/net/pci.h\n@@ -16,6 +16,7 @@\n #define TYPE_PCI_E1000 \"e1000\"\n #define TYPE_PCI_E1000E \"e1000e\"\n #define TYPE_PCI_PCNET \"pcnet\"\n+#define TYPE_PCI_RTL8139 \"rtl8139\"\n \n PCIDevice *pci_nic_init_nofail(NICInfo *nd, PCIBus *rootbus,\n const char *default_model,\ndiff --git a/hw/arm/realview.c b/hw/arm/realview.c\nindex 87cd1e583c..35f0da28e4 100644\n--- a/hw/arm/realview.c\n+++ b/hw/arm/realview.c\n@@ -20,6 +20,7 @@\n #include \"sysemu/sysemu.h\"\n #include \"hw/boards.h\"\n #include \"hw/i2c/i2c.h\"\n+#include \"hw/net/pci.h\"\n #include \"sysemu/block-backend.h\"\n #include \"exec/address-spaces.h\"\n #include \"qemu/error-report.h\"\n@@ -269,7 +270,7 @@ static void realview_init(MachineState *machine,\n done_nic = 1;\n } else {\n if (pci_bus) {\n- pci_nic_init_nofail(nd, pci_bus, \"rtl8139\", NULL);\n+ pci_nic_init_nofail(nd, pci_bus, TYPE_PCI_RTL8139, NULL);\n }\n }\n }\ndiff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c\nindex 418792cd02..297aad78e1 100644\n--- a/hw/arm/versatilepb.c\n+++ b/hw/arm/versatilepb.c\n@@ -18,6 +18,7 @@\n #include \"sysemu/sysemu.h\"\n #include \"hw/pci/pci.h\"\n #include \"hw/i2c/i2c.h\"\n+#include \"hw/net/pci.h\"\n #include \"hw/boards.h\"\n #include \"sysemu/block-backend.h\"\n #include \"exec/address-spaces.h\"\n@@ -271,7 +272,7 @@ static void versatile_init(MachineState *machine, int board_id)\n smc91c111_init(nd, 0x10010000, sic[25]);\n done_smc = 1;\n } else {\n- pci_nic_init_nofail(nd, pci_bus, \"rtl8139\", NULL);\n+ pci_nic_init_nofail(nd, pci_bus, TYPE_PCI_RTL8139, NULL);\n }\n }\n if (machine_usb(machine)) {\ndiff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c\nindex 7ebbffa8f2..fe618953c9 100644\n--- a/hw/mips/mips_fulong2e.c\n+++ b/hw/mips/mips_fulong2e.c\n@@ -44,6 +44,7 @@\n #include \"hw/timer/mc146818rtc.h\"\n #include \"hw/timer/i8254.h\"\n #include \"hw/input/i8042.h\"\n+#include \"hw/net/pci.h\"\n #include \"sysemu/blockdev.h\"\n #include \"exec/address-spaces.h\"\n #include \"sysemu/qtest.h\"\n@@ -253,7 +254,7 @@ static void network_init (PCIBus *pci_bus)\n default_devaddr = \"07\";\n }\n \n- pci_nic_init_nofail(nd, pci_bus, \"rtl8139\", default_devaddr);\n+ pci_nic_init_nofail(nd, pci_bus, TYPE_PCI_RTL8139, default_devaddr);\n }\n }\n \ndiff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c\nindex 3be24bbee7..0f952eceba 100644\n--- a/hw/net/rtl8139.c\n+++ b/hw/net/rtl8139.c\n@@ -59,6 +59,7 @@\n #include \"net/net.h\"\n #include \"net/eth.h\"\n #include \"hw/loader.h\"\n+#include \"hw/net/pci.h\"\n #include \"sysemu/sysemu.h\"\n #include \"qemu/iov.h\"\n \n@@ -90,10 +91,8 @@ static inline GCC_FMT_ATTR(1, 2) int DPRINTF(const char *fmt, ...)\n }\n #endif\n \n-#define TYPE_RTL8139 \"rtl8139\"\n-\n #define RTL8139(obj) \\\n- OBJECT_CHECK(RTL8139State, (obj), TYPE_RTL8139)\n+ OBJECT_CHECK(RTL8139State, (obj), TYPE_PCI_RTL8139)\n \n /* Symbolic offsets to registers. */\n enum RTL8139_registers {\n@@ -3437,7 +3436,7 @@ static void rtl8139_class_init(ObjectClass *klass, void *data)\n }\n \n static const TypeInfo rtl8139_info = {\n- .name = TYPE_RTL8139,\n+ .name = TYPE_PCI_RTL8139,\n .parent = TYPE_PCI_DEVICE,\n .instance_size = sizeof(RTL8139State),\n .class_init = rtl8139_class_init,\ndiff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c\nindex 16b9ed2db2..dde60b2bc2 100644\n--- a/hw/sh4/r2d.c\n+++ b/hw/sh4/r2d.c\n@@ -39,6 +39,7 @@\n #include \"hw/ide.h\"\n #include \"hw/loader.h\"\n #include \"hw/usb.h\"\n+#include \"hw/net/pci.h\"\n #include \"hw/block/flash.h\"\n #include \"sysemu/block-backend.h\"\n #include \"exec/address-spaces.h\"\n@@ -303,8 +304,8 @@ static void r2d_init(MachineState *machine)\n \n /* NIC: rtl8139 on-board, and 2 slots. */\n for (i = 0; i < nb_nics; i++)\n- pci_nic_init_nofail(&nd_table[i], pci_bus,\n- \"rtl8139\", i==0 ? \"2\" : NULL);\n+ pci_nic_init_nofail(&nd_table[i], pci_bus, TYPE_PCI_RTL8139,\n+ i == 0 ? \"2\" : NULL);\n \n /* USB keyboard */\n usb_create_simple(usb_bus_find(-1), \"usb-kbd\");\n","prefixes":["31/34"]}