The following changes since commit f4abdf32714d1845b7c01ec136dd2b04c2f7db47:
Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-docs-xen-updates-100321-2' into staging (2021-03-11 16:20:58 +0000) are available in the git repository at: https://github.com/jasowang/qemu.git tags/net-pull-request for you to fetch changes up to 9bdb56367679e68e5e71a1c29a1087bda6414b25: pvrdma: wean code off pvrdma_ring.h kernel header (2021-03-12 14:08:31 +0800) ---------------------------------------------------------------- ---------------------------------------------------------------- Alexander Bulekov (4): rtl8139: switch to use qemu_receive_packet() for loopback pcnet: switch to use qemu_receive_packet() for loopback cadence_gem: switch to use qemu_receive_packet() for loopback lan9118: switch to use qemu_receive_packet() for loopback Bin Meng (1): net: Fix build error when DEBUG_NET is on Cornelia Huck (1): pvrdma: wean code off pvrdma_ring.h kernel header Jason Wang (9): virtio-net: calculating proper msix vectors on init net: unbreak well-form id check for "-nic" e1000: fail early for evil descriptor net: introduce qemu_receive_packet() e1000: switch to use qemu_receive_packet() for loopback dp8393x: switch to use qemu_receive_packet() for loopback packet msf2-mac: switch to use qemu_receive_packet() for loopback sungem: switch to use qemu_receive_packet() for loopback tx_pkt: switch to use qemu_receive_packet_iov() for loopback Paolo Bonzini (1): net: validate that ids are well formed hw/core/machine.c | 1 + hw/net/cadence_gem.c | 4 +- hw/net/dp8393x.c | 2 +- hw/net/e1000.c | 6 +- hw/net/lan9118.c | 2 +- hw/net/msf2-emac.c | 2 +- hw/net/net_tx_pkt.c | 2 +- hw/net/pcnet.c | 2 +- hw/net/rtl8139.c | 2 +- hw/net/sungem.c | 2 +- hw/rdma/vmw/pvrdma.h | 5 +- hw/rdma/vmw/pvrdma_cmd.c | 6 +- hw/rdma/vmw/pvrdma_dev_ring.c | 41 ++++---- hw/rdma/vmw/pvrdma_dev_ring.h | 9 +- hw/rdma/vmw/pvrdma_main.c | 4 +- hw/virtio/virtio-net-pci.c | 10 +- include/net/net.h | 5 + include/net/queue.h | 8 ++ .../drivers/infiniband/hw/vmw_pvrdma/pvrdma_ring.h | 114 --------------------- net/net.c | 53 ++++++++-- net/queue.c | 22 ++++ scripts/update-linux-headers.sh | 3 +- 22 files changed, 142 insertions(+), 163 deletions(-) delete mode 100644 include/standard-headers/drivers/infiniband/hw/vmw_pvrdma/pvrdma_ring.h