[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/14] e1000: use alias for default model
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL 03/14] e1000: use alias for default model |
Date: |
Mon, 12 Oct 2015 16:17:05 +0800 |
Instead of duplicating the "e1000-82540em" device model as "e1000",
make the latter an alias for the former.
Cc: Markus Armbruster <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
hw/net/e1000.c | 8 +-------
qdev-monitor.c | 1 +
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/hw/net/e1000.c b/hw/net/e1000.c
index 09c9e9d..910de3a 100644
--- a/hw/net/e1000.c
+++ b/hw/net/e1000.c
@@ -1647,7 +1647,7 @@ static const TypeInfo e1000_base_info = {
static const E1000Info e1000_devices[] = {
{
- .name = "e1000-82540em",
+ .name = "e1000",
.device_id = E1000_DEV_ID_82540EM,
.revision = 0x03,
.phy_id2 = E1000_PHY_ID2_8254xx_DEFAULT,
@@ -1666,11 +1666,6 @@ static const E1000Info e1000_devices[] = {
},
};
-static const TypeInfo e1000_default_info = {
- .name = "e1000",
- .parent = "e1000-82540em",
-};
-
static void e1000_register_types(void)
{
int i;
@@ -1688,7 +1683,6 @@ static void e1000_register_types(void)
type_register(&type_info);
}
- type_register_static(&e1000_default_info);
}
type_init(e1000_register_types)
diff --git a/qdev-monitor.c b/qdev-monitor.c
index eb7aef2..00f6303 100644
--- a/qdev-monitor.c
+++ b/qdev-monitor.c
@@ -50,6 +50,7 @@ static const QDevAlias qdev_alias_table[] = {
{ "lsi53c895a", "lsi" },
{ "ich9-ahci", "ahci" },
{ "kvm-pci-assign", "pci-assign" },
+ { "e1000", "e1000-82540em" },
{ }
};
--
2.1.4
- [Qemu-devel] [PULL 00/14] Net patches, Jason Wang, 2015/10/12
- [Qemu-devel] [PULL 01/14] net/vmxnet3: Refine l2 header validation, Jason Wang, 2015/10/12
- [Qemu-devel] [PULL 03/14] e1000: use alias for default model,
Jason Wang <=
- [Qemu-devel] [PULL 07/14] netfilter: hook packets before net queue send, Jason Wang, 2015/10/12
- [Qemu-devel] [PULL 09/14] net/queue: introduce NetQueueDeliverFunc, Jason Wang, 2015/10/12
- [Qemu-devel] [PULL 10/14] netfilter: add an API to pass the packet to next filter, Jason Wang, 2015/10/12
- [Qemu-devel] [PULL 13/14] netfilter: add a netbuffer filter, Jason Wang, 2015/10/12
- [Qemu-devel] [PULL 14/14] tests: add test cases for netfilter object, Jason Wang, 2015/10/12
- Re: [Qemu-devel] [PULL 00/14] Net patches, Peter Maydell, 2015/10/12
- [Qemu-devel] [PULL 02/14] vmxnet3: Support reading IMR registers on bar0, Jason Wang, 2015/10/15
- [Qemu-devel] [PULL 04/14] vmxnet3: Add support for VMXNET3_CMD_GET_ADAPTIVE_RING_INFO command, Jason Wang, 2015/10/15
- [Qemu-devel] [PULL 06/14] init/cleanup of netfilter object, Jason Wang, 2015/10/15
- [Qemu-devel] [PULL 08/14] net: merge qemu_deliver_packet and qemu_deliver_packet_iov, Jason Wang, 2015/10/15