haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

e1000: use alias for default model

Browse source 
Instead of duplicating the "e1000-82540em" device model as "e1000",
make the latter an alias for the former.

Cc: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com
Reviewed-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Jason Wang 2015-09-28 13:37:26 +08:00
parent c6048f849c
commit 8304402033
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
hw/net/e1000.c
View file

@ -1647,7 +1647,7 @@ static const TypeInfo e1000_base_info = {
static const E1000Info e1000_devices[] = { static const E1000Info e1000_devices[] = {
{ {
.name = "e1000-82540em", .name = "e1000",
.device_id = E1000_DEV_ID_82540EM, .device_id = E1000_DEV_ID_82540EM,
.revision = 0x03, .revision = 0x03,
.phy_id2 = E1000_PHY_ID2_8254xx_DEFAULT, .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) static void e1000_register_types(void)
{ {
int i; int i;
@ -1688,7 +1683,6 @@ static void e1000_register_types(void)
type_register(&type_info); type_register(&type_info);
} }
type_register_static(&e1000_default_info);
} }
type_init(e1000_register_types) type_init(e1000_register_types)

1
qdev-monitor.c
View file

@ -50,6 +50,7 @@ static const QDevAlias qdev_alias_table[] = {
{ "lsi53c895a", "lsi" }, { "lsi53c895a", "lsi" },
{ "ich9-ahci", "ahci" }, { "ich9-ahci", "ahci" },
{ "kvm-pci-assign", "pci-assign" }, { "kvm-pci-assign", "pci-assign" },
{ "e1000", "e1000-82540em" },
{ } { }
}; };