| Message ID | 1615799673-31549-1-git-send-email-jasowang@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Mon, 15 Mar 2021 at 09:14, Jason Wang <jasowang@redhat.com> wrote: > > The following changes since commit 6157b0e19721aadb4c7fdcfe57b2924af6144b14: > > Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-6.0-pull-request' into staging (2021-03-14 17:47:49 +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 f2e8319d456724c3d8514d943dc4607e2f08e88a: > > net: Do not fill legacy info_str for backends (2021-03-15 16:41:22 +0800) > > ---------------------------------------------------------------- > > Changes since V1: > - drop the workaound of "-nic" id and fix the merge > - add the series of query-netdev Applied, thanks. Please update the changelog at https://wiki.qemu.org/ChangeLog/6.0 for any user-visible changes. -- PMM
The following changes since commit 6157b0e19721aadb4c7fdcfe57b2924af6144b14: Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-6.0-pull-request' into staging (2021-03-14 17:47:49 +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 f2e8319d456724c3d8514d943dc4607e2f08e88a: net: Do not fill legacy info_str for backends (2021-03-15 16:41:22 +0800) ---------------------------------------------------------------- Changes since V1: - drop the workaound of "-nic" id and fix the merge - add the series of query-netdev ---------------------------------------------------------------- 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 Alexey Kirillov (5): qapi: net: Add query-netdev command tests: Add tests for query-netdev command net: Move NetClientState.info_str to dynamic allocations hmp: Use QAPI NetdevInfo in hmp_info_network net: Do not fill legacy info_str for backends 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 (8): virtio-net: calculating proper msix vectors on init 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/net/xen_nic.c | 5 +- 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 | 10 +- include/net/queue.h | 8 + include/qapi/hmp-output-visitor.h | 30 ++++ .../drivers/infiniband/hw/vmw_pvrdma/pvrdma_ring.h | 114 ------------ net/l2tpv3.c | 8 +- net/net.c | 117 +++++++++++-- net/netmap.c | 7 + net/queue.c | 22 +++ net/slirp.c | 124 ++++++++++++- net/socket.c | 92 +++++++--- net/tap-win32.c | 10 +- net/tap.c | 107 ++++++++++-- net/vde.c | 25 ++- net/vhost-user.c | 20 ++- net/vhost-vdpa.c | 15 +- qapi/hmp-output-visitor.c | 193 +++++++++++++++++++++ qapi/meson.build | 1 + qapi/net.json | 80 +++++++++ scripts/update-linux-headers.sh | 3 +- tests/qtest/meson.build | 3 + tests/qtest/test-query-netdev.c | 120 +++++++++++++ 38 files changed, 990 insertions(+), 224 deletions(-) create mode 100644 include/qapi/hmp-output-visitor.h delete mode 100644 include/standard-headers/drivers/infiniband/hw/vmw_pvrdma/pvrdma_ring.h create mode 100644 qapi/hmp-output-visitor.c create mode 100644 tests/qtest/test-query-netdev.c