[Qemu-commits] [qemu/qemu] ff1d2a: hw/net: handle flow control in mcf_fec driver rece...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: ff1d2ac949dc94d8a0e71fd46939fb69c2ef075b
      
https://github.com/qemu/qemu/commit/ff1d2ac949dc94d8a0e71fd46939fb69c2ef075b
  Author: Greg Ungerer <address@hidden>
  Date:   2015-07-28 (Tue, 28 Jul 2015)

  Changed paths:
    M hw/net/mcf_fec.c

  Log Message:
  -----------
  hw/net: handle flow control in mcf_fec driver receiver

The network mcf_fec driver emulated receive side method is not dealing
with network queue flow control properly.

Modify the receive side to check if we have enough space in the
descriptors to store the current packet. If not we process none of it
and return 0. When the guest frees up some buffers through its descriptors
we signal the qemu net layer to send more packets.

[Fixed coding style: 4-space indent and curly braces on if statement.
--Stefan]

Signed-off-by: Greg Ungerer <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 7bba83bf80eae9c9e323319ff40d0ca477b0a77a
      
https://github.com/qemu/qemu/commit/7bba83bf80eae9c9e323319ff40d0ca477b0a77a
  Author: Fam Zheng <address@hidden>
  Date:   2015-07-28 (Tue, 28 Jul 2015)

  Changed paths:
    M hw/net/xen_nic.c

  Log Message:
  -----------
  xen: Drop net_rx_ok

Let net_rx_packet() (which checks the same conditions) drops the packet
if the device is not ready. Drop net_xen_info.can_receive and update the
return value for the buffer full case.

We rely on the qemu_flush_queued_packets() in net_event() to wake up
the peer when the buffer becomes available again.

Signed-off-by: Fam Zheng <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: b83d017d88b2c4710c7a4614ecf9f845e4db80ba
      
https://github.com/qemu/qemu/commit/b83d017d88b2c4710c7a4614ecf9f845e4db80ba
  Author: Peter Maydell <address@hidden>
  Date:   2015-07-28 (Tue, 28 Jul 2015)

  Changed paths:
    M hw/net/mcf_fec.c
    M hw/net/xen_nic.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into 
staging

Pull request

These two .can_receive() are now reviewed.  The net subsystem queue for 2.4 is 
now empty.

# gpg: Signature made Tue Jul 28 13:26:03 2015 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <address@hidden>"
# gpg:                 aka "Stefan Hajnoczi <address@hidden>"

* remotes/stefanha/tags/net-pull-request:
  xen: Drop net_rx_ok
  hw/net: handle flow control in mcf_fec driver receiver

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/170f209d7848...b83d017d88b2