From mboxrd@z Thu Jan 1 00:00:00 1970 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 Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Fri, 22 Sep 2017 13:01:06 -0300 Message-Id: <20170922160111.31885-7-f4bug@amsat.org> 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 Subject: [Qemu-devel] [PATCH 29/34] hw/net/e1000e: use TYPE_PCI_E1000E List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell , Thomas Huth , Paolo Bonzini , "Michael S. Tsirkin" , Marcel Apfelbaum , Jason Wang Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, qemu-trivial@nongnu.org Signed-off-by: Philippe Mathieu-Daudé --- 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" #define TYPE_PCI_E1000 "e1000" +#define TYPE_PCI_E1000E "e1000e" 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" #include "hw/net/e1000_regs.h" @@ -49,8 +50,7 @@ #include "trace.h" #include "qapi/error.h" -#define TYPE_E1000E "e1000e" -#define E1000E(obj) OBJECT_CHECK(E1000EState, (obj), TYPE_E1000E) +#define E1000E(obj) OBJECT_CHECK(E1000EState, (obj), TYPE_PCI_E1000E) typedef struct E1000EState { PCIDevice parent_obj; @@ -703,7 +703,7 @@ static void e1000e_instance_init(Object *obj) } static const TypeInfo e1000e_info = { - .name = TYPE_E1000E, + .name = TYPE_PCI_E1000E, .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(E1000EState), .class_init = e1000e_class_init, -- 2.14.1