From: Peter Maydell Date: Fri, 31 Mar 2017 09:09:42 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a0ee3797bf4917b1b7a4554a4dffbb45f387f087;p=qemu.git Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging # gpg: Signature made Fri 31 Mar 2017 01:50:55 BST # gpg: using RSA key 0xEF04965B398D6211 # 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: e1000: disable debug by default virtio-net: avoid call tap_enable when there's only one queue Signed-off-by: Peter Maydell --- a0ee3797bf4917b1b7a4554a4dffbb45f387f087