| Message ID | 1443418828-11690-1-git-send-email-jasowang@redhat.com |
|---|---|
| State | New |
| Headers | show |
Jason Wang <jasowang@redhat.com> writes: > Instead of using a new type for default model (82540em), using an > alias for this to avoid bit duplication. Suggest to rephrase as 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>
On 09/28/2015 04:57 PM, Markus Armbruster wrote: > Jason Wang <jasowang@redhat.com> writes: > >> Instead of using a new type for default model (82540em), using an >> alias for this to avoid bit duplication. > Suggest to rephrase as > > Instead of duplicating the "e1000-82540em" device model as "e1000", > make the latter an alias for the former. Fix like this and apply the patch in my tree. > >> Cc: Markus Armbruster <armbru@redhat.com> >> Signed-off-by: Jason Wang <jasowang@redhat.com> > Reviewed-by: Markus Armbruster <armbru@redhat.com> Thanks.
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" }, { } };
Instead of using a new type for default model (82540em), using an alias for this to avoid bit duplication. Cc: Markus Armbruster <armbru@redhat.com> Signed-off-by: Jason Wang <jasowang@redhat.com> --- hw/net/e1000.c | 8 +------- qdev-monitor.c | 1 + 2 files changed, 2 insertions(+), 7 deletions(-)