Merge branch 'net-queue'

* net-queue: (28 commits)
  virtio-net: Increase filter and control limits
  virtio-net: Add new RX filter controls
  virtio-net: MAC filter optimization
  virtio-net: Fix MAC filter overflow handling
  virtio-net: reorganize receive_filter()
  virtio-net: Use a byte to store RX mode flags
  virtio-net: Add version_id 7 placeholder for vnet header support
  virtio-net: implement rx packet queueing
  net: make use of async packet sending API in tap client
  net: add qemu_send_packet_async()
  net: split out packet queueing and flushing into separate functions
  net: return status from qemu_deliver_packet()
  net: add return value to packet receive handler
  net: pass VLANClientState* as first arg to receive handlers
  net: re-name vc->fd_read() to vc->receive()
  net: add fd_readv() handler to qemu_new_vlan_client() args
  net: only read from tapfd when we can send
  net: vlan clients with no fd_can_read() can always receive
  net: move the tap buffer into TAPState
  net: factor tap_read_packet() out of tap_send()
  ...

Signed-off-by: Anthony Liguori <[email protected]>

diff --cc hw/e1000.c
index 03fad4cc94baf41e0de706615eecb585d4869af5,7f8f5b2ae40e27ce99fdbe916ba18224e65141ec..eed02a69f73031c44f8daf1034f005115133f9f5
--- 1/hw/e1000.c
--- 2/hw/e1000.c
+++ b/hw/e1000.c
@@@ -1118,9 -1100,16 +1120,9 @@@ static void pci_e1000_init(PCIDevice *p
      checksum = (uint16_t) EEPROM_SUM - checksum;
      d->eeprom_data[EEPROM_CHECKSUM_REG] = checksum;
  
 -    memset(d->phy_reg, 0, sizeof d->phy_reg);
 -    memmove(d->phy_reg, phy_reg_init, sizeof phy_reg_init);
 -    memset(d->mac_reg, 0, sizeof d->mac_reg);
 -    memmove(d->mac_reg, mac_reg_init, sizeof mac_reg_init);
 -    d->rxbuf_min_shift = 1;
 -    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);

diff --cc hw/qdev.c
Simple merge

diff --cc hw/rtl8139.c
index ea27dcfea049e148139e0a0a04104ed7010c3acf,c86b782e4c16b3c1f697d66d5d3cc8aa83da84fb..de5a68fc99f6b885ebd9c8606ca8dec5c5ae7e1b
--- 1/hw/rtl8139.c
--- 2/hw/rtl8139.c
+++ b/hw/rtl8139.c
@@@ -3476,10 -3476,9 +3479,10 @@@ static void pci_rtl8139_init(PCIDevice 
  
      s->pci_dev = (PCIDevice *)d;
      qdev_get_macaddr(&dev->qdev, s->macaddr);
 +    qemu_register_reset(rtl8139_reset, 0, s);
      rtl8139_reset(s);
      s->vc = qdev_get_vlan_client(&dev->qdev,
-                                  rtl8139_receive, rtl8139_can_receive,
+                                  rtl8139_can_receive, rtl8139_receive, NULL,
                                   rtl8139_cleanup, s);
  
      qemu_format_nic_info_str(s->vc, s->macaddr);

diff --cc vl.c
Simple merge