From: Peter Maydell Date: Tue, 8 Mar 2016 10:25:50 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging X-Git-Tag: qemu-xen-4.8.0-rc1~412 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=d1cc881d54d2abc9c90d92c90deccc8d47966b1c;p=qemu-xen.git Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging # gpg: Signature made Tue 08 Mar 2016 07:46:08 GMT using RSA key ID 398D6211 # gpg: Good signature from "Jason Wang (Jason Wang on RedHat) " # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 215D 46F4 8246 689E C77F 3562 EF04 965B 398D 6211 * remotes/jasowang/tags/net-pull-request: net: check packet payload length filter-buffer: Add status_changed callback processing filter: Add 'status' property for filter object rocker: allow user to specify rocker world by property rocker: add name field into WorldOps ale let world specify its name rocker: return -ENOMEM in case of some world alloc fails rocker: forbid to change world type net: netmap: probe netmap interface for virtio-net header net: simplify net_init_tap_one logic MAINTAINERS: Add entries for include/net/ files net: filter: correctly remove filter from the list during finalization net: ne2000: check ring buffer control registers Signed-off-by: Peter Maydell --- d1cc881d54d2abc9c90d92c90deccc8d47966b1c