From nobody Tue Feb 10 22:18:03 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1506096660808463.3275827173818; Fri, 22 Sep 2017 09:11:00 -0700 (PDT) Received: from localhost ([::1]:59812 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dvQXW-0005jE-Q2 for importer@patchew.org; Fri, 22 Sep 2017 12:10:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51849) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dvQP0-0006PC-CX for qemu-devel@nongnu.org; Fri, 22 Sep 2017 12:02:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dvQOu-00007w-SW for qemu-devel@nongnu.org; Fri, 22 Sep 2017 12:02:06 -0400 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:33381) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dvQOu-00007X-OT; Fri, 22 Sep 2017 12:02:00 -0400 Received: by mail-qt0-x241.google.com with SMTP id b1so930417qtc.0; Fri, 22 Sep 2017 09:02:00 -0700 (PDT) Received: from yoga.lan ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id y31sm108325qta.83.2017.09.22.09.01.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Sep 2017 09:01:59 -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=qLPbhOJJ8a0CzqpY0SvbrdoIYBNHNCL1sxvkHrjczRs=; b=gIDZGpB7hD2+kPE/axTaXBV7F5QP6HkzvIsuJdh6wGPQ7Dz88Y+t9ScCgD+s29+VDV xW2yiqVjgLR/pTjyMJHtxcr7aoHTNHDWBYDz6ACaXMEg13/ehOBGZfRZptSw80rF2NUF KAB7HodRE6vdI0EkWbgcBRhBgRERs6OJ7Fcjpztg1itQbyV6WTCeQ1qgrbK2qYB6rDBb w2PjyZmyeOY1sVwa2VnRmPbRfECy/y/2FGXe/b3uY9RyFgQVOPTpPfIMlWJlacka9avU 1Mgcjp7w7eS3Au9hfp5VQXPu5r7pt7F1ZBHqNSs5A46ybviMsdM1o+9aoA16/vdwMlh5 9Nig== 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=qLPbhOJJ8a0CzqpY0SvbrdoIYBNHNCL1sxvkHrjczRs=; b=QqhewbbCQ9FBlLmjO9QeiaXEwnzshRWB9iM4dSTrR5LrR8HfEdGLWF/UlOuHEdC41k 4ae9S1jvCjR7JROPL2Z8IRhd6Bjs5A0Q9TxcHcgg9kMOSvLczFUXqIXPMy1WYmaPRElQ NSPfb5B1hP81f/dLo4fuRIfiK0GXFkciMM8qMsr+uO3RgNa5FD+4gJN67OKXTpatLGO0 S/ReycQOm+2/su4eZX0v0+qxtuuth1ganb2X102A82cf69JS0izQf8Cn95Xypgo0gKF1 ZtDDe/48QyHWUzIIGr1aB8LrrpB2mUo40BtgQy1NnDVv65GUyrXXSUoX6kFUJpEoWbZP tOaQ== X-Gm-Message-State: AHPjjUh0+iNMI3MCQ+erlLoQp8bRLnhBcyKI+9kGebwKPB+0grpWIHpX 5hDO41nU1mGg77+O33vbNSsMfmOoD74= X-Google-Smtp-Source: AOwi7QC6/ogfPz2kUSxV/Yrd3DE6QwDk+AOwsTpjGy9alvGOfWzfeBzrhMyZG2wvOm89u+VvCO/OUg== X-Received: by 10.200.54.3 with SMTP id m3mr9371026qtb.197.1506096120204; Fri, 22 Sep 2017 09:02:00 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , Thomas Huth , Paolo Bonzini , "Michael S. Tsirkin" , Marcel Apfelbaum , Jason Wang Date: Fri, 22 Sep 2017 13:01:06 -0300 Message-Id: <20170922160111.31885-7-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: quoted-printable 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 29/34] hw/net/e1000e: use TYPE_PCI_E1000E 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, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/net/pci.h | 1 + hw/net/e1000e.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/hw/net/pci.h b/include/hw/net/pci.h index b24b5257a5..92111f86f3 100644 --- a/include/hw/net/pci.h +++ b/include/hw/net/pci.h @@ -14,6 +14,7 @@ #include "hw/pci/pci_bus.h" =20 #define TYPE_PCI_E1000 "e1000" +#define TYPE_PCI_E1000E "e1000e" =20 PCIDevice *pci_nic_init_nofail(NICInfo *nd, PCIBus *rootbus, const char *default_model, diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c index 6c42b4478c..494f8cced6 100644 --- a/hw/net/e1000e.c +++ b/hw/net/e1000e.c @@ -40,6 +40,7 @@ #include "sysemu/sysemu.h" #include "hw/pci/msi.h" #include "hw/pci/msix.h" +#include "hw/net/pci.h" =20 #include "hw/net/e1000_regs.h" =20 @@ -49,8 +50,7 @@ #include "trace.h" #include "qapi/error.h" =20 -#define TYPE_E1000E "e1000e" -#define E1000E(obj) OBJECT_CHECK(E1000EState, (obj), TYPE_E1000E) +#define E1000E(obj) OBJECT_CHECK(E1000EState, (obj), TYPE_PCI_E1000E) =20 typedef struct E1000EState { PCIDevice parent_obj; @@ -703,7 +703,7 @@ static void e1000e_instance_init(Object *obj) } =20 static const TypeInfo e1000e_info =3D { - .name =3D TYPE_E1000E, + .name =3D TYPE_PCI_E1000E, .parent =3D TYPE_PCI_DEVICE, .instance_size =3D sizeof(E1000EState), .class_init =3D e1000e_class_init, --=20 2.14.1