From patchwork Fri Sep 22 16:01:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 817623 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="EjmYACOw"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xzJWj0bpmz9sNr for ; Sat, 23 Sep 2017 02:16:33 +1000 (AEST) Received: from localhost ([::1]:59910 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dvQcx-0002Jr-3R for incoming@patchwork.ozlabs.org; Fri, 22 Sep 2017 12:16:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51778) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dvQOv-0006Km-RS for qemu-devel@nongnu.org; Fri, 22 Sep 2017 12:02:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dvQOs-00006G-1F for qemu-devel@nongnu.org; Fri, 22 Sep 2017 12:02:01 -0400 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:36452) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dvQOr-00005u-Sw; Fri, 22 Sep 2017 12:01:57 -0400 Received: by mail-qt0-x241.google.com with SMTP id t46so920892qtj.3; Fri, 22 Sep 2017 09:01:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2pAq1pCiV3UQCOga6qLKiM2YY3i1rxCvJSRwWruViv0=; b=EjmYACOwxBIKLXvPSTyNwApA03Fa4EDYh9QdVGNKHtBmVaOfPV6BTj6tQlHE9VGbxg lvn1IubOBjErjnuQvEC3IEVYCy7opxinKqZDYrScQihnJlMakSeW9J8yuraIaNpQX7mi iAoSQ8OgNb/Pb8ieqZIVZt+KLwdLg7Q3G6nrxo9MwBDt7zvYS2y6RJ2uInRwdFQyiSlC SFYaJGn9vYNzOBVuHG2dSBaTX6obfvQRBDXVnUNIMVaOeHIOvLqqJW2rx/X8EMaDlBVM yFK7aOPKES6YHzLjUCkYI87eviPpeZEfIxEP/uQN5sBQKAo/tjFpeD0mpVoZOrCLLFBO obJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=2pAq1pCiV3UQCOga6qLKiM2YY3i1rxCvJSRwWruViv0=; b=DC4UcdO0jYjp+MMI+5pdVy4FRhtfd38UHjyvMaytm+my1yzoNOpPO3vnC1lm/LBziw XujhF/fP8+uAFT/dXkd/Ym8/OHk0dNRWljZHBaVtw1t3llTxopbMW47t08yuirm3Aid0 52Gu6VMCAUZEQ6cjyFz2VGLcGxEu1TB6brL2AqT0K2bK9H1WLrUb6bDOBYmKwxRV1bTT r2IvAeyIRrBLFXTnTEcvPabqX4CPgGfiNL5ViScV5qKYSbwYnULZbHBWQFabEuz6OT7p dZjg27RFRyuICZHWgxkzktg8mp6FG5mSHllpIgwU5ymKfxNhmfi2xPN60HPm8jYyZ3hh Fzmw== X-Gm-Message-State: AHPjjUi4C72q1pf5oN/EjuKPO3uu3gKckac3gtVUY0dGvDstbkKqwCL4 hTw/TmPgoqMDv1zzf/C6a1g= X-Google-Smtp-Source: AOwi7QDvFJRsMbcO/3o36qqzZENUUeh7rbKiYd46ywAk9PMsTzKRgiUxmcrDFCU12nXlkCRyj+l7nw== X-Received: by 10.200.27.185 with SMTP id z54mr8649044qtj.250.1506096117161; Fri, 22 Sep 2017 09:01:57 -0700 (PDT) Received: from yoga.lan ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id y31sm108325qta.83.2017.09.22.09.01.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Sep 2017 09:01:56 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Peter Maydell , Thomas Huth , Paolo Bonzini , "Michael S. Tsirkin" , Richard Henderson , Alexander Graf , David Gibson , Balaton 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 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. 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: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, qemu-ppc@nongnu.org, =?utf-8?q?Philippe_Mathi?= =?utf-8?b?ZXUtRGF1ZMOp?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé Acked-by: David Gibson --- include/hw/net/pci.h | 2 ++ hw/alpha/dp264.c | 3 ++- hw/i386/pc.c | 3 ++- hw/ppc/ppc440_bamboo.c | 3 ++- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/include/hw/net/pci.h b/include/hw/net/pci.h index 529591b7f3..b24b5257a5 100644 --- a/include/hw/net/pci.h +++ b/include/hw/net/pci.h @@ -13,6 +13,8 @@ #include "hw/pci/pci.h" #include "hw/pci/pci_bus.h" +#define TYPE_PCI_E1000 "e1000" + PCIDevice *pci_nic_init_nofail(NICInfo *nd, PCIBus *rootbus, const char *default_model, const char *default_devaddr); diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c index df6dadf13f..65947fe1bf 100644 --- a/hw/alpha/dp264.c +++ b/hw/alpha/dp264.c @@ -21,6 +21,7 @@ #include "hw/timer/i8254.h" #include "hw/input/i8042.h" #include "hw/char/serial.h" +#include "hw/net/pci.h" #include "qemu/cutils.h" #define MAX_IDE_BUS 2 @@ -93,7 +94,7 @@ static void clipper_init(MachineState *machine) /* Network setup. e1000 is good enough, failing Tulip support. */ for (i = 0; i < nb_nics; i++) { - pci_nic_init_nofail(&nd_table[i], pci_bus, "e1000", NULL); + pci_nic_init_nofail(&nd_table[i], pci_bus, TYPE_PCI_E1000, NULL); } /* IDE disk setup. */ diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 085577e066..3cdeb148aa 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -72,6 +72,7 @@ #include "hw/nmi.h" #include "hw/i386/intel_iommu.h" #include "hw/net/ne2000-isa.h" +#include "hw/net/pci.h" /* debug PC/ISA interrupts */ //#define DEBUG_IRQ @@ -1606,7 +1607,7 @@ void pc_nic_init(ISABus *isa_bus, PCIBus *pci_bus) if (!pci_bus || (nd->model && strcmp(nd->model, "ne2k_isa") == 0)) { pc_init_ne2k_isa(isa_bus, nd); } else { - pci_nic_init_nofail(nd, pci_bus, "e1000", NULL); + pci_nic_init_nofail(nd, pci_bus, TYPE_PCI_E1000, NULL); } } rom_reset_order_override(); diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c index f92d47f28d..6387dbda9f 100644 --- a/hw/ppc/ppc440_bamboo.c +++ b/hw/ppc/ppc440_bamboo.c @@ -24,6 +24,7 @@ #include "elf.h" #include "exec/address-spaces.h" #include "hw/char/serial.h" +#include "hw/net/pci.h" #include "hw/ppc/ppc.h" #include "ppc405.h" #include "sysemu/sysemu.h" @@ -248,7 +249,7 @@ static void bamboo_init(MachineState *machine) for (i = 0; i < nb_nics; i++) { /* There are no PCI NICs on the Bamboo board, but there are * PCI slots, so we can pick whatever default model we want. */ - pci_nic_init_nofail(&nd_table[i], pcibus, "e1000", NULL); + pci_nic_init_nofail(&nd_table[i], pcibus, TYPE_PCI_E1000, NULL); } }