Commit 463af534 authored by Mark McLoughlin's avatar Mark McLoughlin
Browse files

net: add fd_readv() handler to qemu_new_vlan_client() args 



This, apparently, is the style we prefer - all VLANClientState
should be an argument to qemu_new_vlan_client().

Signed-off-by: default avatarMark McLoughlin <markmc@redhat.com>
parent 3471b757

hw/dp8393x.c

+2 −2
Original line number Diff line number Diff line
@@ -888,8 +888,8 @@ void dp83932_init(NICInfo *nd, target_phys_addr_t base, int it_shift, 
    s->watchdog = qemu_new_timer(vm_clock, dp8393x_watchdog, s);

    s->regs[SONIC_SR] = 0x0004; /* only revision recognized by Linux */



    s->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name,

                                 nic_receive, nic_can_receive, nic_cleanup, s);

    s->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name, nic_can_receive,

                                 nic_receive, NULL, nic_cleanup, s);



    qemu_format_nic_info_str(s->vc, nd->macaddr);

    qemu_register_reset(nic_reset, 0, s);

hw/e1000.c

+2 −2
Original line number Diff line number Diff line
@@ -1106,8 +1106,8 @@ static void pci_e1000_init(PCIDevice *pci_dev) 
    memset(&d->tx, 0, sizeof d->tx);



    d->vc = qdev_get_vlan_client(&d->dev.qdev,

                                 e1000_receive, e1000_can_receive,

                                 e1000_cleanup, d);

                                 e1000_can_receive, e1000_receive,

                                 NULL, e1000_cleanup, d);

    d->vc->link_status_changed = e1000_set_link_status;



    qemu_format_nic_info_str(d->vc, macaddr);

hw/eepro100.c

+1 −1
Original line number Diff line number Diff line
@@ -1766,7 +1766,7 @@ static void nic_init(PCIDevice *pci_dev, uint32_t device) 
    nic_reset(s);



    s->vc = qdev_get_vlan_client(&d->dev.qdev,

                                 nic_receive, nic_can_receive,

                                 nic_can_receive, nic_receive, NULL,

                                 nic_cleanup, s);



    qemu_format_nic_info_str(s->vc, s->macaddr);

hw/etraxfs_eth.c

+1 −1
Original line number Diff line number Diff line
@@ -593,7 +593,7 @@ void *etraxfs_eth_init(NICInfo *nd, CPUState *env, 
	cpu_register_physical_memory (base, 0x5c, eth->ethregs);



	eth->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name,

				       eth_receive, eth_can_receive,

				       eth_can_receive, eth_receive, NULL,

				       eth_cleanup, eth);

	eth->vc->opaque = eth;

	eth->vc->link_status_changed = eth_set_link;

hw/mcf_fec.c

+1 −1
Original line number Diff line number Diff line
@@ -462,7 +462,7 @@ void mcf_fec_init(NICInfo *nd, target_phys_addr_t base, qemu_irq *irq) 
    cpu_register_physical_memory(base, 0x400, s->mmio_index);



    s->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name,

                                 mcf_fec_receive, mcf_fec_can_receive,

                                 mcf_fec_can_receive, mcf_fec_receive, NULL,

                                 mcf_fec_cleanup, s);

    memcpy(s->macaddr, nd->macaddr, 6);

    qemu_format_nic_info_str(s->vc, s->macaddr);