Commit a005d073 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

net: Remove VLANState 



VLANState is no longer used and can be removed.

Signed-off-by: default avatarStefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: default avatarZhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Reviewed-by: default avatarLaszlo Ersek <lersek@redhat.com>
parent ec8b1f6c

hw/dp8393x.c

+0 −1
Original line number Diff line number Diff line
@@ -899,7 +899,6 @@ void dp83932_init(NICInfo *nd, target_phys_addr_t base, int it_shift, 
    s->regs[SONIC_SR] = 0x0004; /* only revision recognized by Linux */



    s->conf.macaddr = nd->macaddr;

    s->conf.vlan = nd->vlan;

    s->conf.peer = nd->netdev;



    s->nic = qemu_new_nic(&net_dp83932_info, &s->conf, nd->model, nd->name, s);

hw/exynos4_boards.c

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ static void lan9215_init(uint32_t base, qemu_irq irq) 
    SysBusDevice *s;



    /* This should be a 9215 but the 9118 is close enough */

    if (nd_table[0].vlan) {

    if (nd_table[0].used) {

        qemu_check_nic_model(&nd_table[0], "lan9118");

        dev = qdev_create(NULL, "lan9118");

        qdev_set_nic_properties(dev, &nd_table[0]);

hw/highbank.c

+1 −1
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ static void highbank_init(ram_addr_t ram_size, 


    sysbus_create_simple("sysbus-ahci", 0xffe08000, pic[83]);



    if (nd_table[0].vlan) {

    if (nd_table[0].used) {

        qemu_check_nic_model(&nd_table[0], "xgmac");

        dev = qdev_create(NULL, "xgmac");

        qdev_set_nic_properties(dev, &nd_table[0]);

hw/integratorcp.c

+1 −1
Original line number Diff line number Diff line
@@ -493,7 +493,7 @@ static void integratorcp_init(ram_addr_t ram_size, 
    sysbus_create_simple("pl050_keyboard", 0x18000000, pic[3]);

    sysbus_create_simple("pl050_mouse", 0x19000000, pic[4]);

    sysbus_create_varargs("pl181", 0x1c000000, pic[23], pic[24], NULL);

    if (nd_table[0].vlan)

    if (nd_table[0].used)

        smc91c111_init(&nd_table[0], 0xc8000000, pic[27]);



    sysbus_create_simple("pl110", 0xc0000000, pic[22]);

hw/kzm.c

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ static void kzm_init(ram_addr_t ram_size, 
    imx_timerp_create(0x53f98000, qdev_get_gpio_in(dev, 27), ccm);

    imx_timerg_create(0x53f90000, qdev_get_gpio_in(dev, 29), ccm);



    if (nd_table[0].vlan) {

    if (nd_table[0].used) {

        lan9118_init(&nd_table[0], 0xb6000000, qdev_get_gpio_in(dev, 52));

    }