Commit 83044020 authored by Jason Wang's avatar Jason Wang
Browse files

e1000: use alias for default model 



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: default avatarJason Wang <jasowang@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent c6048f84

hw/net/e1000.c

+1 −7
Original line number Diff line number Diff line
@@ -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)

qdev-monitor.c

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ static const QDevAlias qdev_alias_table[] = { 
    { "lsi53c895a", "lsi" },

    { "ich9-ahci", "ahci" },

    { "kvm-pci-assign", "pci-assign" },

    { "e1000", "e1000-82540em" },

    { }

};