From: Peter Maydell Date: Tue, 10 Apr 2018 11:49:07 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=daf6b59be8c703264765a533bc63421caef95225;p=qmiga%2Fqemu.git Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging # gpg: Signature made Tue 10 Apr 2018 04:36:01 BST # gpg: using RSA key EF04965B398D6211 # 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: Old machine types, turn new subsection off e1000: Choose which set of props to migrate e1000: Migrate props via a temporary structure e1000: wire new subsection to property e1000: Dupe offload data on reading old stream e1000: Convert v3 fields to subsection Signed-off-by: Peter Maydell --- daf6b59be8c703264765a533bc63421caef95225