The following changes since commit 5fdb4671b08e0d1631447e81348b2b50a6b85bf7:
Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging (2015-10-06 13:42:33 +0100) are available in the git repository at: https://github.com/jasowang/qemu.git tags/net-pull-request for you to fetch changes up to 89b1273742f45c30927df203532fca0d9a3e1af7: tests: add test cases for netfilter object (2015-10-12 13:34:32 +0800) ---------------------------------------------------------------- ---------------------------------------------------------------- Dana Rubin (1): net/vmxnet3: Refine l2 header validation Jason Wang (1): e1000: use alias for default model Shmulik Ladkani (2): vmxnet3: Support reading IMR registers on bar0 vmxnet3: Add support for VMXNET3_CMD_GET_ADAPTIVE_RING_INFO command Yang Hongyang (10): vl.c: init delayed object after net_init_clients init/cleanup of netfilter object netfilter: hook packets before net queue send net: merge qemu_deliver_packet and qemu_deliver_packet_iov net/queue: introduce NetQueueDeliverFunc netfilter: add an API to pass the packet to next filter netfilter: print filter info associate with the netdev net/queue: export qemu_net_queue_append_iov netfilter: add a netbuffer filter tests: add test cases for netfilter object hw/net/e1000.c | 8 +- hw/net/vmxnet3.c | 19 +++- hw/net/vmxnet3.h | 6 +- hw/net/vmxnet_tx_pkt.c | 19 +++- include/net/filter.h | 77 ++++++++++++++++ include/net/net.h | 6 +- include/net/queue.h | 20 ++++- include/qemu/typedefs.h | 1 + net/Makefile.objs | 2 + net/filter-buffer.c | 186 ++++++++++++++++++++++++++++++++++++++ net/filter.c | 233 ++++++++++++++++++++++++++++++++++++++++++++++++ net/net.c | 121 +++++++++++++++++++------ net/queue.c | 24 +++-- qapi-schema.json | 20 +++++ qdev-monitor.c | 1 + qemu-options.hx | 17 ++++ tests/.gitignore | 1 + tests/Makefile | 2 + tests/test-netfilter.c | 200 +++++++++++++++++++++++++++++++++++++++++ vl.c | 19 ++-- 20 files changed, 917 insertions(+), 65 deletions(-) create mode 100644 include/net/filter.h create mode 100644 net/filter-buffer.c create mode 100644 net/filter.c create mode 100644 tests/test-netfilter.c -- 2.1.4