From: Peter Maydell Date: Mon, 29 Jul 2019 11:04:53 +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=893dc8300c80e3dc32f31e968cf7aa0904da50c3;p=qemu.git Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging # gpg: Signature made Mon 29 Jul 2019 09:30:48 BST # gpg: using RSA key EF04965B398D6211 # gpg: Good signature from "Jason Wang (Jason Wang on RedHat) " [marginal] # 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/colo-compare.c: Fix memory leak and code style issue. net: tap: replace snprintf with g_strdup_printf calls qemu-bridge-helper: move repeating code in parse_acl_file qemu-bridge-helper: restrict interface name to IFNAMSIZ e1000: don't raise interrupt in pre_save() Signed-off-by: Peter Maydell --- 893dc8300c80e3dc32f31e968cf7aa0904da50c3